fix(jump): Jump to measurement wasn't jumping when presentation already existed (#3318)

* fix: Jump to measurement after presentation store

* Fix initial load of DICOM SR

* Fix measurement highlight issues

* Clear measurements changed to array

* Fix merge issues

* PR comments

* Removed unused formatting.  Change to single event

* Fix the unit test

* PR review comments

* refactor(viewport): simplify imports, align destructuring

Simplify import statements by removing unused imports, organize existing imports, and align destructured imports consistently across the component.

---------

extensions/cornerstone/src/services/CornerstoneCacheService/CornerstoneCacheService.ts

@@ -16,14 +16,14 @@ const VOLUME_LOADER_SCHEME = 'cornerstoneStreamingImageVolume';
 
 class CornerstoneCacheService {
   static REGISTRATION = {
-      name: 'cornerstoneCacheService',
-      altName: 'CornerstoneCacheService',
+    name: 'cornerstoneCacheService',
+    altName: 'CornerstoneCacheService',
     create: ({
       servicesManager,
     }: Types.Extensions.ExtensionParams): CornerstoneCacheService => {
       return new CornerstoneCacheService(servicesManager);
-      },
-    };
+    },
+  };
 
   stackImageIds: Map<string, string[]> = new Map();
   volumeImageIds: Map<string, string[]> = new Map();
@@ -143,13 +143,18 @@ class CornerstoneCacheService {
       this.stackImageIds.set(displaySet.displaySetInstanceUID, stackImageIds);
     }
 
-    const { displaySetInstanceUID, StudyInstanceUID } = displaySet;
+    const {
+      displaySetInstanceUID,
+      StudyInstanceUID,
+      isCompositeStack,
+    } = displaySet;
 
     const StackViewportData: StackViewportData = {
       viewportType,
       data: {
         StudyInstanceUID,
         displaySetInstanceUID,
+        isCompositeStack,
         imageIds: stackImageIds,
       },
     };

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

@@ -906,6 +906,34 @@ class CornerstoneViewportService extends PubSubService
       return images[0].FrameOfReferenceUID;
     }
   }
+
+  /**
+   * Looks through the viewports to see if the specified measurement can be
+   * displayed in one of the viewports.
+   *
+   * @param measurement
+   *          The measurement that is desired to view.
+   * @param activeViewportIndex - the index that was active at the time the jump
+   *          was initiated.
+   * @return the viewportIndex to display the given measurement
+   */
+  public getViewportIndexToJump(
+    activeViewportIndex: number,
+    displaySetInstanceUID: string,
+    cameraProps: unknown
+  ): number {
+    const viewportInfo = this.viewportsInfo.get(activeViewportIndex);
+    const { referencedImageId } = cameraProps;
+    if (viewportInfo?.contains(displaySetInstanceUID, referencedImageId)) {
+      return activeViewportIndex;
+    }
+
+    return (
+      [...this.viewportsById.values()].find(viewportInfo =>
+        viewportInfo.contains(displaySetInstanceUID, referencedImageId)
+      )?.viewportIndex ?? -1
+    );
+  }
 }
 
 export default CornerstoneViewportService;

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

@@ -88,6 +88,20 @@ export type DisplaySet = {
 const STACK = 'stack';
 const DEFAULT_TOOLGROUP_ID = 'default';
 
+// Return true if the data contains the given display set UID OR the imageId
+// if it is a composite object.
+const dataContains = (
+  data,
+  displaySetUID: string,
+  imageId?: string
+): boolean => {
+  if (data.displaySetInstanceUID === displaySetUID) return true;
+  if (imageId && data.isCompositeStack && data.imageIds) {
+    return !!data.imageIds.find(dataId => dataId === imageId);
+  }
+  return false;
+};
+
 class ViewportInfo {
   private viewportId = '';
   private viewportIndex: number;
@@ -104,6 +118,21 @@ class ViewportInfo {
     this.setPublicDisplaySetOptions([{}]);
   }
 
+  /**
+   * Return true if the viewport contains the given display set UID,
+   * OR if it is a composite stack and contains the given imageId
+   */
+  public contains(displaySetUID: string, imageId: string): boolean {
+    if (!this.viewportData?.data) return false;
+
+    if (this.viewportData.data.length) {
+      return !!this.viewportData.find(data =>
+        dataContains(data, displaySetUID, imageId)
+      );
+    }
+    return dataContains(this.viewportData.data, displaySetUID, imageId);
+  }
+
   public destroy = (): void => {
     this.element = null;
     this.viewportData = null;