X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/16860c6f2fedc5c150cab796e93aa21067f28e97..ac09b3b5c8ecd122b778bb9c17f2aef1f00f6b05:/src/store/store.ts diff --git a/src/store/store.ts b/src/store/store.ts index 83dca37d..517368aa 100644 --- a/src/store/store.ts +++ b/src/store/store.ts @@ -6,6 +6,7 @@ import { createStore, applyMiddleware, compose, Middleware, combineReducers, Sto import { routerMiddleware, routerReducer } from "react-router-redux"; import thunkMiddleware from 'redux-thunk'; import { History } from "history"; +import { handleRedirects } from '../common/redirect-to'; import { authReducer } from "./auth/auth-reducer"; import { authMiddleware } from "./auth/auth-middleware"; @@ -21,6 +22,7 @@ import { FAVORITE_PANEL_ID } from "./favorite-panel/favorite-panel-action"; import { PROJECT_PANEL_ID } from "./project-panel/project-panel-action"; import { ProjectPanelMiddlewareService } from "./project-panel/project-panel-middleware-service"; import { FavoritePanelMiddlewareService } from "./favorite-panel/favorite-panel-middleware-service"; +import { AllProcessesPanelMiddlewareService } from "./all-processes-panel/all-processes-panel-middleware-service"; import { collectionPanelReducer } from './collection-panel/collection-panel-reducer'; import { dialogReducer } from './dialog/dialog-reducer'; import { ServiceRepository } from "~/services/services"; @@ -66,6 +68,8 @@ import { COLLECTIONS_CONTENT_ADDRESS_PANEL_ID } from '~/store/collections-conten import { ownerNameReducer } from '~/store/owner-name/owner-name-reducer'; import { SubprocessMiddlewareService } from '~/store/subprocess-panel/subprocess-panel-middleware-service'; import { SUBPROCESS_PANEL_ID } from '~/store/subprocess-panel/subprocess-panel-actions'; +import { ALL_PROCESSES_PANEL_ID } from './all-processes-panel/all-processes-panel-action'; +import { Config } from '~/common/config'; const composeEnhancers = (process.env.NODE_ENV === 'development' && @@ -77,7 +81,7 @@ export type RootState = ReturnType>; export type RootStore = Store & { dispatch: Dispatch }; -export function configureStore(history: History, services: ServiceRepository): RootStore { +export function configureStore(history: History, services: ServiceRepository, config: Config): RootStore { const rootReducer = createRootReducer(services); const projectPanelMiddleware = dataExplorerMiddleware( @@ -86,6 +90,9 @@ export function configureStore(history: History, services: ServiceRepository): R const favoritePanelMiddleware = dataExplorerMiddleware( new FavoritePanelMiddlewareService(services, FAVORITE_PANEL_ID) ); + const allProcessessPanelMiddleware = dataExplorerMiddleware( + new AllProcessesPanelMiddlewareService(services, ALL_PROCESSES_PANEL_ID) + ); const trashPanelMiddleware = dataExplorerMiddleware( new TrashPanelMiddlewareService(services, TRASH_PANEL_ID) ); @@ -125,6 +132,15 @@ export function configureStore(history: History, services: ServiceRepository): R const subprocessMiddleware = dataExplorerMiddleware( new SubprocessMiddlewareService(services, SUBPROCESS_PANEL_ID) ); + const redirectToMiddleware = (store: any) => (next: any) => (action: any) => { + const state = store.getState(); + + if (state.auth && state.auth.apiToken) { + handleRedirects(state.auth.apiToken, config); + } + + return next(action); + }; const middlewares: Middleware[] = [ routerMiddleware(history), @@ -132,6 +148,7 @@ export function configureStore(history: History, services: ServiceRepository): R authMiddleware(services), projectPanelMiddleware, favoritePanelMiddleware, + allProcessessPanelMiddleware, trashPanelMiddleware, searchResultsPanelMiddleware, sharedWithMePanelMiddleware, @@ -144,9 +161,10 @@ export function configureStore(history: History, services: ServiceRepository): R apiClientAuthorizationMiddlewareService, publicFavoritesMiddleware, collectionsContentAddress, - subprocessMiddleware + subprocessMiddleware, ]; - const enhancer = composeEnhancers(applyMiddleware(...middlewares)); + + const enhancer = composeEnhancers(applyMiddleware(redirectToMiddleware, ...middlewares)); return createStore(rootReducer, enhancer); }