haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Flatten the store of the recent-list feature

This commit is contained in:
zbettenbuk 2018-02-06 10:43:49 +01:00 committed by Lyubo Marinov
parent e0deb6d64b
commit 0e07020d09
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
react/features/recent-list/components/AbstractRecentList.js
View File

@ -64,6 +64,6 @@ export default class AbstractRecentList extends Component<Props> {
export function _mapStateToProps(state: Object) { export function _mapStateToProps(state: Object) {
return { return {
_homeServer: state['features/app'].app._getDefaultURL(), _homeServer: state['features/app'].app._getDefaultURL(),
_recentList: state['features/recent-list'].list _recentList: state['features/recent-list']
}; };
} }

20
react/features/recent-list/reducer.js
View File

@ -33,16 +33,14 @@ const STORE_NAME = 'features/recent-list';
/** /**
* Sets up the persistence of the feature recent-list. * Sets up the persistence of the feature recent-list.
*/ */
PersistenceRegistry.register(STORE_NAME, { PersistenceRegistry.register(STORE_NAME);
list: true
});
/** /**
* Reduces the redux actions of the feature recent-list. * Reduces the redux actions of the feature recent-list.
*/ */
ReducerRegistry.register( ReducerRegistry.register(
STORE_NAME, STORE_NAME,
(state = { list: _getLegacyRecentRoomList() }, action) => { (state = _getLegacyRecentRoomList(), action) => {
switch (action.type) { switch (action.type) {
case STORE_CURRENT_CONFERENCE: case STORE_CURRENT_CONFERENCE:
return _storeCurrentConference(state, action); return _storeCurrentConference(state, action);
@ -88,7 +86,8 @@ function _storeCurrentConference(state, action) {
// If the current conference is already in the list, we remove it to re-add // If the current conference is already in the list, we remove it to re-add
// it to the top. // it to the top.
const list = state.list.filter(e => e.conference !== conference); const list = (Array.isArray(state) ? state : [])
.filter(e => e.conference !== conference);
// The list is a reverse-sorted (i.e. the newer elements are at the end). // The list is a reverse-sorted (i.e. the newer elements are at the end).
list.push({ list.push({
@ -100,9 +99,7 @@ function _storeCurrentConference(state, action) {
// Ensure the list doesn't exceed a/the maximum size. // Ensure the list doesn't exceed a/the maximum size.
list.splice(0, list.length - MAX_LIST_SIZE); list.splice(0, list.length - MAX_LIST_SIZE);
return { return list;
list
};
} }
/** /**
@ -116,7 +113,8 @@ function _updateConferenceDuration(state, action) {
const { locationURL } = action; const { locationURL } = action;
if (locationURL && locationURL.href) { if (locationURL && locationURL.href) {
const list = state.list; // shallow copy to avoid in-place modification.
const list = (Array.isArray(state) ? state : []).slice();
if (list.length > 0) { if (list.length > 0) {
const mostRecentURL = list[list.length - 1]; const mostRecentURL = list[list.length - 1];
@ -127,9 +125,7 @@ function _updateConferenceDuration(state, action) {
mostRecentURL.conferenceDuration mostRecentURL.conferenceDuration
= Date.now() - mostRecentURL.date; = Date.now() - mostRecentURL.date;
return { return list;
list
};
} }
} }
} }