diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json index c191fe35d..da3fd873b 100644 --- a/extensions/cornerstone/package.json +++ b/extensions/cornerstone/package.json @@ -36,7 +36,7 @@ "cornerstone-math": "^0.1.9", "cornerstone-tools": "^6.0.0", "cornerstone-wado-image-loader": "^4.0.3", - "dcmjs": "0.18.9", + "dcmjs": "0.18.10", "dicom-parser": "^1.8.9", "hammerjs": "^2.0.8", "prop-types": "^15.6.2", diff --git a/extensions/dicom-html/package.json b/extensions/dicom-html/package.json index 5904406dd..85dbc286f 100644 --- a/extensions/dicom-html/package.json +++ b/extensions/dicom-html/package.json @@ -29,7 +29,7 @@ }, "peerDependencies": { "@ohif/core": "^0.50.0", - "dcmjs": "0.18.9", + "dcmjs": "0.18.10", "prop-types": "^15.6.2", "react": "^16.8.6", "react-dom": "^16.8.6" diff --git a/extensions/dicom-html/src/DicomHtmlViewport.js b/extensions/dicom-html/src/DicomHtmlViewport.js index 0c4cd4fec..5acedaac9 100644 --- a/extensions/dicom-html/src/DicomHtmlViewport.js +++ b/extensions/dicom-html/src/DicomHtmlViewport.js @@ -217,7 +217,7 @@ class DicomHtmlViewport extends Component { }; componentDidMount() { - const dataSet = this.setContentFromByteArray(this.props.byteArray); + this.setContentFromByteArray(this.props.byteArray); } setContentFromByteArray(byteArray) { diff --git a/extensions/dicom-rt/package.json b/extensions/dicom-rt/package.json index 9e411f98b..eff9e7360 100644 --- a/extensions/dicom-rt/package.json +++ b/extensions/dicom-rt/package.json @@ -31,7 +31,7 @@ "@ohif/core": "^0.50.0", "cornerstone-core": "^2.5.0", "cornerstone-tools": "^6.0.0", - "dcmjs": "0.18.9", + "dcmjs": "0.18.10", "gl-matrix": "^3.3.0", "prop-types": "^15.6.2", "react": "^16.8.6", diff --git a/extensions/dicom-rt/src/index.js b/extensions/dicom-rt/src/index.js index 29efbcee6..383440e10 100644 --- a/extensions/dicom-rt/src/index.js +++ b/extensions/dicom-rt/src/index.js @@ -91,17 +91,12 @@ export default { } if (activeViewport) { - const study = studies.find( - s => s.StudyInstanceUID === activeViewport.StudyInstanceUID - ); - const ds = study.displaySets.find( - ds => - ds.displaySetInstanceUID === - activeViewport.displaySetInstanceUID - ); const studyMetadata = studyMetadataManager.get( activeViewport.StudyInstanceUID ); + if (!studyMetadata) { + return; + } const referencedDisplaySets = studyMetadata.getDerivedDatasets({ referencedSeriesInstanceUID: activeViewport.SeriesInstanceUID, Modality: 'RTSTRUCT', diff --git a/extensions/dicom-segmentation/package.json b/extensions/dicom-segmentation/package.json index 83fe40929..3bb507d42 100644 --- a/extensions/dicom-segmentation/package.json +++ b/extensions/dicom-segmentation/package.json @@ -31,7 +31,7 @@ "@ohif/core": "^0.50.0", "cornerstone-core": "^2.5.0", "cornerstone-tools": "^6.0.0", - "dcmjs": "0.18.9", + "dcmjs": "0.18.10", "prop-types": "^15.6.2", "react": "^16.8.6", "react-dom": "^16.8.6" diff --git a/extensions/dicom-segmentation/src/index.js b/extensions/dicom-segmentation/src/index.js index 3136527d2..17bd246b7 100644 --- a/extensions/dicom-segmentation/src/index.js +++ b/extensions/dicom-segmentation/src/index.js @@ -143,6 +143,9 @@ export default { const studyMetadata = studyMetadataManager.get( activeViewport.StudyInstanceUID ); + if (!studyMetadata) { + return; + } const referencedDS = studyMetadata.getDerivedDatasets({ referencedSeriesInstanceUID: activeViewport.SeriesInstanceUID, diff --git a/extensions/dicom-tag-browser/package.json b/extensions/dicom-tag-browser/package.json index f02aa341e..4563f2a88 100644 --- a/extensions/dicom-tag-browser/package.json +++ b/extensions/dicom-tag-browser/package.json @@ -28,7 +28,7 @@ }, "peerDependencies": { "@ohif/core": "^2.6.0", - "dcmjs": "0.18.9", + "dcmjs": "0.18.10", "react": "^16.8.6" }, "dependencies": { diff --git a/extensions/vtk/package.json b/extensions/vtk/package.json index fd1734f7f..aa0d098d6 100644 --- a/extensions/vtk/package.json +++ b/extensions/vtk/package.json @@ -35,7 +35,7 @@ "cornerstone-core": "^2.5.0", "cornerstone-tools": "^6.0.0", "cornerstone-wado-image-loader": "^4.0.3", - "dcmjs": "0.18.9", + "dcmjs": "0.18.10", "dicom-parser": "^1.8.9", "i18next": "^17.0.3", "i18next-browser-languagedetector": "^3.0.1", diff --git a/platform/core/package.json b/platform/core/package.json index 1fffa1587..087678cf2 100644 --- a/platform/core/package.json +++ b/platform/core/package.json @@ -39,7 +39,7 @@ "dependencies": { "@babel/runtime": "^7.5.5", "ajv": "^6.10.0", - "dcmjs": "0.18.9", + "dcmjs": "0.18.10", "dicomweb-client": "^0.8.1", "immer": "6.0.2", "isomorphic-base64": "^1.0.2", diff --git a/platform/ui/src/contextProviders/SnackbarProvider.js b/platform/ui/src/contextProviders/SnackbarProvider.js index 6e54f2334..840833af9 100644 --- a/platform/ui/src/contextProviders/SnackbarProvider.js +++ b/platform/ui/src/contextProviders/SnackbarProvider.js @@ -41,7 +41,7 @@ const SnackbarProvider = ({ children, service }) => { LogManager.subscribe(LogManager.EVENTS.OnLog, onLogHandler); return () => { - LogManager.subscribe(LogManager.EVENTS.OnLog, onLogHandler); + LogManager.unsubscribe(LogManager.EVENTS.OnLog, onLogHandler); }; }, [show]); diff --git a/platform/viewer/package.json b/platform/viewer/package.json index 8660ab8e8..7271b5262 100644 --- a/platform/viewer/package.json +++ b/platform/viewer/package.json @@ -66,7 +66,7 @@ "cornerstone-math": "^0.1.9", "cornerstone-tools": "^6.0.0", "cornerstone-wado-image-loader": "^4.0.3", - "dcmjs": "0.18.9", + "dcmjs": "0.18.10", "dicom-parser": "^1.8.9", "dicomweb-client": "^0.8.1", "hammerjs": "^2.0.8", diff --git a/yarn.lock b/yarn.lock index 08f3afd08..f7df087f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6647,10 +6647,10 @@ dateformat@^3.0.0: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -dcmjs@0.18.9: - version "0.18.9" - resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.18.9.tgz#0e18fcff975aaae8ca01a96e781fa75c29ec97f3" - integrity sha512-aTu4fUo3TSgohJC+U509qdXL1per09XvlYdQva0BGtIZMr/iR5n8h/ojpcDTRJoVtSuaj331KJj1yCj8FMMK4Q== +dcmjs@0.18.10: + version "0.18.10" + resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.18.10.tgz#9e293a20dc359c7eba6c81b6afaf5a52fa841288" + integrity sha512-GLW1KJmzs+1ye8WA29wDy+cOHa4dYv2Q5XPQuX33X4bK5AqzS+56IzuCH+WkQXnvALZZDBFgbPztOVdUwnN4uw== dependencies: "@babel/polyfill" "^7.8.3" "@babel/runtime" "^7.8.4"