merge conflicts

[arvados-workbench2.git] / src / store / store.ts

diff --git a/src/store/store.ts b/src/store/store.ts
index 975debe816ce4944bf67aa338b5d80a6c6c4f178..01b06b9528a727cd3cb9642a16bffeb0e17954ea 100644 (file)
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -2,20 +2,53 @@
 //
 // 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 { projectPanelMiddleware } from './project-panel/project-panel-middleware';
+import { detailsPanelReducer, DetailsPanelState } from './details-panel/details-panel-reducer';
+import { contextMenuReducer, ContextMenuState } from './context-menu/context-menu-reducer';
+import { reducer as formReducer } from 'redux-form';
+
 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;
+    router: RouterState;
+    dataExplorer: DataExplorerState;
+    sidePanel: SidePanelState;
+    detailsPanel: DetailsPanelState;
+    contextMenu: ContextMenuState;
+}
+
+const rootReducer = combineReducers({
+    auth: authReducer,
+    projects: projectsReducer,
+    router: routerReducer,
+    dataExplorer: dataExplorerReducer,
+    sidePanel: sidePanelReducer,
+    detailsPanel: detailsPanelReducer,
+    contextMenu: contextMenuReducer,
+    form: formReducer
+});
+
+
+export function configureStore(history: History) {
     const middlewares: Middleware[] = [
-        routerMiddleware(history)
+        routerMiddleware(history),
+        thunkMiddleware,
+        projectPanelMiddleware
     ];
     const enhancer = composeEnhancers(applyMiddleware(...middlewares));
-    return createStore(rootReducer, initialState!, enhancer);
+    return createStore(rootReducer, enhancer);
 }