Fixes after rebasing

platform/core/package.json

@@ -39,7 +39,8 @@
     "@babel/runtime": "7.7.6",
     "ajv": "^6.10.0",
     "dcmjs": "^0.12.4",
-    "dicomweb-client": "^0.5.2",
+    "dicomweb-client": "^0.6.0",
+    "immer": "6.0.2",
     "isomorphic-base64": "^1.0.2",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.1",

platform/core/src/classes/metadata/StudyMetadata.js

@@ -79,7 +79,7 @@ export class StudyMetadata extends Metadata {
     Object.defineProperty(this, 'studyInstanceUID', {
       configurable: false,
       enumerable: false,
-      get: function () {
+      get: function() {
         return this.getStudyInstanceUID();
       },
     });

platform/core/src/extensions/ExtensionManager.js

@@ -182,7 +182,7 @@ export default class ExtensionManager {
         commandsManager: this._commandsManager,
         appConfig: this._appConfig,
         configuration,
-        api: this._api
+        api: this._api,
       });
 
       if (!extensionModule) {

platform/core/src/index.js

@@ -7,6 +7,7 @@ import classes, { CommandsManager, HotkeysManager } from './classes/';
 import DICOMWeb from './DICOMWeb';
 import DICOMSR from './DICOMSR';
 import cornerstone from './cornerstone.js';
+import errorHandler from './errorHandler.js';
 import hangingProtocols from './hanging-protocols';
 import header from './header.js';
 import log from './log.js';

platform/core/src/redux/index.test.js

@@ -2,7 +2,12 @@ import redux from './index.js';
 
 describe('redux exports', () => {
   test('have not changed', () => {
-    const expectedExports = ['actions', 'reducers', 'localStorage', 'sessionStorage'].sort();
+    const expectedExports = [
+      'actions',
+      'reducers',
+      'localStorage',
+      'sessionStorage',
+    ].sort();
 
     const exports = Object.keys(redux).sort();
 

platform/core/src/services/MeasurementService/MeasurementService.test.js

@@ -34,7 +34,10 @@ describe('MeasurementService.js', () => {
       unit: 'mm',
       area: 123,
       type: measurementService.VALUE_TYPES.POLYLINE,
-      points: [{ x: 1, y: 2 }, { x: 1, y: 2 }],
+      points: [
+        { x: 1, y: 2 },
+        { x: 1, y: 2 },
+      ],
       source: source,
     };
     toAnnotation = () => annotation;

platform/core/src/utils/Queue.js

@@ -1,6 +1,4 @@
-
 export default class Queue {
-
   constructor(limit) {
     this.limit = limit;
     this.size = 0;

platform/core/src/utils/isDisplaySetReconstructable.js

@@ -167,8 +167,8 @@ function _getSpacingIssue(spacing, averageSpacing) {
 function _getPerpendicularDistance(a, b) {
   return Math.sqrt(
     Math.pow(a[0] - b[0], 2) +
-    Math.pow(a[1] - b[1], 2) +
-    Math.pow(a[2] - b[2], 2)
+      Math.pow(a[1] - b[1], 2) +
+      Math.pow(a[2] - b[2], 2)
   );
 }
 

platform/core/src/utils/makeDeferred.js

@@ -1,7 +1,9 @@
 export default function makeDeferred() {
-  let reject, resolve, promise = new Promise(function (res, rej) {
-    resolve = res;
-    reject = rej;
-  });
+  let reject,
+    resolve,
+    promise = new Promise(function(res, rej) {
+      resolve = res;
+      reject = rej;
+    });
   return Object.freeze({ promise, resolve, reject });
 }

platform/core/src/utils/metadataProvider/fetchPaletteColorLookupTableData.js

@@ -116,9 +116,8 @@ function _getPaletteColor(server, paletteColorLookupTableData, lutDescriptor) {
   const bits = lutDescriptor[2];
 
   const arrayBufferToPaletteColorLUT = arraybuffer => {
-    const byteArray = bits === 16 ?
-      new Uint16Array(arraybuffer) :
-      new Uint8Array(arraybuffer);
+    const byteArray =
+      bits === 16 ? new Uint16Array(arraybuffer) : new Uint8Array(arraybuffer);
     const lut = [];
 
     for (let i = 0; i < numLutEntries; i++) {

platform/core/src/utils/metadataProvider/getPixelSpacingInformation.js

@@ -124,7 +124,7 @@ export default function getPixelSpacingInformation(instance) {
     };
   }
 
-    log.info(
+  log.info(
     'Unknown combination of PixelSpacing and ImagerPixelSpacing identified. Unable to determine spacing.'
   );
 }