X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/785a62a8934dc439cbd201d9011775ccbcbb2c24..72ee613468c6dee53b98ed1469ce9781a942dbe9:/src/store/store.ts diff --git a/src/store/store.ts b/src/store/store.ts index f8bdcc24c6..7e69a72873 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 { 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'; @@ -26,7 +27,6 @@ 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"; @@ -46,10 +46,30 @@ import { resourcesDataReducer } from "~/store/resources-data/resources-data-redu 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 { 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'; 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>; @@ -77,16 +97,49 @@ export function configureStore(history: History, services: ServiceRepository): R const workflowPanelMiddleware = dataExplorerMiddleware( new WorkflowMiddlewareService(services, WORKFLOW_PANEL_ID) ); + 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), + authMiddleware(services), projectPanelMiddleware, favoritePanelMiddleware, trashPanelMiddleware, searchResultsPanelMiddleware, sharedWithMePanelMiddleware, - workflowPanelMiddleware + workflowPanelMiddleware, + userPanelMiddleware, + groupsPanelMiddleware, + groupDetailsPanelMiddleware, + linkPanelMiddleware, + computeNodeMiddleware, + apiClientAuthorizationMiddlewareService, + publicFavoritesMiddleware, + collectionsContentAddress ]; const enhancer = composeEnhancers(applyMiddleware(...middlewares)); return createStore(rootReducer, enhancer); @@ -101,6 +154,8 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({ detailsPanel: detailsPanelReducer, dialog: dialogReducer, favorites: favoritesReducer, + ownerName: ownerNameReducer, + publicFavorites: publicFavoritesReducer, form: formReducer, processLogsPanel: processLogsPanelReducer, properties: propertiesReducer, @@ -117,5 +172,6 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({ searchBar: searchBarReducer, virtualMachines: virtualMachinesReducer, repositories: repositoriesReducer, - keepServices: keepServicesReducer + keepServices: keepServicesReducer, + linkAccountPanel: linkAccountPanelReducer });