projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17427: Add some optional parameters to openRunProcess()
[arvados.git]
/
src
/
store
/
store.ts
diff --git
a/src/store/store.ts
b/src/store/store.ts
index a6e0cbbe8556459a51abf0f004f6fd90145b9120..f236d02948b617885e97dbea89b7ffa237026d16 100644
(file)
--- a/
src/store/store.ts
+++ b/
src/store/store.ts
@@
-70,6
+70,8
@@
import { SubprocessMiddlewareService } from '~/store/subprocess-panel/subprocess
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';
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';
+import { pluginConfig } from '~/plugins';
+import { MiddlewareListReducer } from '~/common/plugintypes';
const composeEnhancers =
(process.env.NODE_ENV === 'development' &&
const composeEnhancers =
(process.env.NODE_ENV === 'development' &&
@@
-136,13
+138,13
@@
export function configureStore(history: History, services: ServiceRepository, co
const state = store.getState();
if (state.auth && state.auth.apiToken) {
const state = store.getState();
if (state.auth && state.auth.apiToken) {
- handleRedirects(config);
+ handleRedirects(
state.auth.apiToken,
config);
}
return next(action);
};
}
return next(action);
};
-
cons
t middlewares: Middleware[] = [
+
le
t middlewares: Middleware[] = [
routerMiddleware(history),
thunkMiddleware.withExtraArgument(services),
authMiddleware(services),
routerMiddleware(history),
thunkMiddleware.withExtraArgument(services),
authMiddleware(services),
@@
-163,6
+165,12
@@
export function configureStore(history: History, services: ServiceRepository, co
collectionsContentAddress,
subprocessMiddleware,
];
collectionsContentAddress,
subprocessMiddleware,
];
+
+ const reduceMiddlewaresFn: (a: Middleware[],
+ b: MiddlewareListReducer) => Middleware[] = (a, b) => b(a, services);
+
+ middlewares = pluginConfig.middlewares.reduce(reduceMiddlewaresFn, middlewares);
+
const enhancer = composeEnhancers(applyMiddleware(redirectToMiddleware, ...middlewares));
return createStore(rootReducer, enhancer);
}
const enhancer = composeEnhancers(applyMiddleware(redirectToMiddleware, ...middlewares));
return createStore(rootReducer, enhancer);
}