X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1b438678854a42f00e19f351caf0004c7d46ff8c..d8b1643373ec164a5ae57cd10a951ea01f37f7d7:/src/store/store.ts diff --git a/src/store/store.ts b/src/store/store.ts index 4ad7ca45f3..0be577c45a 100644 --- a/src/store/store.ts +++ b/src/store/store.ts @@ -48,7 +48,6 @@ 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 { 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'; @@ -57,10 +56,13 @@ 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'; const composeEnhancers = (process.env.NODE_ENV === 'development' && - window && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({trace: true, traceLimit: 25})) || + window && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ && + window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({trace: true, traceLimit: 25})) || compose; export type RootState = ReturnType>; @@ -97,13 +99,15 @@ 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 computeNodeMiddleware = dataExplorerMiddleware( new ComputeNodeMiddlewareService(services, COMPUTE_NODE_PANEL_ID) ); + const apiClientAuthorizationMiddlewareService = dataExplorerMiddleware( + new ApiClientAuthorizationMiddlewareService(services, API_CLIENT_AUTHORIZATION_PANEL_ID) + ); const middlewares: Middleware[] = [ routerMiddleware(history), thunkMiddleware.withExtraArgument(services), @@ -118,6 +122,7 @@ export function configureStore(history: History, services: ServiceRepository): R groupDetailsPanelMiddleware, linkPanelMiddleware, computeNodeMiddleware, + apiClientAuthorizationMiddlewareService ]; const enhancer = composeEnhancers(applyMiddleware(...middlewares)); return createStore(rootReducer, enhancer); @@ -148,6 +153,5 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({ searchBar: searchBarReducer, virtualMachines: virtualMachinesReducer, repositories: repositoriesReducer, - keepServices: keepServicesReducer, - apiClientAuthorizations: apiClientAuthorizationsReducer + keepServices: keepServicesReducer });