Start moving webapp to Redux (#6140)
* Start moving webapp to Redux * Fix localforage import * Updates per feedback * Feedback udpates and a few fixes * Minor updates * Fix statuses, config not loading properly, getMe sanitizing too much * Fix preferences * Fix user autocomplete * Fix sessions and audits * Fix error handling for all redux actions * Use new directory structure for components and containers * Refresh immediately on logout instead of after timeout * Add fetch polyfill
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
cc07c00507
Коммит
6c4c706313
112
webapp/store/index.js
Обычный файл
112
webapp/store/index.js
Обычный файл
@@ -0,0 +1,112 @@
|
||||
// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved.
|
||||
// See License.txt for license information.
|
||||
|
||||
import {batchActions} from 'redux-batched-actions';
|
||||
import configureServiceStore from 'mattermost-redux/store';
|
||||
import {General, RequestStatus} from 'mattermost-redux/constants';
|
||||
import reduxInitialState from 'mattermost-redux/store/initial_state';
|
||||
import {createTransform, persistStore} from 'redux-persist';
|
||||
import localForage from 'localforage';
|
||||
|
||||
import {transformSet} from './utils';
|
||||
|
||||
const usersSetTransform = [
|
||||
'profilesInChannel',
|
||||
'profilesNotInChannel',
|
||||
'profilesInTeam',
|
||||
'profilesNotInTeam'
|
||||
];
|
||||
|
||||
const teamSetTransform = [
|
||||
'membersInTeam'
|
||||
];
|
||||
|
||||
const setTransforms = [
|
||||
...usersSetTransform,
|
||||
...teamSetTransform
|
||||
];
|
||||
|
||||
export default function configureStore(initialState) {
|
||||
const setTransformer = createTransform(
|
||||
(inboundState, key) => {
|
||||
if (key === 'entities') {
|
||||
const state = {...inboundState};
|
||||
for (const prop in state) {
|
||||
if (state.hasOwnProperty(prop)) {
|
||||
state[prop] = transformSet(state[prop], setTransforms);
|
||||
}
|
||||
}
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
return inboundState;
|
||||
},
|
||||
(outboundState, key) => {
|
||||
if (key === 'entities') {
|
||||
const state = {...outboundState};
|
||||
for (const prop in state) {
|
||||
if (state.hasOwnProperty(prop)) {
|
||||
state[prop] = transformSet(state[prop], setTransforms, false);
|
||||
}
|
||||
}
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
return outboundState;
|
||||
}
|
||||
);
|
||||
|
||||
const offlineOptions = {
|
||||
persist: (store, options) => {
|
||||
const persistor = persistStore(store, {storage: localForage, ...options}, () => {
|
||||
store.dispatch({
|
||||
type: General.STORE_REHYDRATION_COMPLETE,
|
||||
complete: true
|
||||
});
|
||||
});
|
||||
|
||||
let purging = false;
|
||||
|
||||
// check to see if the logout request was successful
|
||||
store.subscribe(() => {
|
||||
const state = store.getState();
|
||||
if (state.requests.users.logout.status === RequestStatus.SUCCESS && !purging) {
|
||||
purging = true;
|
||||
|
||||
persistor.purge();
|
||||
|
||||
store.dispatch(batchActions([
|
||||
{
|
||||
type: General.OFFLINE_STORE_RESET,
|
||||
data: Object.assign({}, reduxInitialState, initialState)
|
||||
}
|
||||
]));
|
||||
|
||||
localStorage.removeItem('currentUserId');
|
||||
window.location.href = '/';
|
||||
|
||||
setTimeout(() => {
|
||||
purging = false;
|
||||
}, 500);
|
||||
}
|
||||
});
|
||||
|
||||
return persistor;
|
||||
},
|
||||
persistOptions: {
|
||||
autoRehydrate: {
|
||||
log: false
|
||||
},
|
||||
blacklist: ['errors', 'offline', 'requests', 'entities'],
|
||||
debounce: 500,
|
||||
transforms: [
|
||||
setTransformer
|
||||
]
|
||||
}
|
||||
};
|
||||
|
||||
return configureServiceStore({}, {}, offlineOptions);
|
||||
}
|
||||
|
||||
42
webapp/store/utils.js
Обычный файл
42
webapp/store/utils.js
Обычный файл
@@ -0,0 +1,42 @@
|
||||
// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved.
|
||||
// See License.txt for license information.
|
||||
|
||||
function transformFromSet(incoming) {
|
||||
const state = {...incoming};
|
||||
|
||||
for (const key in state) {
|
||||
if (state.hasOwnProperty(key)) {
|
||||
if (state[key] instanceof Set) {
|
||||
state[key] = Array.from([...state[key]]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
function transformToSet(incoming) {
|
||||
const state = {...incoming};
|
||||
|
||||
for (const key in state) {
|
||||
if (state.hasOwnProperty(key)) {
|
||||
state[key] = new Set(state[key]);
|
||||
}
|
||||
}
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
export function transformSet(incoming, setTransforms, toStorage = true) {
|
||||
const state = {...incoming};
|
||||
|
||||
const transformer = toStorage ? transformFromSet : transformToSet;
|
||||
|
||||
for (const key in state) {
|
||||
if (state.hasOwnProperty(key) && setTransforms.includes(key)) {
|
||||
state[key] = transformer(state[key]);
|
||||
}
|
||||
}
|
||||
|
||||
return state;
|
||||
}
|
||||
Ссылка в новой задаче
Block a user