X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/3b53b656e65fdabc32b3bc748074eb35e9df98eb..22821296e913d4be63d4a40c33e7c28c5582cdd5:/src/store/store.ts diff --git a/src/store/store.ts b/src/store/store.ts index 8a2ca240..030b6576 100644 --- a/src/store/store.ts +++ b/src/store/store.ts @@ -8,7 +8,7 @@ import thunkMiddleware from 'redux-thunk'; import { History } from "history"; import { authReducer } from "./auth/auth-reducer"; -import { configReducer } from "./config/config-reducer"; +import { authMiddleware } from "./auth/auth-middleware"; import { dataExplorerReducer } from './data-explorer/data-explorer-reducer'; import { detailsPanelReducer } from './details-panel/details-panel-reducer'; import { contextMenuReducer } from './context-menu/context-menu-reducer'; @@ -21,13 +21,13 @@ 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 { AllProcessesPanelMiddlewareService } from "./all-processes-panel/all-processes-panel-middleware-service"; import { collectionPanelReducer } from './collection-panel/collection-panel-reducer'; import { dialogReducer } from './dialog/dialog-reducer'; import { ServiceRepository } from "~/services/services"; import { treePickerReducer } from './tree-picker/tree-picker-reducer'; import { resourcesReducer } from '~/store/resources/resources-reducer'; import { propertiesReducer } from './properties/properties-reducer'; -import { RootState } from './store'; import { fileUploaderReducer } from './file-uploader/file-uploader-reducer'; import { TrashPanelMiddlewareService } from "~/store/trash-panel/trash-panel-middleware-service"; import { TRASH_PANEL_ID } from "~/store/trash-panel/trash-panel-action"; @@ -43,7 +43,6 @@ import { appInfoReducer } from '~/store/app-info/app-info-reducer'; import { searchBarReducer } from './search-bar/search-bar-reducer'; import { SEARCH_RESULTS_PANEL_ID } from '~/store/search-results-panel/search-results-panel-actions'; import { SearchResultsMiddlewareService } from './search-results-panel/search-results-middleware-service'; -import { resourcesDataReducer } from "~/store/resources-data/resources-data-reducer"; import { virtualMachinesReducer } from "~/store/virtual-machines/virtual-machines-reducer"; import { repositoriesReducer } from '~/store/repositories/repositories-reducer'; import { keepServicesReducer } from '~/store/keep-services/keep-services-reducer'; @@ -66,6 +65,9 @@ import { linkAccountPanelReducer } from './link-account-panel/link-account-panel import { CollectionsWithSameContentAddressMiddlewareService } from '~/store/collections-content-address-panel/collections-content-address-middleware-service'; import { COLLECTIONS_CONTENT_ADDRESS_PANEL_ID } from '~/store/collections-content-address-panel/collections-content-address-panel-actions'; import { ownerNameReducer } from '~/store/owner-name/owner-name-reducer'; +import { SubprocessMiddlewareService } from '~/store/subprocess-panel/subprocess-panel-middleware-service'; +import { SUBPROCESS_PANEL_ID } from '~/store/subprocess-panel/subprocess-panel-actions'; +import { ALL_PROCESSES_PANEL_ID } from './all-processes-panel/all-processes-panel-action'; const composeEnhancers = (process.env.NODE_ENV === 'development' && @@ -86,6 +88,9 @@ export function configureStore(history: History, services: ServiceRepository): R const favoritePanelMiddleware = dataExplorerMiddleware( new FavoritePanelMiddlewareService(services, FAVORITE_PANEL_ID) ); + const allProcessessPanelMiddleware = dataExplorerMiddleware( + new AllProcessesPanelMiddlewareService(services, ALL_PROCESSES_PANEL_ID) + ); const trashPanelMiddleware = dataExplorerMiddleware( new TrashPanelMiddlewareService(services, TRASH_PANEL_ID) ); @@ -122,12 +127,17 @@ export function configureStore(history: History, services: ServiceRepository): R const collectionsContentAddress = dataExplorerMiddleware( new CollectionsWithSameContentAddressMiddlewareService(services, COLLECTIONS_CONTENT_ADDRESS_PANEL_ID) ); + const subprocessMiddleware = dataExplorerMiddleware( + new SubprocessMiddlewareService(services, SUBPROCESS_PANEL_ID) + ); const middlewares: Middleware[] = [ routerMiddleware(history), thunkMiddleware.withExtraArgument(services), + authMiddleware(services), projectPanelMiddleware, favoritePanelMiddleware, + allProcessessPanelMiddleware, trashPanelMiddleware, searchResultsPanelMiddleware, sharedWithMePanelMiddleware, @@ -139,7 +149,8 @@ export function configureStore(history: History, services: ServiceRepository): R computeNodeMiddleware, apiClientAuthorizationMiddlewareService, publicFavoritesMiddleware, - collectionsContentAddress + collectionsContentAddress, + subprocessMiddleware ]; const enhancer = composeEnhancers(applyMiddleware(...middlewares)); return createStore(rootReducer, enhancer); @@ -147,7 +158,6 @@ export function configureStore(history: History, services: ServiceRepository): R const createRootReducer = (services: ServiceRepository) => combineReducers({ auth: authReducer(services), - config: configReducer, collectionPanel: collectionPanelReducer, collectionPanelFiles: collectionPanelFilesReducer, contextMenu: contextMenuReducer, @@ -161,7 +171,6 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({ processLogsPanel: processLogsPanelReducer, properties: propertiesReducer, resources: resourcesReducer, - resourcesData: resourcesDataReducer, router: routerReducer, snackbar: snackbarReducer, treePicker: treePickerReducer,