X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/9a37cc202448e431064b247d36ac0229a6bfa9b2..bf5bf5faa1f61a2b78ff6153daff70a7bb08e939:/src/store/store.ts diff --git a/src/store/store.ts b/src/store/store.ts index 14a6ba11..04813b1c 100644 --- a/src/store/store.ts +++ b/src/store/store.ts @@ -8,6 +8,7 @@ import thunkMiddleware from 'redux-thunk'; import { History } from "history"; import { authReducer } from "./auth/auth-reducer"; +import { configReducer } from "./config/config-reducer"; import { dataExplorerReducer } from './data-explorer/data-explorer-reducer'; import { detailsPanelReducer } from './details-panel/details-panel-reducer'; import { contextMenuReducer } from './context-menu/context-menu-reducer'; @@ -48,7 +49,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 +57,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__) || + window && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ && + window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({ trace: true, traceLimit: 25 })) || compose; export type RootState = ReturnType>; @@ -97,13 +100,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 +123,7 @@ export function configureStore(history: History, services: ServiceRepository): R groupDetailsPanelMiddleware, linkPanelMiddleware, computeNodeMiddleware, + apiClientAuthorizationMiddlewareService ]; const enhancer = composeEnhancers(applyMiddleware(...middlewares)); return createStore(rootReducer, enhancer); @@ -125,6 +131,7 @@ export function configureStore(history: History, services: ServiceRepository): R const createRootReducer = (services: ServiceRepository) => combineReducers({ auth: authReducer(services), + config: configReducer, collectionPanel: collectionPanelReducer, collectionPanelFiles: collectionPanelFilesReducer, contextMenu: contextMenuReducer, @@ -148,6 +155,5 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({ searchBar: searchBarReducer, virtualMachines: virtualMachinesReducer, repositories: repositoriesReducer, - keepServices: keepServicesReducer, - apiClientAuthorizations: apiClientAuthorizationsReducer + keepServices: keepServicesReducer });