Merge branch 'master'

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

diff --git a/src/store/store.ts b/src/store/store.ts
index 6089caf35cdf409d77ceb5ede5ced2ebc4083967..7092c1d9e80c9740d22f73f308e21b999ae894f9 100644 (file)
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -11,6 +11,7 @@ import projectsReducer, { ProjectState } from "./project/project-reducer";
 import sidePanelReducer, { SidePanelState } from './side-panel/side-panel-reducer';
 import authReducer, { AuthState } from "./auth/auth-reducer";
 import collectionsReducer from "./collection/collection-reducer";
+import dataExplorerReducer, { DataExplorerState } from './data-explorer/data-explorer-reducer';
 
 const composeEnhancers =
     (process.env.NODE_ENV === 'development' &&
@@ -21,6 +22,7 @@ export interface RootState {
     auth: AuthState;
     projects: ProjectState;
     router: RouterState;
+    dataExplorer: DataExplorerState;
     sidePanel: SidePanelState;
 }
 
@@ -29,15 +31,16 @@ const rootReducer = combineReducers({
     projects: projectsReducer,
     collections: collectionsReducer,
     router: routerReducer,
+    dataExplorer: dataExplorerReducer,
     sidePanel: sidePanelReducer
 });
 
 
-export default function configureStore(initialState: RootState, history: History) {
+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);
 }