fix(wsi): mount WSI/SM viewports via setDisplaySets (#6107)

extensions/cornerstone-dicom-pmap/package.json

@@ -41,8 +41,8 @@
   },
   "dependencies": {
     "@babel/runtime": "7.29.7",
-    "@cornerstonejs/adapters": "5.0.2",
-    "@cornerstonejs/core": "5.0.2",
+    "@cornerstonejs/adapters": "5.1.3",
+    "@cornerstonejs/core": "5.1.3",
     "@kitware/vtk.js": "35.5.3"
   },
   "devDependencies": {

extensions/cornerstone-dicom-seg/package.json

@@ -41,8 +41,8 @@
   },
   "dependencies": {
     "@babel/runtime": "7.29.7",
-    "@cornerstonejs/adapters": "5.0.2",
-    "@cornerstonejs/core": "5.0.2",
+    "@cornerstonejs/adapters": "5.1.3",
+    "@cornerstonejs/core": "5.1.3",
     "@kitware/vtk.js": "35.5.3"
   },
   "devDependencies": {

extensions/cornerstone-dicom-sr/package.json

@@ -40,9 +40,9 @@
   },
   "dependencies": {
     "@babel/runtime": "7.29.7",
-    "@cornerstonejs/adapters": "5.0.2",
-    "@cornerstonejs/core": "5.0.2",
-    "@cornerstonejs/tools": "5.0.2",
+    "@cornerstonejs/adapters": "5.1.3",
+    "@cornerstonejs/core": "5.1.3",
+    "@cornerstonejs/tools": "5.1.3",
     "classnames": "2.5.1"
   },
   "devDependencies": {

extensions/cornerstone-dynamic-volume/package.json

@@ -45,8 +45,8 @@
   },
   "dependencies": {
     "@babel/runtime": "7.29.7",
-    "@cornerstonejs/core": "5.0.2",
-    "@cornerstonejs/tools": "5.0.2",
+    "@cornerstonejs/core": "5.1.3",
+    "@cornerstonejs/tools": "5.1.3",
     "classnames": "2.5.1"
   },
   "devDependencies": {

extensions/cornerstone/package.json

@@ -38,7 +38,7 @@
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.2",
     "@cornerstonejs/codec-openjpeg": "1.3.0",
     "@cornerstonejs/codec-openjph": "2.4.7",
-    "@cornerstonejs/dicom-image-loader": "5.0.2",
+    "@cornerstonejs/dicom-image-loader": "5.1.3",
     "@ohif/core": "workspace:*",
     "@ohif/extension-default": "workspace:*",
     "@ohif/ui": "workspace:*",
@@ -52,13 +52,13 @@
   },
   "dependencies": {
     "@babel/runtime": "7.29.7",
-    "@cornerstonejs/adapters": "5.0.2",
-    "@cornerstonejs/ai": "5.0.2",
-    "@cornerstonejs/core": "5.0.2",
-    "@cornerstonejs/labelmap-interpolation": "5.0.2",
-    "@cornerstonejs/metadata": "5.0.2",
-    "@cornerstonejs/polymorphic-segmentation": "5.0.2",
-    "@cornerstonejs/tools": "5.0.2",
+    "@cornerstonejs/adapters": "5.1.3",
+    "@cornerstonejs/ai": "5.1.3",
+    "@cornerstonejs/core": "5.1.3",
+    "@cornerstonejs/labelmap-interpolation": "5.1.3",
+    "@cornerstonejs/metadata": "5.1.3",
+    "@cornerstonejs/polymorphic-segmentation": "5.1.3",
+    "@cornerstonejs/tools": "5.1.3",
     "@icr/polyseg-wasm": "0.4.0",
     "@itk-wasm/morphological-contour-interpolation": "1.1.0",
     "@kitware/vtk.js": "35.5.3",

extensions/cornerstone/src/services/ViewportService/CornerstoneViewportService.ts

@@ -8,6 +8,7 @@ import {
   utilities as csUtils,
   cache,
   Enums as csEnums,
+  metaData,
 } from '@cornerstonejs/core';
 
 import { utilities as csToolsUtils, Enums as csToolsEnums } from '@cornerstonejs/tools';
@@ -849,10 +850,21 @@ class CornerstoneViewportService extends PubSubService implements IViewportServi
     _presentations: Presentations = {}
   ): Promise<void> {
     const [displaySet] = viewportData.data;
-    // CS3D's "redo viewports" replaced setDataIds with the generic
-    // setDisplaySets({ displaySetId }) API; the legacy adapters key off
-    // imageIds[0] as the displaySetId, so do the same here.
-    await viewport.setDisplaySets({ displaySetId: displaySet.imageIds[0] });
+    const displaySetId = displaySet.imageIds[0];
+    // Register the WSI dataset so the viewport can resolve its imageIds +
+    // webClient by display-set id, then mount via setDisplaySets. The webClient
+    // was registered under the WADO_WEB_CLIENT module (keyed by imageIds[0]) by
+    // the SM SOP class handler. CS3D's "redo viewports" reads this same registry
+    // (genericViewportDisplaySetMetadataProvider) from its WSI data provider;
+    // without this entry setDisplaySets throws "No registered WSI dataset" and
+    // the viewport renders gray.
+    const webClient = metaData.get(csEnums.MetadataModules.WADO_WEB_CLIENT, displaySetId);
+    csUtils.genericViewportDisplaySetMetadataProvider.add(displaySetId, {
+      imageIds: displaySet.imageIds,
+      kind: 'wsi',
+      options: { webClient },
+    });
+    await viewport.setDisplaySets({ displaySetId });
     const viewReference = viewportInfo.getViewReference();
     if (viewReference) {
       viewport.setViewReference(viewReference);

extensions/measurement-tracking/package.json

@@ -27,8 +27,8 @@
     "start": "pnpm run dev"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.0.2",
-    "@cornerstonejs/tools": "5.0.2",
+    "@cornerstonejs/core": "5.1.3",
+    "@cornerstonejs/tools": "5.1.3",
     "@ohif/core": "workspace:*",
     "@ohif/extension-cornerstone-dicom-sr": "workspace:*",
     "@ohif/extension-default": "workspace:*",

extensions/usAnnotation/package.json

@@ -36,8 +36,8 @@
   },
   "dependencies": {
     "@babel/runtime": "7.29.7",
-    "@cornerstonejs/core": "5.0.2",
-    "@cornerstonejs/tools": "5.0.2",
+    "@cornerstonejs/core": "5.1.3",
+    "@cornerstonejs/tools": "5.1.3",
     "@ohif/core": "workspace:*",
     "@ohif/extension-cornerstone": "workspace:*",
     "@ohif/extension-default": "workspace:*",

modes/usAnnotation/package.json

@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "@babel/runtime": "7.29.7",
-    "@cornerstonejs/core": "5.0.2",
-    "@cornerstonejs/tools": "5.0.2",
+    "@cornerstonejs/core": "5.1.3",
+    "@cornerstonejs/tools": "5.1.3",
     "@ohif/core": "workspace:*",
     "@ohif/extension-cornerstone-dicom-sr": "workspace:*",
     "@ohif/extension-ultrasound-pleura-bline": "workspace:*",

platform/app/package.json

@@ -51,7 +51,7 @@
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.2",
     "@cornerstonejs/codec-openjpeg": "1.3.0",
     "@cornerstonejs/codec-openjph": "2.4.7",
-    "@cornerstonejs/dicom-image-loader": "5.0.2",
+    "@cornerstonejs/dicom-image-loader": "5.1.3",
     "@emotion/serialize": "1.3.3",
     "@ohif/core": "workspace:*",
     "@ohif/i18n": "workspace:*",

platform/core/package.json

@@ -35,9 +35,9 @@
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.2",
     "@cornerstonejs/codec-openjpeg": "1.3.0",
     "@cornerstonejs/codec-openjph": "2.4.7",
-    "@cornerstonejs/core": "5.0.2",
-    "@cornerstonejs/dicom-image-loader": "5.0.2",
-    "@cornerstonejs/metadata": "5.0.2",
+    "@cornerstonejs/core": "5.1.3",
+    "@cornerstonejs/dicom-image-loader": "5.1.3",
+    "@cornerstonejs/metadata": "5.1.3",
     "@ohif/ui": "workspace:*",
     "cornerstone-math": "0.1.10",
     "dicom-parser": "1.8.21"

tests/WSI.spec.ts

@@ -0,0 +1,23 @@
+import { test, visitStudy, checkForScreenshot, screenShotPaths } from './utils';
+
+// A DICOM VL Whole Slide Microscopy (SM) study. Opened in `viewer` mode it is
+// routed to the cornerstone3D WHOLE_SLIDE viewport (mode-basic registers
+// `ohif.wsiSopClassHandler`), which is the render path that previously
+// regressed to a gray canvas. This screenshot comparison is a
+// simple safeguard: if the WSI viewport fails to mount and renders gray again,
+// the baseline no longer matches and the test fails.
+test.beforeEach(async ({ page }) => {
+  const studyInstanceUID = '1.2.276.0.7230010.3.1.2.296485376.1.1665793212.499772';
+  const mode = 'viewer';
+  await visitStudy(page, studyInstanceUID, mode, 5000);
+});
+
+test('should render the WSI viewport', async ({ page, viewportPageObject }) => {
+  // WSI tiles load progressively; checkForScreenshot's built-in retry loop
+  // gives the viewport time to paint before comparing against the baseline.
+  await checkForScreenshot({
+    page,
+    locator: viewportPageObject.grid,
+    screenshotPath: screenShotPaths.wsi.wsiDisplayedCorrectly,
+  });
+});

tests/utils/screenShotPaths.ts

@@ -224,6 +224,9 @@ const screenShotPaths = {
   workList: {
     scrollBarRenderedProperly: 'scrollBarRenderedProperly.png',
   },
+  wsi: {
+    wsiDisplayedCorrectly: 'wsiDisplayedCorrectly.png',
+  },
 };
 
 export { screenShotPaths };