X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/77c5d854b58b46395c5db5531268494d40f27786..5430c336b96cbb7c20bffa1cbdb8cffea32fb460:/src/store/store.ts diff --git a/src/store/store.ts b/src/store/store.ts index 59a0cb12..913207c3 100644 --- a/src/store/store.ts +++ b/src/store/store.ts @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { createStore, applyMiddleware, compose, Middleware, combineReducers, Store, Action, Dispatch } from 'redux'; +import { createStore, applyMiddleware, Middleware, combineReducers, Store, Action, Dispatch } from 'redux'; import { routerMiddleware, routerReducer } from "react-router-redux"; import thunkMiddleware from 'redux-thunk'; import { History } from "history"; @@ -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,10 +50,13 @@ 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 { API_CLIENT_AUTHORIZATION_PANEL_ID } from 'store/api-client-authorizations/api-client-authorizations-actions'; @@ -70,17 +74,10 @@ 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'; - -declare global { - interface Window { - __REDUX_DEVTOOLS_EXTENSION_COMPOSE__?: typeof compose; - } -} - -const composeEnhancers = - (process.env.NODE_ENV === 'development' && - window && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) || - compose; +import { tooltipsMiddleware } from './tooltips/tooltips-middleware'; +import { sidePanelReducer } from './side-panel/side-panel-reducer' +import { bannerReducer } from './banner/banner-reducer'; +import { composeWithDevTools } from 'redux-devtools-extension'; export type RootState = ReturnType>; @@ -113,11 +110,17 @@ 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) @@ -148,6 +151,7 @@ export function configureStore(history: History, services: ServiceRepository, co routerMiddleware(history), thunkMiddleware.withExtraArgument(services), authMiddleware(services), + tooltipsMiddleware(services), projectPanelMiddleware, favoritePanelMiddleware, allProcessessPanelMiddleware, @@ -156,13 +160,16 @@ export function configureStore(history: History, services: ServiceRepository, co sharedWithMePanelMiddleware, workflowPanelMiddleware, userPanelMiddleware, + userProfileGroupsMiddleware, groupsPanelMiddleware, - groupDetailsPanelMiddleware, + groupDetailsPanelMembersMiddleware, + groupDetailsPanelPermissionsMiddleware, linkPanelMiddleware, apiClientAuthorizationMiddlewareService, publicFavoritesMiddleware, collectionsContentAddress, subprocessMiddleware, + treePickerSearchMiddleware ]; const reduceMiddlewaresFn: (a: Middleware[], @@ -170,12 +177,13 @@ export function configureStore(history: History, services: ServiceRepository, co middlewares = pluginConfig.middlewares.reduce(reduceMiddlewaresFn, middlewares); - const enhancer = composeEnhancers(applyMiddleware(redirectToMiddleware, ...middlewares)); + const enhancer = composeWithDevTools({/* options */ })(applyMiddleware(redirectToMiddleware, ...middlewares)); return createStore(rootReducer, enhancer); } const createRootReducer = (services: ServiceRepository) => combineReducers({ auth: authReducer(services), + banner: bannerReducer, collectionPanel: collectionPanelReducer, collectionPanelFiles: collectionPanelFilesReducer, contextMenu: contextMenuReducer, @@ -192,6 +200,7 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({ router: routerReducer, snackbar: snackbarReducer, treePicker: treePickerReducer, + treePickerSearch: treePickerSearchReducer, fileUploader: fileUploaderReducer, processPanel: processPanelReducer, progressIndicator: progressIndicatorReducer, @@ -201,5 +210,6 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({ virtualMachines: virtualMachinesReducer, repositories: repositoriesReducer, keepServices: keepServicesReducer, - linkAccountPanel: linkAccountPanelReducer + linkAccountPanel: linkAccountPanelReducer, + sidePanel: sidePanelReducer });