chore(release): publish [skip ci]

- @ohif/extension-vtk@1.1.7 - @ohif/ui@1.1.5 - @ohif/viewer@3.2.2
fix: 🐛 Fix drag-n-drop of local files into OHIF (#1319 )
2019-12-19 15:15:49 +00:00 · 2019-12-19 10:14:05 -05:00 · 2019-12-18 18:29:28 +00:00 · 2019-12-18 13:25:53 -05:00 · 2019-12-16 19:11:59 +00:00 · 2019-12-16 14:07:53 -05:00
32 changed files with 283 additions and 103 deletions
@@ -193,7 +193,8 @@ today, create a GitHub issue!

 The `ExtensionManager` is a class made available to us via the `@ohif/core`
 project (platform/core). Our application instantiates a single instance of it,
-and provides a `ServicesManager` and `CommandsManager`.
+and provides a `ServicesManager` and `CommandsManager` along with the application's
+configuration through the appConfig key (optional).

 ```js
 const commandsManager = new CommandsManager();
@@ -201,6 +202,7 @@ const servicesManager = new ServicesManager();
 const extensionManager = new ExtensionManager({
  commandsManager,
  servicesManager,
+  appConfig
 });
 ```

@@ -210,8 +212,8 @@ The `ExtensionManager` only has a few public members:
 - `registerExtensions` - Registers an array of extensions
 - `modules` - An object containing registered extensions by `MODULE_TYPE`

-During registration, lifecycle hooks and modules have access to
-`ExtensionManager`'s `ServicesManager` and `CommandsManager`.
+During registration, lifecycle hooks and modules have access to the extension's config,
+the application's config and `ExtensionManager`'s `ServicesManager` and `CommandsManager` instances.

 Our `@ohif/viewer` uses the `modules` member to access registered extensions at
 appropriate places in our application.
@@ -14,6 +14,7 @@ export default {
  preRegistration({
    servicesManager = {},
    commandsManager = {},
+    appConfig = {},
    configuration = {},
  }) {},

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.1.7](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.1.6...@ohif/extension-vtk@1.1.7) (2019-12-19)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.1.6](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.1.5...@ohif/extension-vtk@1.1.6) (2019-12-18)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
+## [1.1.5](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.1.4...@ohif/extension-vtk@1.1.5) (2019-12-16)
+
+**Note:** Version bump only for package @ohif/extension-vtk
+
+
+
+
+
 ## [1.1.4](https://github.com/OHIF/Viewers/compare/@ohif/extension-vtk@1.1.3...@ohif/extension-vtk@1.1.4) (2019-12-16)

 **Note:** Version bump only for package @ohif/extension-vtk
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/extension-vtk",
-  "version": "1.1.4",
+  "version": "1.1.7",
  "description": "OHIF extension for VTK.js",
  "author": "OHIF",
  "license": "MIT",
@@ -52,8 +52,8 @@
    "react-vtkjs-viewport": "^0.3.9"
  },
  "devDependencies": {
-    "@ohif/core": "^2.1.1",
-    "@ohif/ui": "^1.1.4",
+    "@ohif/core": "^2.2.1",
+    "@ohif/ui": "^1.1.5",
    "cornerstone-tools": "^4.8.0",
    "cornerstone-wado-image-loader": "^3.0.0",
    "dicom-parser": "^1.8.3",
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [2.2.1](https://github.com/OHIF/Viewers/compare/@ohif/core@2.2.0...@ohif/core@2.2.1) (2019-12-18)
+
+**Note:** Version bump only for package @ohif/core
+
+
+
+
+
+# [2.2.0](https://github.com/OHIF/Viewers/compare/@ohif/core@2.1.1...@ohif/core@2.2.0) (2019-12-16)
+
+
+### Features
+
+* 🎸 Expose extension config to modules ([#1279](https://github.com/OHIF/Viewers/issues/1279)) ([4ea239a](https://github.com/OHIF/Viewers/commit/4ea239a9535ef297e23387c186e537ab273744ea)), closes [#1268](https://github.com/OHIF/Viewers/issues/1268)
+
+
+
+
+
 ## [2.1.1](https://github.com/OHIF/Viewers/compare/@ohif/core@2.1.0...@ohif/core@2.1.1) (2019-12-16)

 **Note:** Version bump only for package @ohif/core
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/core",
-  "version": "2.1.1",
+  "version": "2.2.1",
  "description": "Generic business logic for web-based medical imaging applications",
  "author": "OHIF Core Team",
  "license": "MIT",
@@ -39,6 +39,7 @@
  "dependencies": {
    "@babel/runtime": "^7.5.5",
    "ajv": "^6.10.0",
+    "dcmjs": "^0.8.3",
    "dicomweb-client": "^0.5.2",
    "isomorphic-base64": "^1.0.2",
    "lodash.clonedeep": "^4.5.0",
@@ -1,5 +1,10 @@
-import { log, studies, utils } from '@ohif/core';
-import { retrieveMeasurementFromSR, stowSRFromMeasurements } from './handleStructuredReport';
+import log from '../log';
+import studies from '../studies';
+import utils from '../utils';
+import {
+  retrieveMeasurementFromSR,
+  stowSRFromMeasurements,
+} from './handleStructuredReport';
 import findMostRecentStructuredReport from './utils/findMostRecentStructuredReport';

 /**
@@ -65,7 +70,9 @@ const storeMeasurements = async (measurementData, filter, server) => {
      message: 'Measurements were saved with success',
    };
  } catch (error) {
-    log.error(`[DICOMSR] Error while saving the measurements: ${error.message}`);
+    log.error(
+      `[DICOMSR] Error while saving the measurements: ${error.message}`
+    );
    throw new Error('Error while saving the measurements.');
  }
 };
@@ -1,11 +1,11 @@
 import * as dcmjs from 'dcmjs';
-import { DICOMWeb } from '@ohif/core';
+import { api } from 'dicomweb-client';
+
+import DICOMWeb from '../DICOMWeb';
 import parseDicomStructuredReport from './parseDicomStructuredReport';
 import parseMeasurementsData from './parseMeasurementsData';
 import getAllDisplaySets from './utils/getAllDisplaySets';

-import { api } from 'dicomweb-client';
-
 const VERSION_NAME = 'dcmjs-0.0';
 const TRANSFER_SYNTAX_UID = '1.2.840.10008.1.2.1';

@@ -34,7 +34,10 @@ const retrieveMeasurementFromSR = async (series, studies, serverUrl) => {

  const part10SRArrayBuffer = await dicomWeb.retrieveInstance(options);
  const displaySets = getAllDisplaySets(studies);
-  const measurementsData = parseDicomStructuredReport(part10SRArrayBuffer, displaySets);
+  const measurementsData = parseDicomStructuredReport(
+    part10SRArrayBuffer,
+    displaySets
+  );

  return measurementsData;
 };
@@ -47,13 +50,10 @@ const retrieveMeasurementFromSR = async (series, studies, serverUrl) => {
 * @returns {Promise}
 */
 const stowSRFromMeasurements = async (measurements, serverUrl) => {
-  const { dataset } = parseMeasurementsData(
-    measurements
-  );
+  const { dataset } = parseMeasurementsData(measurements);
  const { DicomMetaDictionary, DicomDict } = dcmjs.data;
  const meta = {
-    FileMetaInformationVersion:
-      dataset._meta.FileMetaInformationVersion.Value,
+    FileMetaInformationVersion: dataset._meta.FileMetaInformationVersion.Value,
    MediaStorageSOPClassUID: dataset.SOPClassUID,
    MediaStorageSOPInstanceUID: dataset.SOPInstanceUID,
    TransferSyntaxUID: TRANSFER_SYNTAX_UID,
@@ -1,4 +1,5 @@
 import * as dcmjs from 'dcmjs';
+
 import findInstanceMetadataBySopInstanceUid from './utils/findInstanceMetadataBySopInstanceUid';

 /**
@@ -37,7 +38,12 @@ const parseDicomStructuredReport = (part10SRArrayBuffer, displaySets) => {
      const { studyInstanceUid, patientId } = study;
      const { seriesInstanceUid } = series;
      const { sopInstanceUid, frameIndex } = measurement;
-      const imagePath = getImagePath(studyInstanceUid, seriesInstanceUid, sopInstanceUid, frameIndex);
+      const imagePath = getImagePath(
+        studyInstanceUid,
+        seriesInstanceUid,
+        sopInstanceUid,
+        frameIndex
+      );

      const imageId = instanceMetadata.getImageId();
      if (!imageId) {
@@ -75,8 +81,15 @@ const parseDicomStructuredReport = (part10SRArrayBuffer, displaySets) => {
 * @param {string} frameIndex
 * @returns
 */
-const getImagePath = (studyInstanceUid, seriesInstanceUid, sopInstanceUid, frameIndex) => {
-  return [studyInstanceUid, seriesInstanceUid, sopInstanceUid, frameIndex].join('_');
-}
+const getImagePath = (
+  studyInstanceUid,
+  seriesInstanceUid,
+  sopInstanceUid,
+  frameIndex
+) => {
+  return [studyInstanceUid, seriesInstanceUid, sopInstanceUid, frameIndex].join(
+    '_'
+  );
+};

 export default parseDicomStructuredReport;
@@ -1,6 +1,8 @@
 import * as dcmjs from 'dcmjs';
-import { log, measurements } from '@ohif/core';
 import cornerstone from 'cornerstone-core';
+
+import log from '../log';
+import measurements from '../measurements';
 import isToolSupported from './utils/isToolSupported';

 /**
@@ -11,7 +11,9 @@ const findInstanceMetadataBySopInstanceUid = (displaySets, sopInstanceUid) => {
  displaySets.find(displaySet => {
    if (!displaySet.images) return false;

-    instanceFound = displaySet.images.find(instanceMetadata => instanceMetadata._sopInstanceUID === sopInstanceUid);
+    instanceFound = displaySet.images.find(
+      instanceMetadata => instanceMetadata._sopInstanceUID === sopInstanceUid
+    );

    return !!instanceFound;
  });
@@ -4,15 +4,17 @@
 * @param {Array} studies
 * @returns {Object} Series
 */
-const findMostRecentStructuredReport = (studies) => {
+const findMostRecentStructuredReport = studies => {
  let mostRecentStructuredReport;

  studies.forEach(study => {
    const allSeries = study.getSeries ? study.getSeries() : [];
    allSeries.forEach(series => {
-
      if (isStructuredReportSeries(series)) {
-        if (!mostRecentStructuredReport || compareSeriesDate(series, mostRecentStructuredReport)) {
+        if (
+          !mostRecentStructuredReport ||
+          compareSeriesDate(series, mostRecentStructuredReport)
+        ) {
          mostRecentStructuredReport = series;
        }
      }
@@ -28,7 +30,7 @@ const findMostRecentStructuredReport = (studies) => {
 * @param {Object} series - Series metadata
 * @returns {boolean}
 */
-const isStructuredReportSeries = (series) => {
+const isStructuredReportSeries = series => {
  const supportedSopClassUIDs = [
    '1.2.840.10008.5.1.4.1.1.88.22',
    '1.2.840.10008.5.1.4.1.1.11.1',
@@ -38,7 +40,7 @@ const isStructuredReportSeries = (series) => {
  const sopClassUid = firstInstance._instance.sopClassUid;

  return supportedSopClassUIDs.includes(sopClassUid);
-}
+};

 /**
 *  Checkes if series1 is newer than series2
@@ -48,10 +50,11 @@ const isStructuredReportSeries = (series) => {
 * @returns {boolean} true/false if series1 is newer than series2
 */
 const compareSeriesDate = (series1, series2) => {
-  return series1._data.seriesDate > series2._data.seriesDate ||
+  return (
+    series1._data.seriesDate > series2._data.seriesDate ||
    (series1._data.seriesDate === series2._data.seriesDate &&
-      series1._data.seriesTime > series2._data.seriesTime);
-}
-
+      series1._data.seriesTime > series2._data.seriesTime)
+  );
+};

 export default findMostRecentStructuredReport;
@@ -4,7 +4,7 @@
 * @param {Object} studies - List of studies loaded into the viewer
 * @returns {Object} List of DisplaySets
 */
-const getAllDisplaySets = (studies) => {
+const getAllDisplaySets = studies => {
  let allDisplaySets = [];

  studies.forEach(study => {
@@ -2,13 +2,14 @@ import MODULE_TYPES from './MODULE_TYPES.js';
 import log from './../log.js';

 export default class ExtensionManager {
-  constructor({ commandsManager, servicesManager }) {
+  constructor({ commandsManager, servicesManager, appConfig = {} }) {
    this.modules = {};
    this.registeredExtensionIds = [];
    this.moduleTypeNames = Object.values(MODULE_TYPES);
    //
    this._commandsManager = commandsManager;
    this._servicesManager = servicesManager;
+    this._appConfig = appConfig;

    this.moduleTypeNames.forEach(moduleType => {
      this.modules[moduleType] = [];
@@ -70,6 +71,7 @@ export default class ExtensionManager {
      extension.preRegistration({
        servicesManager: this._servicesManager,
        commandsManager: this._commandsManager,
+        appConfig: this._appConfig,
        configuration,
      });
    }
@@ -79,7 +81,8 @@ export default class ExtensionManager {
      const extensionModule = this._getExtensionModule(
        moduleType,
        extension,
-        extensionId
+        extensionId,
+        configuration
      );

      if (extensionModule) {
@@ -102,7 +105,7 @@ export default class ExtensionManager {
   * @param {Object} extension
   * @param {string} extensionId - Used for logging warnings
   */
-  _getExtensionModule(moduleType, extension, extensionId) {
+  _getExtensionModule(moduleType, extension, extensionId, configuration) {
    const getModuleFnName = 'get' + _capitalizeFirstCharacter(moduleType);
    const getModuleFn = extension[getModuleFnName];

@@ -114,6 +117,8 @@ export default class ExtensionManager {
      const extensionModule = getModuleFn({
        servicesManager: this._servicesManager,
        commandsManager: this._commandsManager,
+        appConfig: this._appConfig,
+        configuration,
      });

      if (!extensionModule) {
@@ -6,7 +6,7 @@ import log from './../log.js';
 jest.mock('./../log.js');

 describe('ExtensionManager.js', () => {
-  let extensionManager, commandsManager;
+  let extensionManager, commandsManager, servicesManager, appConfig;

  beforeEach(() => {
    commandsManager = {
@@ -14,7 +14,17 @@ describe('ExtensionManager.js', () => {
      getContext: jest.fn(),
      registerCommand: jest.fn(),
    };
-    extensionManager = new ExtensionManager({ commandsManager });
+    servicesManager = {
+      registerService: jest.fn(),
+    };
+    appConfig = {
+      testing: true,
+    };
+    extensionManager = new ExtensionManager({
+      servicesManager,
+      commandsManager,
+      appConfig,
+    });
    log.warn.mockClear();
    jest.clearAllMocks();
  });
@@ -51,7 +61,7 @@ describe('ExtensionManager.js', () => {
      extensionManager.registerExtensions(fakeExtensions);

      // Assert
-      expect(extensionManager.registerExtension.mock.calls[1]).toContain(
+      expect(extensionManager.registerExtension.mock.calls[1][1]).toEqual(
        fakeConfiguration
      );
    });
@@ -67,19 +77,19 @@ describe('ExtensionManager.js', () => {
      expect(fakeExtension.preRegistration.mock.calls.length).toBe(1);
    });

-    it('calls preRegistration() passing configuration along with servicesManager and commandsManager instances for extension', () => {
-      const configuration = { config: 'Some configuration' };
-      extensionManager._servicesManager = { services: { TestService: {} } };
+    it('calls preRegistration() passing dependencies and extension configuration to extension', () => {
+      const extensionConfiguration = { config: 'Some configuration' };

      // SUT
-      const fakeExtension = { one: '1', preRegistration: jest.fn() };
-      extensionManager.registerExtension(fakeExtension, configuration);
+      const extension = { one: '1', preRegistration: jest.fn() };
+      extensionManager.registerExtension(extension, extensionConfiguration);

      // Assert
-      expect(fakeExtension.preRegistration.mock.calls[0][0]).toEqual({
-        servicesManager: extensionManager._servicesManager,
-        commandsManager: extensionManager._commandsManager,
-        configuration,
+      expect(extension.preRegistration.mock.calls[0][0]).toEqual({
+        servicesManager,
+        commandsManager,
+        appConfig,
+        configuration: extensionConfiguration,
      });
    });

@@ -153,8 +163,8 @@ describe('ExtensionManager.js', () => {
      );
    });

-    it('successfully passes a servicesManager and commandsManager instances to each module', () => {
-      extensionManager._servicesManager = { services: { TestService: {} } };
+    it('successfully passes dependencies to each module along with extension configuration', () => {
+      const extensionConfiguration = { testing: true };

      const extension = {
        id: 'hello-world',
@@ -165,11 +175,17 @@ describe('ExtensionManager.js', () => {
        getCommandsModule: jest.fn(),
      };

-      extensionManager.registerExtension(extension);
+      extensionManager.registerExtension(extension, extensionConfiguration);

-      expect(extension.getViewportModule.mock.calls[0][0]).toEqual({
-        servicesManager: extensionManager._servicesManager,
-        commandsManager: extensionManager._commandsManager,
+      Object.keys(extension).forEach(module => {
+        if (typeof extension[module] === 'function') {
+          expect(extension[module].mock.calls[0][0]).toEqual({
+            servicesManager,
+            commandsManager,
+            appConfig,
+            configuration: extensionConfiguration,
+          });
+        }
      });
    });

@@ -5,6 +5,7 @@ import { ServicesManager } from './services';
 import classes, { CommandsManager, HotkeysManager } from './classes/';

 import DICOMWeb from './DICOMWeb';
+import DICOMSR from './DICOMSR';
 import cornerstone from './cornerstone.js';
 import hangingProtocols from './hanging-protocols';
 import header from './header.js';
@@ -46,6 +47,7 @@ const OHIF = {
  object,
  log,
  DICOMWeb,
+  DICOMSR,
  viewer: {},
  measurements,
  hangingProtocols,
@@ -76,6 +78,7 @@ export {
  object,
  log,
  DICOMWeb,
+  DICOMSR,
  measurements,
  hangingProtocols,
  //
@@ -28,6 +28,7 @@ describe('Top level exports', () => {
      'object',
      'log',
      'DICOMWeb',
+      'DICOMSR',
      'OHIF', //
      'measurements',
      'hangingProtocols',
@@ -33,7 +33,9 @@ export default class ServicesManager {
    }

    if (service.create) {
-      this.services[service.name] = service.create({ configuration });
+      this.services[service.name] = service.create({
+        configuration,
+      });
    } else {
      log.warn(`Service create factory function not defined. Exiting early.`);
      return;
@@ -33,7 +33,7 @@ describe('ServicesManager.js', () => {
        [{ name: 'UIModalTestService', create: jest.fn() }, fakeConfiguration],
      ]);

-      expect(servicesManager.registerService.mock.calls[1]).toContain(
+      expect(servicesManager.registerService.mock.calls[1][1]).toEqual(
        fakeConfiguration
      );
    });
@@ -85,7 +85,7 @@ describe('ServicesManager.js', () => {
      expect(log.warn.mock.calls.length).toBe(1);
    });

-    it('pass configuration to service create factory function', () => {
+    it('pass dependencies and configuration to service create factory function', () => {
      const configuration = { config: 'Some configuration' };

      servicesManager.registerService(fakeService, configuration);
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.1.5](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.1.4...@ohif/ui@1.1.5) (2019-12-19)
+
+
+### Bug Fixes
+
+* 🐛 Fix drag-n-drop of local files into OHIF ([#1319](https://github.com/OHIF/Viewers/issues/1319)) ([23305ce](https://github.com/OHIF/Viewers/commit/23305cec9c0f514e73a8dd17f984ffc87ad8d131)), closes [#1307](https://github.com/OHIF/Viewers/issues/1307)
+
+
+
+
+
 ## [1.1.4](https://github.com/OHIF/Viewers/compare/@ohif/ui@1.1.3...@ohif/ui@1.1.4) (2019-12-16)

 **Note:** Version bump only for package @ohif/ui
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/ui",
-  "version": "1.1.4",
+  "version": "1.1.5",
  "description": "A set of React components for Medical Imaging Viewers",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -152,6 +152,7 @@ const DialogProvider = ({ children, service }) => {
        onStart,
        onStop,
        onDrag,
+        showOverlay,
      } = dialog;

      let position =
@@ -160,7 +161,7 @@ const DialogProvider = ({ children, service }) => {
        position = centerPositions.find(position => position.id === id);
      }

-      return (
+      const dragableItem = () => (
        <Draggable
          key={id}
          disabled={!isDraggable}
@@ -217,6 +218,16 @@ const DialogProvider = ({ children, service }) => {
          </div>
        </Draggable>
      );
+
+      return (
+        showOverlay ? (
+          <div className="Overlay" key={id}>
+            {dragableItem()}
+          </div>
+        ) : (
+            dragableItem()
+          )
+      );
    });

  /**
@@ -238,13 +249,11 @@ const DialogProvider = ({ children, service }) => {

  return (
    <DialogContext.Provider value={{ create, dismiss, dismissAll, isEmpty }}>
-      <div className="DraggableArea">
-        {dialogs.some(dialog => dialog.showOverlay) ? (
-          <div className="Overlay active">{renderDialogs()}</div>
-        ) : (
-          renderDialogs()
-        )}
-      </div>
+      {!isEmpty() &&
+        <div className="DraggableArea">
+          {renderDialogs()}
+        </div>
+      }
      {children}
    </DialogContext.Provider>
  );
@@ -6,17 +6,16 @@
  div
    cursor: grabbing !important

-.DraggableArea, .Overlay
+.DraggableArea
  width: 100%
  height: 100%
  position: absolute
-
-.Overlay.active
-  position: fixed
-  z-index: 999
-  left: 0
-  top: 0
-  width: 100%
-  height: 100%
-  overflow: auto
-  background: rgba(0,0,0,.1)
+  .Overlay
+    position: fixed
+    z-index: 999
+    left: 0
+    top: 0
+    width: 100%
+    height: 100%
+    overflow: auto
+    background: rgba(0,0,0,.1)
@@ -3,6 +3,47 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [3.2.2](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.2.1...@ohif/viewer@3.2.2) (2019-12-19)
+
+
+### Bug Fixes
+
+* 🐛 Fix drag-n-drop of local files into OHIF ([#1319](https://github.com/OHIF/Viewers/issues/1319)) ([23305ce](https://github.com/OHIF/Viewers/commit/23305cec9c0f514e73a8dd17f984ffc87ad8d131)), closes [#1307](https://github.com/OHIF/Viewers/issues/1307)
+
+
+
+
+
+## [3.2.1](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.2.0...@ohif/viewer@3.2.1) (2019-12-18)
+
+**Note:** Version bump only for package @ohif/viewer
+
+
+
+
+
+# [3.2.0](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.1.12...@ohif/viewer@3.2.0) (2019-12-16)
+
+
+### Features
+
+* 🎸 Expose extension config to modules ([#1279](https://github.com/OHIF/Viewers/issues/1279)) ([4ea239a](https://github.com/OHIF/Viewers/commit/4ea239a9535ef297e23387c186e537ab273744ea)), closes [#1268](https://github.com/OHIF/Viewers/issues/1268)
+
+
+
+
+
+## [3.1.12](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.1.11...@ohif/viewer@3.1.12) (2019-12-16)
+
+
+### Bug Fixes
+
+* 🐛 Dismiss all dialogs if leaving viewer route [#1242](https://github.com/OHIF/Viewers/issues/1242) ([#1301](https://github.com/OHIF/Viewers/issues/1301)) ([5c3d8b3](https://github.com/OHIF/Viewers/commit/5c3d8b37b6f723fbd8edcc447c37984e7eee8d40))
+
+
+
+
+
 ## [3.1.11](https://github.com/OHIF/Viewers/compare/@ohif/viewer@3.1.10...@ohif/viewer@3.1.11) (2019-12-16)

 **Note:** Version bump only for package @ohif/viewer
@@ -1,6 +1,6 @@
 {
  "name": "@ohif/viewer",
-  "version": "3.1.11",
+  "version": "3.2.2",
  "description": "OHIF Viewer",
  "author": "OHIF Contributors",
  "license": "MIT",
@@ -45,14 +45,14 @@
  },
  "dependencies": {
    "@babel/runtime": "^7.5.5",
-    "@ohif/core": "^2.1.1",
+    "@ohif/core": "^2.2.1",
    "@ohif/extension-cornerstone": "^2.1.1",
    "@ohif/extension-dicom-html": "^1.1.0",
    "@ohif/extension-dicom-microscopy": "^0.50.6",
    "@ohif/extension-dicom-pdf": "^1.0.1",
-    "@ohif/extension-vtk": "^1.1.4",
+    "@ohif/extension-vtk": "^1.1.7",
    "@ohif/i18n": "^0.52.4",
-    "@ohif/ui": "^1.1.4",
+    "@ohif/ui": "^1.1.5",
    "@tanem/react-nprogress": "^1.1.25",
    "classnames": "^2.2.6",
    "core-js": "^3.2.1",
@@ -64,10 +64,7 @@ const commandsManagerConfig = {
 const commandsManager = new CommandsManager(commandsManagerConfig);
 const hotkeysManager = new HotkeysManager(commandsManager);
 const servicesManager = new ServicesManager();
-const extensionManager = new ExtensionManager({
-  commandsManager,
-  servicesManager,
-});
+let extensionManager;
 /** ~~~~~~~~~~~~~ End Application Setup */

 // TODO[react] Use a provider when the whole tree is React
@@ -128,7 +125,8 @@ class App extends Component {
    _initServices([UINotificationService, UIModalService, UIDialogService]);
    _initExtensions(
      [...defaultExtensions, ...extensions],
-      cornerstoneExtensionConfig
+      cornerstoneExtensionConfig,
+      this._appConfig
    );

    /*
@@ -241,7 +239,13 @@ function _initServices(services) {
 /**
 * @param
 */
-function _initExtensions(extensions, cornerstoneExtensionConfig) {
+function _initExtensions(extensions, cornerstoneExtensionConfig, appConfig) {
+  extensionManager = new ExtensionManager({
+    commandsManager,
+    servicesManager,
+    appConfig,
+  });
+
  const requiredExtensions = [
    GenericViewerCommands,
    [OHIFCornerstoneExtension, cornerstoneExtensionConfig],
@@ -1,9 +1,8 @@
 import { connect } from 'react-redux';
 import { MeasurementTable } from '@ohif/ui';
-import OHIF from '@ohif/core';
+import OHIF, { DICOMSR } from '@ohif/core';
 import moment from 'moment';
 import cornerstone from 'cornerstone-core';
-import DICOMSR from './../../lib/DICOMSR';

 import jumpToRowItem from './jumpToRowItem.js';

@@ -32,9 +31,7 @@ function groupBy(list, props) {
 */
 function getAllTools(toolGroups = []) {
  let tools = [];
-  toolGroups.forEach(
-    toolGroup => (tools = tools.concat(toolGroup.childTools))
-  );
+  toolGroups.forEach(toolGroup => (tools = tools.concat(toolGroup.childTools)));

  return tools;
 }
@@ -80,6 +80,7 @@ export default function init({
      id: 'labelling',
      isDraggable: false,
      showOverlay: true,
+      centralize: true,
      content: LabellingFlow,
      contentProps: {
        measurementData,
@@ -3,7 +3,8 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';

 import { MODULE_TYPES } from '@ohif/core';
-import OHIF from '@ohif/core';
+import OHIF, { DICOMSR } from '@ohif/core';
+import { withDialog } from '@ohif/ui';
 import moment from 'moment';
 import ConnectedHeader from './ConnectedHeader.js';
 import ConnectedToolbarRow from './ConnectedToolbarRow.js';
@@ -11,7 +12,6 @@ import ConnectedStudyBrowser from './ConnectedStudyBrowser.js';
 import ConnectedViewerMain from './ConnectedViewerMain.js';
 import SidePanel from './../components/SidePanel.js';
 import { extensionManager } from './../App.js';
-import DICOMSR from '../lib/DICOMSR';

 // Contexts
 import WhiteLabellingContext from '../context/WhiteLabellingContext.js';
@@ -69,6 +69,7 @@ class Viewer extends Component {
    // window.store.getState().viewports.activeViewportIndex
    activeViewportIndex: PropTypes.number.isRequired,
    isStudyLoaded: PropTypes.bool,
+    dialog: PropTypes.object,
  };

  constructor(props) {
@@ -104,6 +105,12 @@ class Viewer extends Component {
    thumbnails: [],
  };

+  componentWillUnmount() {
+    if (this.props.dialog) {
+      this.props.dialog.dismissAll();
+    }
+  }
+
  retrieveTimepoints = filter => {
    OHIF.log.info('retrieveTimepoints');

@@ -297,11 +304,11 @@ class Viewer extends Component {
                activeIndex={this.props.activeViewportIndex}
              />
            ) : (
-                <ConnectedStudyBrowser
-                  studies={this.state.thumbnails}
-                  studyMetadata={this.props.studies}
-                />
-              )}
+              <ConnectedStudyBrowser
+                studies={this.state.thumbnails}
+                studyMetadata={this.props.studies}
+              />
+            )}
          </SidePanel>

          {/* MAIN */}
@@ -324,7 +331,7 @@ class Viewer extends Component {
  }
 }

-export default Viewer;
+export default withDialog(Viewer);

 /**
 * What types are these? Why do we have "mapping" dropped in here instead of in
@@ -337,7 +344,7 @@ export default Viewer;
 * @param {Study[]} studies
 * @param {DisplaySet[]} studies[].displaySets
 */
-const _mapStudiesToThumbnails = function (studies) {
+const _mapStudiesToThumbnails = function(studies) {
  return studies.map(study => {
    const { studyInstanceUid } = study;

@@ -6545,6 +6545,16 @@ dcmjs@^0.8.2:
    loglevelnext "^3.0.1"
    ndarray "^1.0.18"

+dcmjs@^0.8.3:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.8.3.tgz#fff1b030b6cb2d6e2afb1aa99840bfa853724c31"
+  integrity sha512-eXQjqgtJf9+oseraKDNDm2A5F3Th4B2GJeZtjStj0IFXxjlbPOzdq3PfCyxdwfRaKOBIwr0q3YK/Vfs2CpQY8Q==
+  dependencies:
+    "@babel/polyfill" "^7.6.0"
+    "@babel/runtime" "^7.6.3"
+    loglevelnext "^3.0.1"
+    ndarray "^1.0.18"
+
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.1, debug@^2.6.3, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
  version "2.6.9"
  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
Author	SHA1	Message	Date
ohif-bot	6c160f517f	chore(release): publish [skip ci] - @ohif/extension-vtk@1.1.7 - @ohif/ui@1.1.5 - @ohif/viewer@3.2.2	2019-12-19 15:15:49 +00:00
Gustavo André Lelis	23305cec9c	fix: 🐛 Fix drag-n-drop of local files into OHIF (#1319 ) * fix: 🐛 Fix drag-n-drop of local files into OHIF Closes: #1307 * CR Update: Centralize dialogs	2019-12-19 10:14:05 -05:00
ohif-bot	36a741f0bc	chore(release): publish [skip ci] - @ohif/extension-vtk@1.1.6 - @ohif/core@2.2.1 - @ohif/viewer@3.2.1	2019-12-18 18:29:28 +00:00
Igor Octaviano	695ad732e1	refactor: 💡 Move DICOMSR code to @ohif/core project (#1310 ) * Move DICOMSR to @ohif/core * refactor: 💡 Move DICOMSR code to @ohif/core project We've just merged support for DICOM Structured Reports. Today, support for this feature lives in the @ohif/viewer project in it's lib folder. Ideally, it should be moved to @ohif/core and given a clear public API and unit tests. Closes: #1282 * Update imports * CR Update: Update imports	2019-12-18 13:25:53 -05:00
ohif-bot	73a3f07e2b	chore(release): publish [skip ci] - @ohif/extension-vtk@1.1.5 - @ohif/core@2.2.0 - @ohif/viewer@3.2.0	2019-12-16 19:11:59 +00:00
Igor Octaviano	4ea239a953	feat: 🎸 Expose extension config to modules (#1279 ) * feat: 🎸 Expose extension config to modules Currently, only the preRegistration hook receives the extension's configuration as a parameter. Providing getModuleFn's with the extension's configuration, and all lifecycle/modules with the application's configuration as rootConfig should open the doors to more configurable extensions. Closes: #1268 * CR Update: Pass extension and service config through extension manager preinit/getmodule * CR Update: Remove appConfig from servicesManager * CR Update: Remove appconfig variable	2019-12-16 14:07:53 -05:00
ohif-bot	625d5d70a7	chore(release): publish [skip ci] - @ohif/viewer@3.1.12	2019-12-16 18:30:12 +00:00
Igor Octaviano	5c3d8b37b6	fix: 🐛 Dismiss all dialogs if leaving viewer route #1242 (#1301 ) * fix: 🐛 #1242 Dismiss all dialogs if route change Closes: #1242 * CR Update: Dismiss dialogs in videwer	2019-12-16 13:26:31 -05:00