Merge branch 'master'

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

diff --git a/src/store/store.ts b/src/store/store.ts
index 20ee09d40609bd83343a548fbb1b9bf6bf1c2b86..499d89e82fd84dbfd04ef49dbb373d32b4fd1ac2 100644 (file)
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -2,26 +2,36 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { createStore, applyMiddleware, compose, Middleware } from 'redux';
-import { default as rootReducer, RootState } from "./root-reducer";
+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 authReducer, { AuthState } from "./auth/auth-reducer";
 
 const composeEnhancers =
     (process.env.NODE_ENV === 'development' &&
     window && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) ||
     compose;
 
-function configureStore(initialState?: RootState) {
-    const middlewares: Middleware[] = [];
-    const enhancer = composeEnhancers(applyMiddleware(...middlewares));
-    return createStore(rootReducer, initialState!, enhancer);
+export interface RootState {
+    auth: AuthState;
+    projects: ProjectState;
+    router: RouterState;
 }
 
-const store = configureStore({
-    projects: [
-        { name: 'Mouse genome', createdAt: '2018-05-01' },
-        { name: 'Human body', createdAt: '2018-05-01' },
-        { name: 'Secret operation', createdAt: '2018-05-01' }
-    ]
+const rootReducer = combineReducers({
+    auth: authReducer,
+    projects: projectsReducer,
+    router: routerReducer
 });
 
-export default store;
+
+export default function configureStore(initialState: RootState, history: History) {
+    const middlewares: Middleware[] = [
+        routerMiddleware(history),
+        thunkMiddleware
+    ];
+    const enhancer = composeEnhancers(applyMiddleware(...middlewares));
+    return createStore(rootReducer, initialState!, enhancer);
+}