X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/7622261116e685cad4af9cf6a4d1dd9c58cd1605..8c97d1e597b9befcad7f03f48078a2404c3e4c65:/src/store/store.ts diff --git a/src/store/store.ts b/src/store/store.ts index f74b8773..8a5136c9 100644 --- a/src/store/store.ts +++ b/src/store/store.ts @@ -7,13 +7,15 @@ 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"; -import { projectPanelMiddleware } from '../store/project-panel/project-panel-middleware'; -import detailsPanelReducer, { DetailsPanelState } from './details-panel/details-panel-reducer'; +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'; +import { FavoritesState, favoritesReducer } from './favorites/favorites-reducer'; const composeEnhancers = (process.env.NODE_ENV === 'development' && @@ -23,25 +25,28 @@ const composeEnhancers = export interface RootState { auth: AuthState; projects: ProjectState; - collections: CollectionState; router: RouterState; dataExplorer: DataExplorerState; sidePanel: SidePanelState; detailsPanel: DetailsPanelState; + contextMenu: ContextMenuState; + favorites: FavoritesState; } const rootReducer = combineReducers({ auth: authReducer, projects: projectsReducer, - collections: collectionsReducer, router: routerReducer, dataExplorer: dataExplorerReducer, sidePanel: sidePanelReducer, - detailsPanel: detailsPanelReducer + detailsPanel: detailsPanelReducer, + contextMenu: contextMenuReducer, + form: formReducer, + favorites: favoritesReducer, }); -export default function configureStore(history: History) { +export function configureStore(history: History) { const middlewares: Middleware[] = [ routerMiddleware(history), thunkMiddleware,