projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17637: Fixes edge case while simplifying code.
[arvados.git]
/
src
/
store
/
store.ts
diff --git
a/src/store/store.ts
b/src/store/store.ts
index 517368aa43badea0d26c3bd6dbb54701257e0572..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' &&
@@
-142,7
+144,7
@@
export function configureStore(history: History, services: ServiceRepository, co
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),
@@
-164,6
+166,11
@@
export function configureStore(history: History, services: ServiceRepository, co
subprocessMiddleware,
];
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);
}