Merge branch 'master' into fix/merge-datasource-order

OHIF · Jan 23, 2024 · b776716 · b776716
2 parents c97c949 + 1678593
commit b776716
Show file tree

Hide file tree

Showing 52 changed files with 306 additions and 111 deletions.
diff --git a/CHANGELOG.md b/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.8.0-beta.52](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.51...v3.8.0-beta.52) (2024-01-22)
+
+**Note:** Version bump only for package ohif-monorepo-root
+
+
+
+
+
 # [3.8.0-beta.51](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.50...v3.8.0-beta.51) (2024-01-22)
 
 

diff --git a/commit.txt b/commit.txt
@@ -1 +1 @@
-a47aeb8bd729dcb8d2cfc13b27a31b0dd88f11ad
+ef46b5a70409053d95a60e0fc80e5e363f38d999
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.8.0-beta.52](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.51...v3.8.0-beta.52) (2024-01-22)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-rt
+
+
+
+
+
 # [3.8.0-beta.51](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.50...v3.8.0-beta.51) (2024-01-22)
 
 **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.8.0-beta.51",
+  "version": "3.8.0-beta.52",
   "description": "DICOM RT read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -31,10 +31,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.51",
-    "@ohif/extension-cornerstone": "3.8.0-beta.51",
-    "@ohif/extension-default": "3.8.0-beta.51",
-    "@ohif/i18n": "3.8.0-beta.51",
+    "@ohif/core": "3.8.0-beta.52",
+    "@ohif/extension-cornerstone": "3.8.0-beta.52",
+    "@ohif/extension-default": "3.8.0-beta.52",
+    "@ohif/i18n": "3.8.0-beta.52",
     "prop-types": "^15.6.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

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.8.0-beta.52](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.51...v3.8.0-beta.52) (2024-01-22)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-seg
+
+
+
+
+
 # [3.8.0-beta.51](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.50...v3.8.0-beta.51) (2024-01-22)
 
 **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.8.0-beta.51",
+  "version": "3.8.0-beta.52",
   "description": "DICOM SEG read workflow",
   "author": "OHIF",
   "license": "MIT",
@@ -31,10 +31,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.51",
-    "@ohif/extension-cornerstone": "3.8.0-beta.51",
-    "@ohif/extension-default": "3.8.0-beta.51",
-    "@ohif/i18n": "3.8.0-beta.51",
+    "@ohif/core": "3.8.0-beta.52",
+    "@ohif/extension-cornerstone": "3.8.0-beta.52",
+    "@ohif/extension-default": "3.8.0-beta.52",
+    "@ohif/i18n": "3.8.0-beta.52",
     "prop-types": "^15.6.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

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.8.0-beta.52](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.51...v3.8.0-beta.52) (2024-01-22)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr
+
+
+
+
+
 # [3.8.0-beta.51](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.50...v3.8.0-beta.51) (2024-01-22)
 
 **Note:** Version bump only for package @ohif/extension-cornerstone-dicom-sr

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.8.0-beta.51",
+  "version": "3.8.0-beta.52",
   "description": "OHIF extension for an SR Cornerstone Viewport",
   "author": "OHIF",
   "license": "MIT",
@@ -32,10 +32,10 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.51",
-    "@ohif/extension-cornerstone": "3.8.0-beta.51",
-    "@ohif/extension-measurement-tracking": "3.8.0-beta.51",
-    "@ohif/ui": "3.8.0-beta.51",
+    "@ohif/core": "3.8.0-beta.52",
+    "@ohif/extension-cornerstone": "3.8.0-beta.52",
+    "@ohif/extension-measurement-tracking": "3.8.0-beta.52",
+    "@ohif/ui": "3.8.0-beta.52",
     "dcmjs": "^0.29.12",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",

diff --git a/extensions/cornerstone/CHANGELOG.md b/extensions/cornerstone/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.8.0-beta.52](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.51...v3.8.0-beta.52) (2024-01-22)
+
+**Note:** Version bump only for package @ohif/extension-cornerstone
+
+
+
+
+
 # [3.8.0-beta.51](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.50...v3.8.0-beta.51) (2024-01-22)
 
 **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.8.0-beta.51",
+  "version": "3.8.0-beta.52",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",
@@ -37,8 +37,8 @@
     "@cornerstonejs/codec-openjpeg": "^1.2.2",
     "@cornerstonejs/codec-openjph": "^2.4.2",
     "@cornerstonejs/dicom-image-loader": "^1.44.1",
-    "@ohif/core": "3.8.0-beta.51",
-    "@ohif/ui": "3.8.0-beta.51",
+    "@ohif/core": "3.8.0-beta.52",
+    "@ohif/ui": "3.8.0-beta.52",
     "dcmjs": "^0.29.12",
     "dicom-parser": "^1.8.21",
     "hammerjs": "^2.0.8",

diff --git a/extensions/default/CHANGELOG.md b/extensions/default/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.8.0-beta.52](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.51...v3.8.0-beta.52) (2024-01-22)
+
+**Note:** Version bump only for package @ohif/extension-default
+
+
+
+
+
 # [3.8.0-beta.51](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.50...v3.8.0-beta.51) (2024-01-22)
 
 

diff --git a/extensions/default/package.json b/extensions/default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-default",
-  "version": "3.8.0-beta.51",
+  "version": "3.8.0-beta.52",
   "description": "Common/default features and functionality for basic image viewing",
   "author": "OHIF Core Team",
   "license": "MIT",
@@ -30,8 +30,8 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.51",
-    "@ohif/i18n": "3.8.0-beta.51",
+    "@ohif/core": "3.8.0-beta.52",
+    "@ohif/i18n": "3.8.0-beta.52",
     "dcmjs": "^0.29.12",
     "dicomweb-client": "^0.10.4",
     "prop-types": "^15.6.2",

diff --git a/extensions/default/src/commandsModule.ts b/extensions/default/src/commandsModule.ts
@@ -121,7 +121,10 @@ const commandsModule = ({
         if (!button.id) {
           return;
         }
-        const { commands, items } = button.props || button;
+        const { commands, items, primary } = button.props || button;
+        if (primary) {
+          enableListener(primary);
+        }
         if (items) {
           items.forEach(enableListener);
         }

diff --git a/extensions/dicom-microscopy/CHANGELOG.md b/extensions/dicom-microscopy/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.8.0-beta.52](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.51...v3.8.0-beta.52) (2024-01-22)
+
+**Note:** Version bump only for package @ohif/extension-dicom-microscopy
+
+
+
+
+
 # [3.8.0-beta.51](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.50...v3.8.0-beta.51) (2024-01-22)
 
 **Note:** Version bump only for package @ohif/extension-dicom-microscopy

diff --git a/extensions/dicom-microscopy/package.json b/extensions/dicom-microscopy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-microscopy",
-  "version": "3.8.0-beta.51",
+  "version": "3.8.0-beta.52",
   "description": "OHIF extension for DICOM microscopy",
   "author": "Bill Wallace, md-prog",
   "license": "MIT",
@@ -28,10 +28,10 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.51",
-    "@ohif/extension-default": "3.8.0-beta.51",
-    "@ohif/i18n": "3.8.0-beta.51",
-    "@ohif/ui": "3.8.0-beta.51",
+    "@ohif/core": "3.8.0-beta.52",
+    "@ohif/extension-default": "3.8.0-beta.52",
+    "@ohif/i18n": "3.8.0-beta.52",
+    "@ohif/ui": "3.8.0-beta.52",
     "prop-types": "^15.6.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

diff --git a/extensions/dicom-pdf/CHANGELOG.md b/extensions/dicom-pdf/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.8.0-beta.52](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.51...v3.8.0-beta.52) (2024-01-22)
+
+**Note:** Version bump only for package @ohif/extension-dicom-pdf
+
+
+
+
+
 # [3.8.0-beta.51](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.50...v3.8.0-beta.51) (2024-01-22)
 
 **Note:** Version bump only for package @ohif/extension-dicom-pdf

diff --git a/extensions/dicom-pdf/package.json b/extensions/dicom-pdf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-pdf",
-  "version": "3.8.0-beta.51",
+  "version": "3.8.0-beta.52",
   "description": "OHIF extension for PDF display",
   "author": "OHIF",
   "license": "MIT",
@@ -28,8 +28,8 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.51",
-    "@ohif/ui": "3.8.0-beta.51",
+    "@ohif/core": "3.8.0-beta.52",
+    "@ohif/ui": "3.8.0-beta.52",
     "dcmjs": "^0.29.12",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",

diff --git a/extensions/dicom-video/CHANGELOG.md b/extensions/dicom-video/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.8.0-beta.52](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.51...v3.8.0-beta.52) (2024-01-22)
+
+**Note:** Version bump only for package @ohif/extension-dicom-video
+
+
+
+
+
 # [3.8.0-beta.51](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.50...v3.8.0-beta.51) (2024-01-22)
 
 **Note:** Version bump only for package @ohif/extension-dicom-video

diff --git a/extensions/dicom-video/package.json b/extensions/dicom-video/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-dicom-video",
-  "version": "3.8.0-beta.51",
+  "version": "3.8.0-beta.52",
   "description": "OHIF extension for video display",
   "author": "OHIF",
   "license": "MIT",
@@ -28,8 +28,8 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.51",
-    "@ohif/ui": "3.8.0-beta.51",
+    "@ohif/core": "3.8.0-beta.52",
+    "@ohif/ui": "3.8.0-beta.52",
     "dcmjs": "^0.29.12",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",

diff --git a/extensions/measurement-tracking/CHANGELOG.md b/extensions/measurement-tracking/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.8.0-beta.52](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.51...v3.8.0-beta.52) (2024-01-22)
+
+**Note:** Version bump only for package @ohif/extension-measurement-tracking
+
+
+
+
+
 # [3.8.0-beta.51](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.50...v3.8.0-beta.51) (2024-01-22)
 
 **Note:** Version bump only for package @ohif/extension-measurement-tracking

diff --git a/extensions/measurement-tracking/package.json b/extensions/measurement-tracking/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-measurement-tracking",
-  "version": "3.8.0-beta.51",
+  "version": "3.8.0-beta.52",
   "description": "Tracking features and functionality for basic image viewing",
   "author": "OHIF Core Team",
   "license": "MIT",
@@ -32,9 +32,9 @@
   "peerDependencies": {
     "@cornerstonejs/core": "^1.44.1",
     "@cornerstonejs/tools": "^1.44.1",
-    "@ohif/core": "3.8.0-beta.51",
-    "@ohif/extension-cornerstone-dicom-sr": "3.8.0-beta.51",
-    "@ohif/ui": "3.8.0-beta.51",
+    "@ohif/core": "3.8.0-beta.52",
+    "@ohif/extension-cornerstone-dicom-sr": "3.8.0-beta.52",
+    "@ohif/ui": "3.8.0-beta.52",
     "classnames": "^2.3.2",
     "dcmjs": "^0.29.12",
     "lodash.debounce": "^4.17.21",
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@ohif/ui": "3.8.0-beta.51",
+    "@ohif/ui": "3.8.0-beta.52",
     "@xstate/react": "^3.2.2",
     "xstate": "^4.10.0"
   }

diff --git a/extensions/test-extension/CHANGELOG.md b/extensions/test-extension/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.8.0-beta.52](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.51...v3.8.0-beta.52) (2024-01-22)
+
+**Note:** Version bump only for package @ohif/extension-test
+
+
+
+
+
 # [3.8.0-beta.51](https://github.com/OHIF/Viewers/compare/v3.8.0-beta.50...v3.8.0-beta.51) (2024-01-22)
 
 **Note:** Version bump only for package @ohif/extension-test

diff --git a/extensions/test-extension/package.json b/extensions/test-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-test",
-  "version": "3.8.0-beta.51",
+  "version": "3.8.0-beta.52",
   "description": "OHIF extension used inside e2e testing",
   "author": "OHIF",
   "license": "MIT",
@@ -28,8 +28,8 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
   "peerDependencies": {
-    "@ohif/core": "3.8.0-beta.51",
-    "@ohif/ui": "3.8.0-beta.51",
+    "@ohif/core": "3.8.0-beta.52",
+    "@ohif/ui": "3.8.0-beta.52",
     "dcmjs": "0.29.11",
     "dicom-parser": "^1.8.9",
     "hammerjs": "^2.0.8",