Merge branch 'fix/docker-build-time' of https://github.com/OHIF/Viewers…

… into fix/docker-build-time
OHIF · Dec 20, 2024 · 3e2c0d3 · 3e2c0d3
2 parents 4ebb977 + f4175ae
commit 3e2c0d3
Show file tree

Hide file tree

Showing 66 changed files with 408 additions and 152 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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.
 
+# [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20)
+
+
+### Bug Fixes
+
+* **segmentation:** black preview when loading a seg, and crash on opening panel ([#4602](https://github.com/OHIF/Viewers/issues/4602)) ([faf5515](https://github.com/OHIF/Viewers/commit/faf5515e4b93da58b673f1ae59ec345e30870446))
+
+
+
+
+
 # [3.10.0-beta.30](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.29...v3.10.0-beta.30) (2024-12-18)
 
 

diff --git a/addOns/externals/devDependencies/CHANGELOG.md b/addOns/externals/devDependencies/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20)
+
+**Note:** Version bump only for package @externals/devDependencies
+
+
+
+
+
 # [3.10.0-beta.30](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.29...v3.10.0-beta.30) (2024-12-18)
 
 **Note:** Version bump only for package @externals/devDependencies

diff --git a/addOns/externals/devDependencies/package.json b/addOns/externals/devDependencies/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@externals/devDependencies",
   "description": "External dev dependencies - put dev build dependencies here",
-  "version": "3.10.0-beta.30",
+  "version": "3.10.0-beta.31",
   "license": "MIT",
   "private": true,
   "engines": {

diff --git a/addOns/externals/dicom-microscopy-viewer/CHANGELOG.md b/addOns/externals/dicom-microscopy-viewer/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20)
+
+**Note:** Version bump only for package @externals/dicom-microscopy-viewer
+
+
+
+
+
 # [3.10.0-beta.30](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.29...v3.10.0-beta.30) (2024-12-18)
 
 **Note:** Version bump only for package @externals/dicom-microscopy-viewer

diff --git a/addOns/externals/dicom-microscopy-viewer/package.json b/addOns/externals/dicom-microscopy-viewer/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@externals/dicom-microscopy-viewer",
   "description": "External reference to dicom-microscopy-viewer",
-  "version": "3.10.0-beta.30",
+  "version": "3.10.0-beta.31",
   "license": "MIT",
   "dependencies": {
     "dicom-microscopy-viewer": "^0.46.1"

diff --git a/commit.txt b/commit.txt
@@ -1 +1 @@
-2df8e1d5cd7a203bdde1cac6230b60a0b87bfcdd
+faf5515e4b93da58b673f1ae59ec345e30870446
diff --git a/extensions/cornerstone-dicom-pmap/CHANGELOG.md b/extensions/cornerstone-dicom-pmap/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-pmap
+
+
+
+
+
 # [3.10.0-beta.30](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.29...v3.10.0-beta.30) (2024-12-18)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone-dicom-pmap

diff --git a/extensions/cornerstone-dicom-pmap/package.json b/extensions/cornerstone-dicom-pmap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dicom-pmap",
-  "version": "3.10.0-beta.30",
+  "version": "3.10.0-beta.31",
   "description": "DICOM Parametric Map read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -33,10 +33,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.10.0-beta.30",
-    "@ohif/extension-cornerstone": "3.10.0-beta.30",
-    "@ohif/extension-default": "3.10.0-beta.30",
-    "@ohif/i18n": "3.10.0-beta.30",
+    "@ohif/core": "3.10.0-beta.31",
+    "@ohif/extension-cornerstone": "3.10.0-beta.31",
+    "@ohif/extension-default": "3.10.0-beta.31",
+    "@ohif/i18n": "3.10.0-beta.31",
     "prop-types": "^15.6.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

diff --git a/extensions/cornerstone-dicom-rt/CHANGELOG.md b/extensions/cornerstone-dicom-rt/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt
+
+
+
+
+
 # [3.10.0-beta.30](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.29...v3.10.0-beta.30) (2024-12-18)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt

diff --git a/extensions/cornerstone-dicom-rt/package.json b/extensions/cornerstone-dicom-rt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dicom-rt",
-  "version": "3.10.0-beta.30",
+  "version": "3.10.0-beta.31",
   "description": "DICOM RT read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -33,10 +33,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.10.0-beta.30",
-    "@ohif/extension-cornerstone": "3.10.0-beta.30",
-    "@ohif/extension-default": "3.10.0-beta.30",
-    "@ohif/i18n": "3.10.0-beta.30",
+    "@ohif/core": "3.10.0-beta.31",
+    "@ohif/extension-cornerstone": "3.10.0-beta.31",
+    "@ohif/extension-default": "3.10.0-beta.31",
+    "@ohif/i18n": "3.10.0-beta.31",
     "prop-types": "^15.6.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

diff --git a/extensions/cornerstone-dicom-seg/CHANGELOG.md b/extensions/cornerstone-dicom-seg/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg
+
+
+
+
+
 # [3.10.0-beta.30](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.29...v3.10.0-beta.30) (2024-12-18)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg

diff --git a/extensions/cornerstone-dicom-seg/package.json b/extensions/cornerstone-dicom-seg/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dicom-seg",
-  "version": "3.10.0-beta.30",
+  "version": "3.10.0-beta.31",
   "description": "DICOM SEG read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -33,10 +33,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.10.0-beta.30",
-    "@ohif/extension-cornerstone": "3.10.0-beta.30",
-    "@ohif/extension-default": "3.10.0-beta.30",
-    "@ohif/i18n": "3.10.0-beta.30",
+    "@ohif/core": "3.10.0-beta.31",
+    "@ohif/extension-cornerstone": "3.10.0-beta.31",
+    "@ohif/extension-default": "3.10.0-beta.31",
+    "@ohif/i18n": "3.10.0-beta.31",
     "prop-types": "^15.6.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

diff --git a/extensions/cornerstone-dicom-sr/CHANGELOG.md b/extensions/cornerstone-dicom-sr/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr
+
+
+
+
+
 # [3.10.0-beta.30](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.29...v3.10.0-beta.30) (2024-12-18)
 
 

diff --git a/extensions/cornerstone-dicom-sr/package.json b/extensions/cornerstone-dicom-sr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dicom-sr",
-  "version": "3.10.0-beta.30",
+  "version": "3.10.0-beta.31",
   "description": "OHIF extension for an SR Cornerstone Viewport",
   "author": "OHIF",
   "license": "MIT",
@@ -34,10 +34,10 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.10.0-beta.30",
-    "@ohif/extension-cornerstone": "3.10.0-beta.30",
-    "@ohif/extension-measurement-tracking": "3.10.0-beta.30",
-    "@ohif/ui": "3.10.0-beta.30",
+    "@ohif/core": "3.10.0-beta.31",
+    "@ohif/extension-cornerstone": "3.10.0-beta.31",
+    "@ohif/extension-measurement-tracking": "3.10.0-beta.31",
+    "@ohif/ui": "3.10.0-beta.31",
     "dcmjs": "*",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",

diff --git a/extensions/cornerstone-dynamic-volume/CHANGELOG.md b/extensions/cornerstone-dynamic-volume/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dynamic-volume
+
+
+
+
+
 # [3.10.0-beta.30](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.29...v3.10.0-beta.30) (2024-12-18)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone-dynamic-volume

diff --git a/extensions/cornerstone-dynamic-volume/package.json b/extensions/cornerstone-dynamic-volume/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone-dynamic-volume",
-  "version": "3.10.0-beta.30",
+  "version": "3.10.0-beta.31",
   "description": "OHIF extension for 4D volumes data",
   "author": "OHIF",
   "license": "MIT",
@@ -29,11 +29,11 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.10.0-beta.30",
-    "@ohif/extension-cornerstone": "3.10.0-beta.30",
-    "@ohif/extension-default": "3.10.0-beta.30",
-    "@ohif/i18n": "3.10.0-beta.30",
-    "@ohif/ui": "3.10.0-beta.30",
+    "@ohif/core": "3.10.0-beta.31",
+    "@ohif/extension-cornerstone": "3.10.0-beta.31",
+    "@ohif/extension-default": "3.10.0-beta.31",
+    "@ohif/i18n": "3.10.0-beta.31",
+    "@ohif/ui": "3.10.0-beta.31",
     "dcmjs": "*",
     "dicom-parser": "^1.8.21",
     "hammerjs": "^2.0.8",

diff --git a/extensions/cornerstone/CHANGELOG.md b/extensions/cornerstone/CHANGELOG.md
@@ -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.
 
+# [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20)
+
+
+### Bug Fixes
+
+* **segmentation:** black preview when loading a seg, and crash on opening panel ([#4602](https://github.com/OHIF/Viewers/issues/4602)) ([faf5515](https://github.com/OHIF/Viewers/commit/faf5515e4b93da58b673f1ae59ec345e30870446))
+
+
+
+
+
 # [3.10.0-beta.30](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.29...v3.10.0-beta.30) (2024-12-18)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone

diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone",
-  "version": "3.10.0-beta.30",
+  "version": "3.10.0-beta.31",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",
@@ -40,8 +40,8 @@
     "@cornerstonejs/codec-openjph": "^2.4.5",
     "@cornerstonejs/dicom-image-loader": "^2.11.2",
     "@icr/polyseg-wasm": "^0.4.0",
-    "@ohif/core": "3.10.0-beta.30",
-    "@ohif/ui": "3.10.0-beta.30",
+    "@ohif/core": "3.10.0-beta.31",
+    "@ohif/ui": "3.10.0-beta.31",
     "dcmjs": "*",
     "dicom-parser": "^1.8.21",
     "hammerjs": "^2.0.8",

diff --git a/extensions/cornerstone/src/panels/PanelSegmentation.tsx b/extensions/cornerstone/src/panels/PanelSegmentation.tsx
@@ -243,13 +243,15 @@ export default function PanelSegmentation({
     const firstImageId = referencedImageIds[0];
 
     const instance = metaData.get('instance', firstImageId);
-    const { SOPInstanceUID, SeriesInstanceUID } = instance;
+    const SOPInstanceUID = instance.SOPInstanceUID || instance.SopInstanceUID;
+    const SeriesInstanceUID = instance.SeriesInstanceUID;
 
     const displaySet = displaySetService.getDisplaySetForSOPInstanceUID(
       SOPInstanceUID,
       SeriesInstanceUID
     );
-    const isExportable = displaySet.isReconstructable;
+
+    const isExportable = displaySet?.isReconstructable;
 
     return {
       segmentationId,

diff --git a/extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts b/extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts
@@ -7,6 +7,7 @@ import {
   imageLoader,
   Types as csTypes,
   utilities as csUtils,
+  metaData,
 } from '@cornerstonejs/core';
 import {
   Enums as csToolsEnums,
@@ -360,11 +361,11 @@ class SegmentationService extends PubSubService {
           options.segments && Object.keys(options.segments).length > 0
             ? options.segments
             : {
-                1: {
-                  label: 'Segment 1',
-                  active: true,
-                },
+              1: {
+                label: 'Segment 1',
+                active: true,
               },
+            },
         cachedStats: {
           info: `S${displaySet.SeriesNumber}: ${displaySet.SeriesDescription}`,
         },
@@ -381,8 +382,8 @@ class SegmentationService extends PubSubService {
       segmentationId?: string;
       type: SegmentationRepresentations;
     } = {
-      type: LABELMAP,
-    }
+        type: LABELMAP,
+      }
   ): Promise<string> {
     const { type } = options;
     let { segmentationId } = options;
@@ -414,7 +415,10 @@ class SegmentationService extends PubSubService {
       imageIds as string[]
     );
 
-    segDisplaySet.images = derivedSegmentationImages;
+    segDisplaySet.images = derivedSegmentationImages.map(image => ({
+      ...image,
+      ...metaData.get('instance', image.referencedImageId),
+    }));
 
     const segmentsInfo = segDisplaySet.segMetadata.data;
 
@@ -531,8 +535,8 @@ class SegmentationService extends PubSubService {
       segmentationId?: string;
       type: SegmentationRepresentations;
     } = {
-      type: CONTOUR,
-    }
+        type: CONTOUR,
+      }
   ): Promise<string> {
     const { type } = options;
     let { segmentationId } = options;

diff --git a/extensions/default/CHANGELOG.md b/extensions/default/CHANGELOG.md
@@ -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.
 
+# [3.10.0-beta.31](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.30...v3.10.0-beta.31) (2024-12-20)
+
+
+### Bug Fixes
+
+* **segmentation:** black preview when loading a seg, and crash on opening panel ([#4602](https://github.com/OHIF/Viewers/issues/4602)) ([faf5515](https://github.com/OHIF/Viewers/commit/faf5515e4b93da58b673f1ae59ec345e30870446))
+
+
+
+
+
 # [3.10.0-beta.30](https://github.com/OHIF/Viewers/compare/v3.10.0-beta.29...v3.10.0-beta.30) (2024-12-18)
 
 **Note:** Version bump only for package @ohif/extension-default
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2df8e1d5cd7a203bdde1cac6230b60a0b87bfcdd
		faf5515e4b93da58b673f1ae59ec345e30870446