X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/7396826c81a54608d3e7e718b3ca8d5107099df1..1826bc21a34b983778f6e221b6c4004fdea1ad1d:/src/store/store.ts diff --git a/src/store/store.ts b/src/store/store.ts index d196e632..ff9a495e 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,15 +49,27 @@ 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'; +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 { 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'; 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>; @@ -87,12 +100,28 @@ export function configureStore(history: History, services: ServiceRepository): R const userPanelMiddleware = dataExplorerMiddleware( new UserMiddlewareService(services, USERS_PANEL_ID) ); + const groupsPanelMiddleware = dataExplorerMiddleware( + new GroupsPanelMiddlewareService(services, GROUPS_PANEL_ID) + ); + 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 publicFavoritesMiddleware = dataExplorerMiddleware( + new PublicFavoritesMiddlewareService(services, PUBLIC_FAVORITE_PANEL_ID) + ); + const collectionsContentAddress = dataExplorerMiddleware( + new CollectionsWithSameContentAddressMiddlewareService(services, COLLECTIONS_CONTENT_ADDRESS_PANEL_ID) + ); + const middlewares: Middleware[] = [ routerMiddleware(history), thunkMiddleware.withExtraArgument(services), @@ -103,8 +132,13 @@ export function configureStore(history: History, services: ServiceRepository): R sharedWithMePanelMiddleware, workflowPanelMiddleware, userPanelMiddleware, + groupsPanelMiddleware, + groupDetailsPanelMiddleware, linkPanelMiddleware, - computeNodeMiddleware + computeNodeMiddleware, + apiClientAuthorizationMiddlewareService, + publicFavoritesMiddleware, + collectionsContentAddress ]; const enhancer = composeEnhancers(applyMiddleware(...middlewares)); return createStore(rootReducer, enhancer); @@ -112,6 +146,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, @@ -119,6 +154,8 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({ detailsPanel: detailsPanelReducer, dialog: dialogReducer, favorites: favoritesReducer, + ownerName: ownerNameReducer, + publicFavorites: publicFavoritesReducer, form: formReducer, processLogsPanel: processLogsPanelReducer, properties: propertiesReducer, @@ -135,6 +172,5 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({ searchBar: searchBarReducer, virtualMachines: virtualMachinesReducer, repositories: repositoriesReducer, - keepServices: keepServicesReducer, - apiClientAuthorizations: apiClientAuthorizationsReducer + keepServices: keepServicesReducer });