diff --git a/ui/src/store/createAdminStore.js b/ui/src/store/createAdminStore.js index 84afb4430..f7866624f 100644 --- a/ui/src/store/createAdminStore.js +++ b/ui/src/store/createAdminStore.js @@ -1,11 +1,10 @@ import { applyMiddleware, combineReducers, compose, createStore } from 'redux' -import { connectRouter, routerMiddleware } from 'connected-react-router' +import { routerMiddleware, connectRouter } from 'connected-react-router' import createSagaMiddleware from 'redux-saga' import { all, fork } from 'redux-saga/effects' import { adminReducer, adminSaga, USER_LOGOUT } from 'react-admin' import throttle from 'lodash.throttle' import { loadState, saveState } from './persistState' -import { pruneResources } from './pruneResources' export default ({ authProvider, @@ -51,9 +50,6 @@ export default ({ throttle(() => { const state = store.getState() saveState({ - admin: { - resources: pruneResources(state), - }, theme: state.theme, queue: state.queue, albumView: state.albumView, diff --git a/ui/src/store/pruneResources.js b/ui/src/store/pruneResources.js deleted file mode 100644 index d3552c884..000000000 --- a/ui/src/store/pruneResources.js +++ /dev/null @@ -1,39 +0,0 @@ -function getParts(object, fragments) { - if (!object) { - return object - } - const [part, ...rest] = fragments.split('.') - - return Object.assign( - {}, - ...Object.entries(object) - .filter(([key]) => key.toLowerCase().includes(part)) - .map(([k, v]) => { - if (!rest.length) return { [k]: v } - const parts = v && typeof v === 'object' && getParts(v, rest.join('.')) - if (parts) return { [k]: parts } - return undefined - }) - ) -} - -const pruneResource = (resource) => ({ - props: {}, - list: { - param: { - perPage: getParts(resource.list.param, 'perPage'), - filter: {}, - }, - selectedIds: [], - }, -}) - -export const pruneResources = (state) => { - return Object.keys(state.admin.resources).reduce( - (acc, cur) => ({ - ...acc, - [cur]: pruneResource(state.admin.resources[cur]), - }), - {} - ) -}