diff --git a/package.json b/package.json index 7ebf89ad2..8d5fab59f 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,9 @@ "react-router-dom": "^5.0.1", "react-viewerbase": "0.9.0", "redux": "^4.0.1", - "redux-oidc": "3.1.x" + "redux-logger": "^3.0.6", + "redux-oidc": "3.1.x", + "redux-thunk": "^2.3.0" }, "devDependencies": { "@babel/core": "^7.4.5", diff --git a/src/appCommands/index.js b/src/appCommands/index.js index e7c263eef..40591d5f1 100644 --- a/src/appCommands/index.js +++ b/src/appCommands/index.js @@ -2,7 +2,6 @@ import viewerCommandDefinitions from './viewer.js'; const CONTEXTS = { viewer: 'VIEWER', - cornerstone: 'VIEWER::CORNERSTONE', }; /** diff --git a/src/store/index.js b/src/store/index.js index 04c81a2d6..54eea52d1 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1,18 +1,28 @@ -import { combineReducers, createStore } from 'redux'; +import { applyMiddleware, combineReducers, createStore } from 'redux'; +import { createLogger } from 'redux-logger'; import layoutReducers from './layout/reducers.js'; import { reducer as oidcReducer } from 'redux-oidc'; import { redux } from 'ohif-core'; +import thunkMiddleware from 'redux-thunk'; // Combine our ohif-core, ui, and oidc reducers // Set init data, using values found in localStorage const { reducers, localStorage } = redux; +const loggerMiddleware = createLogger(); reducers.ui = layoutReducers; reducers.oidc = oidcReducer; -const combined = combineReducers(reducers); -const store = createStore(combined, localStorage.loadState()); +const rootReducer = combineReducers(reducers); +const store = createStore( + rootReducer, + localStorage.loadState(), // preloadedState + applyMiddleware( + thunkMiddleware, // Lets us dispatch() functions + loggerMiddleware // neat middleware that logs actions + ) +); // When the store's preferences change, // Update our cached preferences in localStorage