fix(metadata): Fix #4, caused by first render where no metadata exists yet while image is loading for WADO-URI

Author: swederik

example/package.json

@@ -14,7 +14,7 @@
     "moment": "^2.22.2",
     "prop-types": "^15.6.2",
     "react": "^16.4.1",
-    "react-cornerstone-viewport": "^0.1.20",
+    "react-cornerstone-viewport": "^0.1.21",
     "react-dom": "^16.4.1",
     "react-resize-detector": "^3.4.0",
     "react-scripts": "^2.1.5"

example/yarn.lock

@@ -8015,10 +8015,10 @@ react-app-polyfill@^0.2.1:
     raf "3.4.1"
     whatwg-fetch "3.0.0"
 
-react-cornerstone-viewport@^0.1.14:
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-0.1.14.tgz#297d004c3e746c476fc785336a928096f257e860"
-  integrity sha512-PUnrDsQujOKEDuXVZFuxX3d8I4sEYtbNeTrGk5HPeFZXccIx+KSUf+qU06CsJnpMu4FqgaeHGtMVKm3hJJRmvg==
+react-cornerstone-viewport@^0.1.21:
+  version "0.1.21"
+  resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-0.1.21.tgz#6af0ab9a5c5384e5baf5d175ec846675d17bf177"
+  integrity sha512-lETYhekC2VawzVq9ZcZnavzgTE2mNeoB2Rh+H0HkMMyGBSl1ULxJvuZpm5KLPU00QujlbY8NKCe2rxKOhc0VZg==
   dependencies:
     lodash.debounce "^4.0.8"
     moment "^2.23.0"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-cornerstone-viewport",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "Cornerstone medical image viewport component for React",
   "author": "Cornerstone Contributors",
   "license": "MIT",

src/ViewportOverlay/ViewportOverlay.js

@@ -15,10 +15,8 @@ const {
 } = helpers;
 
 function getCompression(imageId) {
-  const generalImageModule = cornerstone.metaData.get(
-    'generalImageModule',
-    imageId
-  );
+  const generalImageModule =
+    cornerstone.metaData.get('generalImageModule', imageId) || {};
   const {
     lossyImageCompression,
     lossyImageCompressionRatio,
@@ -51,34 +49,26 @@ class ViewportOverlay extends PureComponent {
     }
 
     const zoom = this.props.viewport.scale * 100;
-    const seriesMetadata = cornerstone.metaData.get(
-      'generalSeriesModule',
-      imageId
-    );
-    const imagePlaneModule = cornerstone.metaData.get(
-      'imagePlaneModule',
-      imageId
-    );
-    const { rows, columns, sliceThickness, sliceLocation } =
-      imagePlaneModule || {};
-    const { seriesNumber, seriesDescription } = seriesMetadata || {};
-
-    const generalStudyModule = cornerstone.metaData.get(
-      'generalStudyModule',
-      imageId
-    );
+    const seriesMetadata =
+      cornerstone.metaData.get('generalSeriesModule', imageId) || {};
+    const imagePlaneModule =
+      cornerstone.metaData.get('imagePlaneModule', imageId) || {};
+    const { rows, columns, sliceThickness, sliceLocation } = imagePlaneModule;
+    const { seriesNumber, seriesDescription } = seriesMetadata;
+
+    const generalStudyModule =
+      cornerstone.metaData.get('generalStudyModule', imageId) || {};
     const { studyDate, studyTime, studyDescription } = generalStudyModule;
 
-    const patientModule = cornerstone.metaData.get('patientModule', imageId);
+    const patientModule =
+      cornerstone.metaData.get('patientModule', imageId) || {};
     const { patientId, patientName } = patientModule;
 
-    const generalImageModule = cornerstone.metaData.get(
-      'generalImageModule',
-      imageId
-    );
+    const generalImageModule =
+      cornerstone.metaData.get('generalImageModule', imageId) || {};
     const { instanceNumber } = generalImageModule;
 
-    const cineModule = cornerstone.metaData.get('cineModule', imageId);
+    const cineModule = cornerstone.metaData.get('cineModule', imageId) || {};
     const { frameTime } = cineModule;
 
     const frameRate = formatNumberPrecision(1000 / frameTime, 1);