X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/7e58fd10a7abc133b32a5084796c2b061e03ecd8..2f92d8c274f35c96345d57716363a311bd289ba4:/src/store/store.ts diff --git a/src/store/store.ts b/src/store/store.ts index d3646e69..68c5d823 100644 --- a/src/store/store.ts +++ b/src/store/store.ts @@ -2,22 +2,46 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { createStore, applyMiddleware, compose, Middleware } from 'redux'; -import { default as rootReducer, RootState } from "./root-reducer"; -import { routerMiddleware } from "react-router-redux"; +import { createStore, applyMiddleware, compose, Middleware, combineReducers } from 'redux'; +import { routerMiddleware, routerReducer, RouterState } from "react-router-redux"; import thunkMiddleware from 'redux-thunk'; import { History } from "history"; +import projectsReducer, { ProjectState } from "./project/project-reducer"; +import sidePanelReducer, { SidePanelState } from './side-panel/side-panel-reducer'; +import authReducer, { AuthState } from "./auth/auth-reducer"; +import dataExplorerReducer, { DataExplorerState } from './data-explorer/data-explorer-reducer'; +import collectionsReducer, { CollectionState } from "./collection/collection-reducer"; + const composeEnhancers = (process.env.NODE_ENV === 'development' && - window && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) || + window && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) || compose; -export default function configureStore(initialState: RootState, history: History) { +export interface RootState { + auth: AuthState; + projects: ProjectState; + collections: CollectionState; + router: RouterState; + dataExplorer: DataExplorerState; + sidePanel: SidePanelState; +} + +const rootReducer = combineReducers({ + auth: authReducer, + projects: projectsReducer, + collections: collectionsReducer, + router: routerReducer, + dataExplorer: dataExplorerReducer, + sidePanel: sidePanelReducer +}); + + +export default function configureStore(history: History) { const middlewares: Middleware[] = [ routerMiddleware(history), thunkMiddleware ]; const enhancer = composeEnhancers(applyMiddleware(...middlewares)); - return createStore(rootReducer, initialState!, enhancer); + return createStore(rootReducer, enhancer); }