projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20219: Improve useAsyncInterval testability, add unit test
[arvados-workbench2.git]
/
src
/
store
/
store.ts
diff --git
a/src/store/store.ts
b/src/store/store.ts
index 4ef5e3d0e5c45d4bb29bcc8f701f701dd65d7af7..913207c35769ddb6cb39608be5f6b988d0bb7499 100644
(file)
--- a/
src/store/store.ts
+++ b/
src/store/store.ts
@@
-2,7
+2,7
@@
//
// SPDX-License-Identifier: AGPL-3.0
//
// 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";
import { routerMiddleware, routerReducer } from "react-router-redux";
import thunkMiddleware from 'redux-thunk';
import { History } from "history";
@@
-74,19
+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';
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';
import { sidePanelReducer } from './side-panel/side-panel-reducer'
import { bannerReducer } from './banner/banner-reducer';
-
-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 { composeWithDevTools } from 'redux-devtools-extension';
export type RootState = ReturnType<ReturnType<typeof createRootReducer>>;
export type RootState = ReturnType<ReturnType<typeof createRootReducer>>;
@@
-160,6
+151,7
@@
export function configureStore(history: History, services: ServiceRepository, co
routerMiddleware(history),
thunkMiddleware.withExtraArgument(services),
authMiddleware(services),
routerMiddleware(history),
thunkMiddleware.withExtraArgument(services),
authMiddleware(services),
+ tooltipsMiddleware(services),
projectPanelMiddleware,
favoritePanelMiddleware,
allProcessessPanelMiddleware,
projectPanelMiddleware,
favoritePanelMiddleware,
allProcessessPanelMiddleware,
@@
-185,7
+177,7
@@
export function configureStore(history: History, services: ServiceRepository, co
middlewares = pluginConfig.middlewares.reduce(reduceMiddlewaresFn, middlewares);
middlewares = pluginConfig.middlewares.reduce(reduceMiddlewaresFn, middlewares);
- const enhancer = compose
Enhancers
(applyMiddleware(redirectToMiddleware, ...middlewares));
+ const enhancer = compose
WithDevTools({/* options */ })
(applyMiddleware(redirectToMiddleware, ...middlewares));
return createStore(rootReducer, enhancer);
}
return createStore(rootReducer, enhancer);
}