X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/59329caeae17903b97b90b167df5a8122a0c9d95..31e84a9315728c2f58a26bf0e9e1d2b38326fb86:/src/store/store.ts?ds=sidebyside diff --git a/src/store/store.ts b/src/store/store.ts index 3aef8f50..f236d029 100644 --- a/src/store/store.ts +++ b/src/store/store.ts @@ -6,8 +6,10 @@ import { createStore, applyMiddleware, compose, Middleware, combineReducers, Sto import { routerMiddleware, routerReducer } from "react-router-redux"; import thunkMiddleware from 'redux-thunk'; import { History } from "history"; +import { handleRedirects } from '../common/redirect-to'; import { authReducer } from "./auth/auth-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'; @@ -20,13 +22,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"; @@ -42,31 +44,46 @@ 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'; import { UserMiddlewareService } from '~/store/users/user-panel-middleware-service'; import { USERS_PANEL_ID } from '~/store/users/users-actions'; -import { computeNodesReducer } from '~/store/compute-nodes/compute-nodes-reducer'; -import { apiClientAuthorizationsReducer } from '~/store/api-client-authorizations/api-client-authorizations-reducer'; import { GroupsPanelMiddlewareService } from '~/store/groups-panel/groups-panel-middleware-service'; import { GROUPS_PANEL_ID } from '~/store/groups-panel/groups-panel-actions'; import { GroupDetailsPanelMiddlewareService } from '~/store/group-details-panel/group-details-panel-middleware-service'; import { GROUP_DETAILS_PANEL_ID } from '~/store/group-details-panel/group-details-panel-actions'; import { LINK_PANEL_ID } from '~/store/link-panel/link-panel-actions'; import { LinkMiddlewareService } from '~/store/link-panel/link-panel-middleware-service'; +import { COMPUTE_NODE_PANEL_ID } from '~/store/compute-nodes/compute-nodes-actions'; +import { ComputeNodeMiddlewareService } from '~/store/compute-nodes/compute-nodes-middleware-service'; +import { API_CLIENT_AUTHORIZATION_PANEL_ID } from '~/store/api-client-authorizations/api-client-authorizations-actions'; +import { ApiClientAuthorizationMiddlewareService } from '~/store/api-client-authorizations/api-client-authorizations-middleware-service'; +import { PublicFavoritesMiddlewareService } from '~/store/public-favorites-panel/public-favorites-middleware-service'; +import { PUBLIC_FAVORITE_PANEL_ID } from '~/store/public-favorites-panel/public-favorites-action'; +import { publicFavoritesReducer } from '~/store/public-favorites/public-favorites-reducer'; +import { linkAccountPanelReducer } from './link-account-panel/link-account-panel-reducer'; +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'; +import { Config } from '~/common/config'; +import { pluginConfig } from '~/plugins'; +import { MiddlewareListReducer } from '~/common/plugintypes'; const composeEnhancers = (process.env.NODE_ENV === 'development' && - window && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) || + window && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ && + window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({ trace: true, traceLimit: 25 })) || compose; export type RootState = ReturnType>; export type RootStore = Store & { dispatch: Dispatch }; -export function configureStore(history: History, services: ServiceRepository): RootStore { +export function configureStore(history: History, services: ServiceRepository, config: Config): RootStore { const rootReducer = createRootReducer(services); const projectPanelMiddleware = dataExplorerMiddleware( @@ -75,6 +92,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) ); @@ -96,15 +116,41 @@ export function configureStore(history: History, services: ServiceRepository): R const groupDetailsPanelMiddleware = dataExplorerMiddleware( new GroupDetailsPanelMiddlewareService(services, GROUP_DETAILS_PANEL_ID) ); - const linkPanelMiddleware = dataExplorerMiddleware( new LinkMiddlewareService(services, LINK_PANEL_ID) ); - const middlewares: Middleware[] = [ + const computeNodeMiddleware = dataExplorerMiddleware( + new ComputeNodeMiddlewareService(services, COMPUTE_NODE_PANEL_ID) + ); + const apiClientAuthorizationMiddlewareService = dataExplorerMiddleware( + new ApiClientAuthorizationMiddlewareService(services, API_CLIENT_AUTHORIZATION_PANEL_ID) + ); + const publicFavoritesMiddleware = dataExplorerMiddleware( + new PublicFavoritesMiddlewareService(services, PUBLIC_FAVORITE_PANEL_ID) + ); + const collectionsContentAddress = dataExplorerMiddleware( + new CollectionsWithSameContentAddressMiddlewareService(services, COLLECTIONS_CONTENT_ADDRESS_PANEL_ID) + ); + const subprocessMiddleware = dataExplorerMiddleware( + new SubprocessMiddlewareService(services, SUBPROCESS_PANEL_ID) + ); + const redirectToMiddleware = (store: any) => (next: any) => (action: any) => { + const state = store.getState(); + + if (state.auth && state.auth.apiToken) { + handleRedirects(state.auth.apiToken, config); + } + + return next(action); + }; + + let middlewares: Middleware[] = [ routerMiddleware(history), thunkMiddleware.withExtraArgument(services), + authMiddleware(services), projectPanelMiddleware, favoritePanelMiddleware, + allProcessessPanelMiddleware, trashPanelMiddleware, searchResultsPanelMiddleware, sharedWithMePanelMiddleware, @@ -112,9 +158,20 @@ export function configureStore(history: History, services: ServiceRepository): R userPanelMiddleware, groupsPanelMiddleware, groupDetailsPanelMiddleware, - linkPanelMiddleware + linkPanelMiddleware, + computeNodeMiddleware, + apiClientAuthorizationMiddlewareService, + publicFavoritesMiddleware, + collectionsContentAddress, + subprocessMiddleware, ]; - const enhancer = composeEnhancers(applyMiddleware(...middlewares)); + + const reduceMiddlewaresFn: (a: Middleware[], + b: MiddlewareListReducer) => Middleware[] = (a, b) => b(a, services); + + middlewares = pluginConfig.middlewares.reduce(reduceMiddlewaresFn, middlewares); + + const enhancer = composeEnhancers(applyMiddleware(redirectToMiddleware, ...middlewares)); return createStore(rootReducer, enhancer); } @@ -127,11 +184,12 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({ detailsPanel: detailsPanelReducer, dialog: dialogReducer, favorites: favoritesReducer, + ownerName: ownerNameReducer, + publicFavorites: publicFavoritesReducer, form: formReducer, processLogsPanel: processLogsPanelReducer, properties: propertiesReducer, resources: resourcesReducer, - resourcesData: resourcesDataReducer, router: routerReducer, snackbar: snackbarReducer, treePicker: treePickerReducer, @@ -144,6 +202,5 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({ virtualMachines: virtualMachinesReducer, repositories: repositoriesReducer, keepServices: keepServicesReducer, - computeNodes: computeNodesReducer, - apiClientAuthorizations: apiClientAuthorizationsReducer + linkAccountPanel: linkAccountPanelReducer });