merge-conflicts

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

diff --git a/src/store/store.ts b/src/store/store.ts
index d541156e2d3613f6ddd4bd920fb659528c6e1a2b..6089caf35cdf409d77ceb5ede5ced2ebc4083967 100644 (file)
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -6,24 +6,30 @@ import { createStore, applyMiddleware, compose, Middleware, combineReducers } fr
 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 collectionsReducer 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 interface RootState {
-    auth: AuthState,
-    projects: ProjectState,
-    router: RouterState
+    auth: AuthState;
+    projects: ProjectState;
+    router: RouterState;
+    sidePanel: SidePanelState;
 }
 
 const rootReducer = combineReducers({
     auth: authReducer,
     projects: projectsReducer,
-    router: routerReducer
+    collections: collectionsReducer,
+    router: routerReducer,
+    sidePanel: sidePanelReducer
 });