-
-
+ <>
+
+
+
+
+ {buttonComponents}
+
+
+
+
+
- {pluginComp}
-
-
-
+
);
}
}
+/**
+ * Determine which extension buttons should be showing, if they're
+ * active, and what their onClick behavior should be.
+ */
+function _getButtonComponents(toolbarButtons, activeButtons) {
+ return toolbarButtons.map((button, index) => {
+ // TODO: If `button.buttons`, use `ExpandedToolMenu`
+ // I don't believe any extensions currently leverage this
+ return (
+
{
+ if (button.commandName) {
+ const options = Object.assign({ evt }, button.commandOptions);
+ commandsManager.runCommand(button.commandName, options);
+ }
+
+ // TODO: Use Types ENUM
+ // TODO: We can update this to be a `getter` on the extension to query
+ // For the active tools after we apply our updates?
+ if (button.type === 'setToolActive') {
+ this.setState({
+ activeButtons: [button.id],
+ });
+ } else if (button.type === 'builtIn') {
+ this._handleBuiltIn(button.options);
+ }
+ }}
+ isActive={activeButtons.includes(button.id)}
+ />
+ );
+ });
+}
+
+function _getVisibleToolbarButtons() {
+ const toolbarModules = extensionManager.modules[MODULE_TYPES.TOOLBAR];
+ const toolbarButtonDefinitions = [];
+
+ toolbarModules.forEach(extension => {
+ const { definitions, defaultContext } = extension.module;
+ definitions.forEach(definition => {
+ const context = definition.context || defaultContext;
+
+ if (this.props.activeContexts.includes(context)) {
+ toolbarButtonDefinitions.push(definition);
+ }
+ });
+ });
+
+ return toolbarButtonDefinitions;
+}
+
+function _handleBuiltIn({ behavior } = {}) {
+ if (behavior === 'CINE') {
+ this.setState({
+ isCineDialogOpen: !this.state.isCineDialogOpen,
+ });
+ }
+}
+
export default ToolbarRow;
diff --git a/src/connectedComponents/ViewerMain.js b/src/connectedComponents/ViewerMain.js
index f10d8e590..8e412def1 100644
--- a/src/connectedComponents/ViewerMain.js
+++ b/src/connectedComponents/ViewerMain.js
@@ -2,8 +2,7 @@ import './ViewerMain.css';
import { Component } from 'react';
import ConnectedLayoutManager from './ConnectedLayoutManager.js';
-// import { OHIF } from 'ohif-core';
-//
+import ConnectedToolContextMenu from './ConnectedToolContextMenu.js';
import PropTypes from 'prop-types';
import React from 'react';
@@ -20,15 +19,6 @@ class ViewerMain extends Component {
constructor(props) {
super(props);
- // Initialize hotkeys
- // new OHIF.HotkeysUtil('viewer', {
- // setViewportSpecificData: props.setViewportSpecificData,
- // clearViewportSpecificData: props.clearViewportSpecificData,
- // setToolActive: props.setToolActive,
- // setActiveViewportSpecificData: props.setActiveViewportSpecificData,
- // });
- // hotkeys.init();
-
this.state = {
displaySets: [],
};
@@ -139,7 +129,10 @@ class ViewerMain extends Component {
studies={this.props.studies}
viewportData={this.getViewportData()}
setViewportData={this.setViewportData}
- />
+ >
+ {/* Children to add to each viewport that support children */}
+
+
);
}
diff --git a/src/connectedComponents/ViewerRetrieveStudyData.js b/src/connectedComponents/ViewerRetrieveStudyData.js
index bf9f5a08b..8622f4bd4 100644
--- a/src/connectedComponents/ViewerRetrieveStudyData.js
+++ b/src/connectedComponents/ViewerRetrieveStudyData.js
@@ -1,9 +1,13 @@
import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import OHIF from 'ohif-core';
-import ConnectedViewer from './ConnectedViewer.js';
+import { metadata, studies, utils } from 'ohif-core';
-const { createDisplaySets } = OHIF.utils;
+import ConnectedViewer from './ConnectedViewer.js';
+import PropTypes from 'prop-types';
+import { extensionManager } from './../App.js';
+
+const { OHIFStudyMetadata } = metadata;
+const { retrieveStudiesMetadata } = studies;
+const { studyMetadataManager, updateMetaDataManager } = utils;
class ViewerRetrieveStudyData extends Component {
static propTypes = {
@@ -17,32 +21,55 @@ class ViewerRetrieveStudyData extends Component {
error: null,
};
- componentDidMount() {
+ async componentDidMount() {
// TODO: Avoid using timepoints here
//const params = { studyInstanceUids, seriesInstanceUids, timepointId, timepointsFilter={} };
const { studyInstanceUids, seriesInstanceUids, server } = this.props;
- const promise = OHIF.studies.retrieveStudiesMetadata(
- server,
- studyInstanceUids,
- seriesInstanceUids
- );
- // Render the viewer when the data is ready
- promise
- .then(studies => {
- const updatedStudies = createDisplaySets(studies);
+ try {
+ const studies = await retrieveStudiesMetadata(
+ server,
+ studyInstanceUids,
+ seriesInstanceUids
+ );
- this.setState({
- studies: updatedStudies,
- });
- })
- .catch(error => {
- this.setState({
- error: true,
- });
+ // Render the viewer when the data is ready
+ // TODO: CLEAR THIS SOMEWHERE ELSE
+ studyMetadataManager.purge();
- throw new Error(error);
+ // Map studies to new format, update metadata manager?
+ const updatedStudies = studies.map(study => {
+ const studyMetadata = new OHIFStudyMetadata(
+ study,
+ study.studyInstanceUid
+ );
+ const sopClassHandlerModules =
+ extensionManager.modules['sopClassHandlerModule'];
+
+ study.displaySets =
+ study.displaySets ||
+ studyMetadata.createDisplaySets(sopClassHandlerModules);
+ studyMetadata.setDisplaySets(study.displaySets);
+
+ // Updates WADO-RS metaDataManager
+ updateMetaDataManager(study);
+
+ studyMetadataManager.add(studyMetadata);
+
+ return study;
});
+
+ this.setState({
+ studies: updatedStudies,
+ });
+ } catch (err) {
+ this.setState({
+ error: true,
+ });
+
+ // TODO: Handle gracefully instead of throwing?
+ throw new Error(err);
+ }
}
render() {
diff --git a/src/lib/jumpToRowItem.js b/src/lib/jumpToRowItem.js
index fb05835e1..f9edbfd60 100644
--- a/src/lib/jumpToRowItem.js
+++ b/src/lib/jumpToRowItem.js
@@ -1,4 +1,7 @@
-import { OHIF } from 'ohif-core';
+import { measurements, utils } from 'ohif-core';
+
+const { MeasurementApi } = measurements;
+const { studyMetadataManager } = utils;
// TODO: Move this function to OHIF itself so we can use it on the OHIF measurment table (when it is finished)
@@ -47,9 +50,7 @@ export default function jumpToRowItem(
let measurement = dataAtThisTimepoint;
- const { tool } = OHIF.measurements.MeasurementApi.getToolConfiguration(
- toolType
- );
+ const { tool } = MeasurementApi.getToolConfiguration(toolType);
if (options.childToolKey) {
measurement = dataAtThisTimepoint[options.childToolKey];
} else if (Array.isArray(tool.childTools)) {
@@ -79,7 +80,7 @@ export default function jumpToRowItem(
return;
}
- const study = OHIF.utils.studyMetadataManager.get(data.studyInstanceUid);
+ const study = studyMetadataManager.get(data.studyInstanceUid);
if (!study) {
throw new Error('Study not found.');
}
diff --git a/src/routes/StandaloneRouting.js b/src/routes/StandaloneRouting.js
index 884261d78..622f68625 100644
--- a/src/routes/StandaloneRouting.js
+++ b/src/routes/StandaloneRouting.js
@@ -1,10 +1,14 @@
import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import qs from 'querystring';
-import Viewer from '../connectedComponents/Viewer';
-import OHIF from 'ohif-core';
+import { log, metadata, studies, utils } from 'ohif-core';
-const { createDisplaySets } = OHIF.utils;
+import PropTypes from 'prop-types';
+import Viewer from '../connectedComponents/Viewer';
+import { extensionManager } from './../App.js';
+import qs from 'querystring';
+
+const { OHIFStudyMetadata } = metadata;
+const { retrieveStudiesMetadata } = studies;
+const { studyMetadataManager, updateMetaDataManager } = utils;
class StandaloneRouting extends Component {
state = {
@@ -31,7 +35,7 @@ class StandaloneRouting extends Component {
// Add event listeners for request failure
oReq.addEventListener('error', error => {
- OHIF.log.warn('An error occurred while retrieving the JSON data');
+ log.warn('An error occurred while retrieving the JSON data');
reject(error);
});
@@ -41,11 +45,11 @@ class StandaloneRouting extends Component {
// Parse the response content
// https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/responseText
if (!oReq.responseText) {
- OHIF.log.warn('Response was undefined');
+ log.warn('Response was undefined');
reject(new Error('Response was undefined'));
}
- OHIF.log.info(JSON.stringify(oReq.responseText, null, 2));
+ log.info(JSON.stringify(oReq.responseText, null, 2));
const data = JSON.parse(oReq.responseText);
if (data.servers && query.studyInstanceUids) {
@@ -55,20 +59,18 @@ class StandaloneRouting extends Component {
const studyInstanceUids = query.studyInstanceUids.split(';');
const seriesInstanceUids = [];
- OHIF.studies
- .retrieveStudiesMetadata(
- server,
- studyInstanceUids,
- seriesInstanceUids
- )
- .then(
- studies => {
- resolve(studies);
- },
- error => {
- reject(error);
- }
- );
+ retrieveStudiesMetadata(
+ server,
+ studyInstanceUids,
+ seriesInstanceUids
+ ).then(
+ studies => {
+ resolve(studies);
+ },
+ error => {
+ reject(error);
+ }
+ );
} else {
resolve(data.studies);
}
@@ -77,7 +79,7 @@ class StandaloneRouting extends Component {
// Open the Request to the server for the JSON data
// In this case we have a server-side route called /api/
// which responds to GET requests with the study data
- OHIF.log.info(`Sending Request to: ${url}`);
+ log.info(`Sending Request to: ${url}`);
oReq.open('GET', url);
oReq.setRequestHeader('Accept', 'application/json');
@@ -86,18 +88,39 @@ class StandaloneRouting extends Component {
});
}
- componentDidMount() {
- const query = qs.parse(this.props.location.search);
- StandaloneRouting.parseQueryAndFetchStudies(query).then(
- studies => {
- const updatedStudies = createDisplaySets(studies);
+ async componentDidMount() {
+ try {
+ const query = qs.parse(this.props.location.search);
+ const studies = await StandaloneRouting.parseQueryAndFetchStudies(query);
- this.setState({ studies: updatedStudies });
- },
- error => {
- this.setState({ error });
- }
- );
+ studyMetadataManager.purge();
+
+ // Map studies to new format, update metadata manager?
+ const updatedStudies = studies.map(study => {
+ const studyMetadata = new OHIFStudyMetadata(
+ study,
+ study.studyInstanceUid
+ );
+ const sopClassHandlerModules =
+ extensionManager.modules['sopClassHandlerModule'];
+
+ study.displaySets =
+ study.displaySets ||
+ studyMetadata.createDisplaySets(sopClassHandlerModules);
+ studyMetadata.setDisplaySets(study.displaySets);
+
+ // Updates WADO-RS metaDataManager
+ updateMetaDataManager(study);
+
+ studyMetadataManager.add(studyMetadata);
+
+ return study;
+ });
+
+ this.setState({ studies: updatedStudies });
+ } catch (error) {
+ this.setState({ error });
+ }
}
render() {
diff --git a/src/store/index.js b/src/store/index.js
index 04c81a2d6..baa63385e 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
diff --git a/src/store/layout/actions.js b/src/store/layout/actions.js
index 319628c08..2b08800b1 100644
--- a/src/store/layout/actions.js
+++ b/src/store/layout/actions.js
@@ -1,18 +1,3 @@
-export const addActiveContext = state => ({
- type: 'ADD_ACTIVE_CONTEXT',
- state,
-});
-
-export const removeActiveContext = state => ({
- type: 'REMOVE_ACTIVE_CONTEXT',
- state,
-});
-
-export const clearActiveContexts = state => ({
- type: 'CLEAR_ACTIVE_CONTEXTS',
- state,
-});
-
export const setLeftSidebarOpen = state => ({
type: 'SET_LEFT_SIDEBAR_OPEN',
state,
@@ -24,10 +9,6 @@ export const setRightSidebarOpen = state => ({
});
const actions = {
- addActiveContext,
- removeActiveContext,
- clearActiveContexts,
- //
setLeftSidebarOpen,
setRightSidebarOpen,
};
diff --git a/src/store/layout/reducers.js b/src/store/layout/reducers.js
index 6659d72a7..b292074ef 100644
--- a/src/store/layout/reducers.js
+++ b/src/store/layout/reducers.js
@@ -3,27 +3,10 @@ const defaultState = {
rightSidebarOpen: false,
labelling: {},
contextMenu: {},
- activeContexts: [],
};
const ui = (state = defaultState, action) => {
switch (action.type) {
- // ~ ACTIVE CONTEXTS
- // https://redux.js.org/recipes/structuring-reducers/immutable-update-patterns#inserting-and-removing-items-in-arrays
- case 'ADD_ACTIVE_CONTEXT': {
- const shallowCopy = Object.assign({}, state);
- shallowCopy.activeContexts = [...shallowCopy.activeContexts, action.item];
- return shallowCopy;
- }
- case 'REMOVE_ACTIVE_CONTEXT': {
- const shallowCopy = Object.assign({}, state);
- shallowCopy.activeContexts = shallowCopy.activeContexts.filter(
- item => item !== action.item
- );
- return shallowCopy;
- }
- case 'CLEAR_ACTIVE_CONTEXTS':
- return Object.assign({}, state, { activeContexts: [] });
// ~ SIDEBAR
case 'SET_LEFT_SIDEBAR_OPEN':
return Object.assign({}, state, { leftSidebarOpen: action.state });
diff --git a/src/store/layout/selectors.js b/src/store/layout/selectors.js
new file mode 100644
index 000000000..50a8ddb2e
--- /dev/null
+++ b/src/store/layout/selectors.js
@@ -0,0 +1,28 @@
+import { createSelector } from 'reselect';
+
+const getActiveViewportIndex = state => state.viewports.activeViewportIndex;
+const getLayoutViewports = state => state.viewports.layout.viewports;
+const getViewportSpecificData = state => state.viewports.viewportSpecificData;
+
+/**
+ * Think of this as a computed getter for our store. It lets us watch parts of
+ * our redux state, and only update/recalculate when those values change.
+ */
+export const getActiveContexts = createSelector(
+ [getActiveViewportIndex, getLayoutViewports, getViewportSpecificData],
+ (activeViewportIndex, layoutViewports, viewportSpecificData) => {
+ const activeContexts = ['VIEWER'];
+ const activeLayoutViewport = layoutViewports[activeViewportIndex] || {};
+ const activeViewportSpecificData =
+ viewportSpecificData[activeViewportIndex] || {};
+ const activeViewportPluginName =
+ activeLayoutViewport.plugin || activeViewportSpecificData.plugin;
+
+ if (activeViewportPluginName) {
+ const activeViewportExtension = `ACTIVE_VIEWPORT::${activeViewportPluginName.toUpperCase()}`;
+ activeContexts.push(activeViewportExtension);
+ }
+
+ return activeContexts;
+ }
+);
diff --git a/src/utils/getDefaultToolbarButtons.js b/src/utils/getDefaultToolbarButtons.js
deleted file mode 100644
index 408f84c45..000000000
--- a/src/utils/getDefaultToolbarButtons.js
+++ /dev/null
@@ -1,60 +0,0 @@
-export default function() {
- return [
- {
- command: 'StackScroll',
- type: 'tool',
- text: 'Stack Scroll',
- icon: 'bars',
- active: false,
- },
- {
- command: 'Zoom',
- type: 'tool',
- text: 'Zoom',
- icon: 'search-plus',
- active: false,
- },
- {
- command: 'Wwwc',
- type: 'tool',
- text: 'Levels',
- icon: 'level',
- active: true,
- },
- {
- command: 'Pan',
- type: 'tool',
- text: 'Pan',
- icon: 'arrows',
- active: false,
- },
- {
- command: 'Length',
- type: 'tool',
- text: 'Length',
- icon: 'measure-temp',
- active: false,
- },
- /*{
- command: 'Annotate',
- type: 'tool',
- text: 'Annotate',
- icon: `icon-tools-measure-non-target`,
- active: false
- },*/
- {
- command: 'Angle',
- type: 'tool',
- text: 'Angle',
- icon: 'angle-left',
- active: false,
- },
- {
- command: 'reset',
- type: 'command',
- text: 'Reset',
- icon: 'reset',
- active: false,
- },
- ];
-}
diff --git a/src/utils/getDefaultToolbarButtons.test.js b/src/utils/getDefaultToolbarButtons.test.js
deleted file mode 100644
index 8f59f53fa..000000000
--- a/src/utils/getDefaultToolbarButtons.test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import getDefaultToolbarButtons from './getDefaultToolbarButtons.js';
-
-describe('getDefaultToolbarButtons.js', () => {
- it('returns a non-empty array', () => {
- const buttons = getDefaultToolbarButtons();
-
- expect(buttons.length).toBeGreaterThan(0);
- });
-});
diff --git a/src/utils/index.js b/src/utils/index.js
index 22478739a..efcc1628c 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,9 +1,4 @@
-import getDefaultToolbarButtons from './getDefaultToolbarButtons.js';
import getUserManagerForOpenIdConnectClient from './getUserManagerForOpenIdConnectClient.js';
import initWebWorkers from './initWebWorkers.js';
-export {
- getDefaultToolbarButtons,
- getUserManagerForOpenIdConnectClient,
- initWebWorkers,
-};
+export { getUserManagerForOpenIdConnectClient, initWebWorkers };
diff --git a/src/utils/index.test.js b/src/utils/index.test.js
index c164ab30e..03f96fe64 100644
--- a/src/utils/index.test.js
+++ b/src/utils/index.test.js
@@ -5,11 +5,7 @@ describe('utils', () => {
const utilExports = Object.keys(utils).sort();
expect(utilExports).toEqual(
- [
- 'getDefaultToolbarButtons',
- 'getUserManagerForOpenIdConnectClient',
- 'initWebWorkers',
- ].sort()
+ ['getUserManagerForOpenIdConnectClient', 'initWebWorkers'].sort()
);
});
});
diff --git a/yarn.lock b/yarn.lock
index b0b92cfd1..ef0f44b3c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1435,29 +1435,45 @@
universal-user-agent "^2.0.0"
url-template "^2.0.8"
-"@ohif/extension-cornerstone@0.0.36":
- version "0.0.36"
- resolved "https://registry.yarnpkg.com/@ohif/extension-cornerstone/-/extension-cornerstone-0.0.36.tgz#a09a01d152bb9f850698b537b02355456425f8d1"
- integrity sha512-FrR9L74vqjNsW2wOSHeDXQo/twJAf/kM0awCn2/zGXN4tNxEaZRq56gfij86CH0OBGl1Wdzb8Zl6xe0JCtsNrA==
+"@ohif/extension-cornerstone@0.0.37":
+ version "0.0.37"
+ resolved "https://registry.yarnpkg.com/@ohif/extension-cornerstone/-/extension-cornerstone-0.0.37.tgz#d9d31409ffbc773dde17767daa02b87f461cf11a"
+ integrity sha512-090WPGXOYIxZjQe0mIM7SipgR3ggUZpbtWpwg7huWC0PQObIM3Juy4L8mtss23OKaKsmrmVxUaFc5NRQhs+Z+w==
dependencies:
"@babel/runtime" "^7.2.0"
classnames "^2.2.6"
lodash.throttle "^4.1.1"
react-cornerstone-viewport "0.1.30"
-"@ohif/extension-dicom-microscopy@0.0.6":
- version "0.0.6"
- resolved "https://registry.yarnpkg.com/@ohif/extension-dicom-microscopy/-/extension-dicom-microscopy-0.0.6.tgz#18e0c128689695a7af505bc3dd7ede97df7f8be2"
- integrity sha512-5On3GdZgeyMse2CKI0sbxJJ269IqlFXZ0Wi+8+D9lsp0Wdt2AOx15ZmmFA9MJ6GGluMHNrrTY2gZBwLyLUZyRw==
+"@ohif/extension-dicom-html@0.0.3":
+ version "0.0.3"
+ resolved "https://registry.yarnpkg.com/@ohif/extension-dicom-html/-/extension-dicom-html-0.0.3.tgz#1d085f603379599cf07801ec003e3d5050e2d659"
+ integrity sha512-S+Mg9OFHNvllDDza55y4/NmBV1bFJ+NLbpcnsw45QyfgT3KAg8v/8ht1QYM9IcBGqhxMTJs8OqBuJI9sAiTWlw==
+ dependencies:
+ "@babel/runtime" "^7.2.0"
+
+"@ohif/extension-dicom-microscopy@0.0.7":
+ version "0.0.7"
+ resolved "https://registry.yarnpkg.com/@ohif/extension-dicom-microscopy/-/extension-dicom-microscopy-0.0.7.tgz#2ac78c2eef8915e43a81e82ff895c251ced0b441"
+ integrity sha512-QXf7+YE297owIWBMGJJsJwbMk6bfmmu0fBJQhYFwXQYBOToSiabdr21PBxNADf88ZC1kiBcULOcTBRypJtd31g==
dependencies:
"@babel/runtime" "^7.2.0"
classnames "^2.2.6"
dicom-microscopy-viewer "^0.4.3"
-"@ohif/extension-vtk@0.0.6":
- version "0.0.6"
- resolved "https://registry.yarnpkg.com/@ohif/extension-vtk/-/extension-vtk-0.0.6.tgz#a4100963d87f268190ecac7784ff131bd4350b20"
- integrity sha512-IwXIpAQEOSRbPNXW0B6XfBMrp3k3LvdD/uyrOeEjI35hVjABf/9aGwqMk9wiw672AN26w/eZ04uXeKjRBsLzsQ==
+"@ohif/extension-dicom-pdf@0.0.7":
+ version "0.0.7"
+ resolved "https://registry.yarnpkg.com/@ohif/extension-dicom-pdf/-/extension-dicom-pdf-0.0.7.tgz#ba80a77235d43876e25485e1a964f36ebf104b94"
+ integrity sha512-uOevtxH6Vm2p+2xgo+ER3+oV1zfnUqHYoeqrICaKP3PKXGcVanWFE8W/RWiNZ+PS2/LNpSjJyLfuSxwZ3IBUVw==
+ dependencies:
+ "@babel/runtime" "^7.2.0"
+ classnames "^2.2.6"
+ lodash.isequal "^4.5.0"
+
+"@ohif/extension-vtk@0.0.7":
+ version "0.0.7"
+ resolved "https://registry.yarnpkg.com/@ohif/extension-vtk/-/extension-vtk-0.0.7.tgz#5bad8e35cae65957b467a12cc17e027ce80ad40a"
+ integrity sha512-yEdtnk7ImIoM3YrDkXXFo9ClJAXbd3rc9si3GlrOY6ImeWtwTf5LvcHG3QCe1iIfEJ2Q8wkGfERddbSw3joIYQ==
dependencies:
"@babel/runtime" "^7.4.5"
"@ohif/i18n" "0.0.4"
@@ -4503,6 +4519,11 @@ dedent@0.7.0, dedent@^0.7.0:
resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
+deep-diff@^0.3.5:
+ version "0.3.8"
+ resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84"
+ integrity sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ=
+
deep-equal@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
@@ -10266,10 +10287,10 @@ octokit-pagination-methods@^1.1.0:
resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4"
integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==
-ohif-core@0.5.9:
- version "0.5.9"
- resolved "https://registry.yarnpkg.com/ohif-core/-/ohif-core-0.5.9.tgz#337835c82571bdc4935210273a6018c3af872adf"
- integrity sha512-TvA/THiTpBnerRbv4FJlfwSMSyb4Tkn40ud14FP6JxLUQgCtLsTsaFhXIFBwZvBR/qVJwIlDluMxj/vqobCwkQ==
+ohif-core@0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/ohif-core/-/ohif-core-0.6.0.tgz#9fea32d8d10da84b9030d2e4f76b30e431e14ac2"
+ integrity sha512-2Z/HTRZ21i7w056MifH1k0y4brhrZSUsmeqbMcPLSh1cztRGnLQBamBZ08SzWvktcNxLDuwJI9zNDkJ8Gw4Idw==
dependencies:
"@babel/runtime" "^7.2.0"
ajv "^6.10.0"
@@ -10280,22 +10301,6 @@ ohif-core@0.5.9:
mousetrap "^1.6.3"
validate.js "^0.12.0"
-ohif-dicom-html-extension@^0.0.2:
- version "0.0.2"
- resolved "https://registry.yarnpkg.com/ohif-dicom-html-extension/-/ohif-dicom-html-extension-0.0.2.tgz#5dd80836ee8f12f6ddf6de2b88c72af96d8c347b"
- integrity sha512-7/YkaKrgnydiypFl39mvWO5vxCoGecudkdyCFedgDnG10UvkDF4nBcgNvoBupwBtGKYhXTfqye6fPWxQO0NWyw==
- dependencies:
- "@babel/runtime" "^7.2.0"
-
-ohif-dicom-pdf-extension@^0.0.6:
- version "0.0.6"
- resolved "https://registry.yarnpkg.com/ohif-dicom-pdf-extension/-/ohif-dicom-pdf-extension-0.0.6.tgz#5c1c1bf955d160dda01c36c4ed899d8e65384d63"
- integrity sha512-MRBDnC78itsos3c8QMKjgaFp8tmXyGIq5qVLREr//osqCYirhWQbCFJv73eYR5+bRCdJfUMMpvnDSChFIhcT6A==
- dependencies:
- "@babel/runtime" "^7.2.0"
- classnames "^2.2.6"
- lodash.isequal "^4.5.0"
-
oidc-client@1.7.x:
version "1.7.1"
resolved "https://registry.yarnpkg.com/oidc-client/-/oidc-client-1.7.1.tgz#8b9d8d50fd7f878968b1cda17712c1747eef9a54"
@@ -12408,10 +12413,10 @@ react-transition-group@^2.0.0, react-transition-group@^2.2.0:
prop-types "^15.6.2"
react-lifecycles-compat "^3.0.4"
-react-viewerbase@0.9.0:
- version "0.9.0"
- resolved "https://registry.yarnpkg.com/react-viewerbase/-/react-viewerbase-0.9.0.tgz#947ab61bf32e1d58836a637403d128247e175d2e"
- integrity sha512-VeOGzno5fg9A0Ttx+O3CQ8KXPr1XbdEOVbA+JiLwcuycX3CmDsqLzODsjeXb8npfXDbQA+n/ZPCyxsB7JDEBlA==
+react-viewerbase@0.10.0:
+ version "0.10.0"
+ resolved "https://registry.yarnpkg.com/react-viewerbase/-/react-viewerbase-0.10.0.tgz#4ac07649325759f8a58fc3be50dea4d1db8f13f8"
+ integrity sha512-pUt+HUGoEkDnVhxcg+gsoRzegEPVpsMPH8cnJINRoaATqbxc0jbt1N+3fTNTbPMMKZYMxC99L5bQ6OQ1QF+3qw==
dependencies:
"@babel/runtime" "7.2.0"
"@ohif/i18n" "^0.0.4"
@@ -12710,6 +12715,13 @@ redeyed@~2.1.0:
dependencies:
esprima "~4.0.0"
+redux-logger@^3.0.6:
+ version "3.0.6"
+ resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf"
+ integrity sha1-91VZZvMJjzyIYExEnPC69XeCdL8=
+ dependencies:
+ deep-diff "^0.3.5"
+
redux-oidc@3.1.x:
version "3.1.2"
resolved "https://registry.yarnpkg.com/redux-oidc/-/redux-oidc-3.1.2.tgz#31a771b0e05a65879626262e1e63ba70a0936ffd"
@@ -12717,6 +12729,11 @@ redux-oidc@3.1.x:
optionalDependencies:
immutable ">=3.6.0"
+redux-thunk@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
+ integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==
+
redux@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5"
@@ -13028,6 +13045,11 @@ requires-port@^1.0.0:
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+reselect@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
+ integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==
+
reserved-words@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz#00a0940f98cd501aeaaac316411d9adc52b31ab1"