X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/38d27e9783f7f760cee84cc225e86144069848c4..fe9217330135c4fe4fca85900419f0cde547e483:/src/store/store.ts diff --git a/src/store/store.ts b/src/store/store.ts index d0f1af871d..1501fd4fb5 100644 --- a/src/store/store.ts +++ b/src/store/store.ts @@ -26,7 +26,8 @@ import { AllProcessesPanelMiddlewareService } from "./all-processes-panel/all-pr 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 { treePickerReducer, treePickerSearchReducer } from './tree-picker/tree-picker-reducer'; +import { treePickerSearchMiddleware } from './tree-picker/tree-picker-middleware'; import { resourcesReducer } from 'store/resources/resources-reducer'; import { propertiesReducer } from './properties/properties-reducer'; import { fileUploaderReducer } from './file-uploader/file-uploader-reducer'; @@ -49,14 +50,15 @@ 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 { UserProfileGroupsMiddlewareService } from 'store/user-profile/user-profile-groups-middleware-service'; +import { USER_PROFILE_PANEL_ID } from 'store/user-profile/user-profile-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 { GroupDetailsPanelMembersMiddlewareService } from 'store/group-details-panel/group-details-panel-members-middleware-service'; +import { GroupDetailsPanelPermissionsMiddlewareService } from 'store/group-details-panel/group-details-panel-permissions-middleware-service'; +import { GROUP_DETAILS_MEMBERS_PANEL_ID, GROUP_DETAILS_PERMISSIONS_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'; @@ -72,10 +74,13 @@ import { ALL_PROCESSES_PANEL_ID } from './all-processes-panel/all-processes-pane import { Config } from 'common/config'; import { pluginConfig } from 'plugins'; import { MiddlewareListReducer } from 'common/plugintypes'; +import { tooltipsMiddleware } from './tooltips/tooltips-middleware'; +import { sidePanelReducer } from './side-panel/side-panel-reducer' +import { bannerReducer } from './banner/banner-reducer'; declare global { interface Window { - __REDUX_DEVTOOLS_EXTENSION_COMPOSE__?: typeof compose; + __REDUX_DEVTOOLS_EXTENSION_COMPOSE__?: typeof compose; } } @@ -115,18 +120,21 @@ export function configureStore(history: History, services: ServiceRepository, co const userPanelMiddleware = dataExplorerMiddleware( new UserMiddlewareService(services, USERS_PANEL_ID) ); + const userProfileGroupsMiddleware = dataExplorerMiddleware( + new UserProfileGroupsMiddlewareService(services, USER_PROFILE_PANEL_ID) + ); const groupsPanelMiddleware = dataExplorerMiddleware( new GroupsPanelMiddlewareService(services, GROUPS_PANEL_ID) ); - const groupDetailsPanelMiddleware = dataExplorerMiddleware( - new GroupDetailsPanelMiddlewareService(services, GROUP_DETAILS_PANEL_ID) + const groupDetailsPanelMembersMiddleware = dataExplorerMiddleware( + new GroupDetailsPanelMembersMiddlewareService(services, GROUP_DETAILS_MEMBERS_PANEL_ID) + ); + const groupDetailsPanelPermissionsMiddleware = dataExplorerMiddleware( + new GroupDetailsPanelPermissionsMiddlewareService(services, GROUP_DETAILS_PERMISSIONS_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) ); @@ -153,6 +161,7 @@ export function configureStore(history: History, services: ServiceRepository, co routerMiddleware(history), thunkMiddleware.withExtraArgument(services), authMiddleware(services), + tooltipsMiddleware(services), projectPanelMiddleware, favoritePanelMiddleware, allProcessessPanelMiddleware, @@ -161,14 +170,16 @@ export function configureStore(history: History, services: ServiceRepository, co sharedWithMePanelMiddleware, workflowPanelMiddleware, userPanelMiddleware, + userProfileGroupsMiddleware, groupsPanelMiddleware, - groupDetailsPanelMiddleware, + groupDetailsPanelMembersMiddleware, + groupDetailsPanelPermissionsMiddleware, linkPanelMiddleware, - computeNodeMiddleware, apiClientAuthorizationMiddlewareService, publicFavoritesMiddleware, collectionsContentAddress, subprocessMiddleware, + treePickerSearchMiddleware ]; const reduceMiddlewaresFn: (a: Middleware[], @@ -182,6 +193,7 @@ export function configureStore(history: History, services: ServiceRepository, co const createRootReducer = (services: ServiceRepository) => combineReducers({ auth: authReducer(services), + banner: bannerReducer, collectionPanel: collectionPanelReducer, collectionPanelFiles: collectionPanelFilesReducer, contextMenu: contextMenuReducer, @@ -198,6 +210,7 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({ router: routerReducer, snackbar: snackbarReducer, treePicker: treePickerReducer, + treePickerSearch: treePickerSearchReducer, fileUploader: fileUploaderReducer, processPanel: processPanelReducer, progressIndicator: progressIndicatorReducer, @@ -207,5 +220,6 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({ virtualMachines: virtualMachinesReducer, repositories: repositoriesReducer, keepServices: keepServicesReducer, - linkAccountPanel: linkAccountPanelReducer + linkAccountPanel: linkAccountPanelReducer, + sidePanel: sidePanelReducer });