X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/24ddc06cb04b124d337e91c190230bfad83e490b..c11055f2d6ce8385088bc221eab1175e31777ec0:/src/store/store.ts diff --git a/src/store/store.ts b/src/store/store.ts index 2154b3b0d3..a4bf9d6e3b 100644 --- a/src/store/store.ts +++ b/src/store/store.ts @@ -11,14 +11,24 @@ 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 { favoritePanelMiddleware } from "./favorite-panel/favorite-panel-middleware"; import { reducer as formReducer } from 'redux-form'; import { FavoritesState, favoritesReducer } from './favorites/favorites-reducer'; import { snackbarReducer, SnackbarState } from './snackbar/snackbar-reducer'; -import { ServiceRepository } from "../services/services"; +import { CollectionPanelFilesState } from './collection-panel/collection-panel-files/collection-panel-files-state'; +import { collectionPanelFilesReducer } from './collection-panel/collection-panel-files/collection-panel-files-reducer'; +import { dataExplorerMiddleware } from "./data-explorer/data-explorer-middleware"; +import { FAVORITE_PANEL_ID } from "./favorite-panel/favorite-panel-action"; +import { PROJECT_PANEL_ID } from "./project-panel/project-panel-action"; +import { ProjectPanelMiddlewareService } from "./project-panel/project-panel-middleware-service"; +import { FavoritePanelMiddlewareService } from "./favorite-panel/favorite-panel-middleware-service"; +import { CollectionPanelState, collectionPanelReducer } from './collection-panel/collection-panel-reducer'; +import { DialogState, dialogReducer } from './dialog/dialog-reducer'; +import { CollectionsState, collectionsReducer } from './collections/collections-reducer'; +import { ServiceRepository } from "~/services/services"; +import { treePickerReducer } from './tree-picker/tree-picker-reducer'; +import { TreePicker } from './tree-picker/tree-picker'; const composeEnhancers = (process.env.NODE_ENV === 'development' && @@ -28,13 +38,18 @@ const composeEnhancers = export interface RootState { auth: AuthState; projects: ProjectState; + collections: CollectionsState; router: RouterState; dataExplorer: DataExplorerState; sidePanel: SidePanelState; + collectionPanel: CollectionPanelState; detailsPanel: DetailsPanelState; contextMenu: ContextMenuState; favorites: FavoritesState; snackbar: SnackbarState; + collectionPanelFiles: CollectionPanelFilesState; + dialog: DialogState; + treePicker: TreePicker; } export type RootStore = Store & { dispatch: Dispatch }; @@ -43,21 +58,33 @@ export function configureStore(history: History, services: ServiceRepository): R const rootReducer = combineReducers({ auth: authReducer(services), projects: projectsReducer, + collections: collectionsReducer, router: routerReducer, dataExplorer: dataExplorerReducer, sidePanel: sidePanelReducer, + collectionPanel: collectionPanelReducer, detailsPanel: detailsPanelReducer, contextMenu: contextMenuReducer, form: formReducer, favorites: favoritesReducer, snackbar: snackbarReducer, + collectionPanelFiles: collectionPanelFilesReducer, + dialog: dialogReducer, + treePicker: treePickerReducer, }); + const projectPanelMiddleware = dataExplorerMiddleware( + new ProjectPanelMiddlewareService(services, PROJECT_PANEL_ID) + ); + const favoritePanelMiddleware = dataExplorerMiddleware( + new FavoritePanelMiddlewareService(services, FAVORITE_PANEL_ID) + ); + const middlewares: Middleware[] = [ routerMiddleware(history), thunkMiddleware.withExtraArgument(services), - projectPanelMiddleware(services), - favoritePanelMiddleware(services) + projectPanelMiddleware, + favoritePanelMiddleware ]; const enhancer = composeEnhancers(applyMiddleware(...middlewares)); return createStore(rootReducer, enhancer);