From 14974b6973aff7b8b4a8f485ecf9149523d3a14b Mon Sep 17 00:00:00 2001
From: Sofien-Sellami <73444179+Sofien-Sellami@users.noreply.github.com>
Date: Thu, 29 Jun 2023 20:48:52 +0100
Subject: [PATCH] fix(tmtv): Fusion_Viewport to allow displaySets to be changed
 (#3502)

Allows drag and drop of new sets of viewports to change them one at a time.
Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>
---
 modes/tmtv/src/index.js                           |  3 ++-
 .../HangingProtocolService.ts                     | 15 +++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/modes/tmtv/src/index.js b/modes/tmtv/src/index.js
index aae993bbd..abd4804e1 100644
--- a/modes/tmtv/src/index.js
+++ b/modes/tmtv/src/index.js
@@ -220,7 +220,8 @@ function modeFactory({ modeConfiguration }) {
           return {
             id: ohif.layout,
             props: {
-              // leftPanels: [ohif.thumbnailList],
+              leftPanels: [ohif.thumbnailList],
+              leftPanelDefaultClosed: true,
               rightPanels: [tmtv.ROIThresholdPanel, tmtv.petSUV],
               viewports: [
                 {
diff --git a/platform/core/src/services/HangingProtocolService/HangingProtocolService.ts b/platform/core/src/services/HangingProtocolService/HangingProtocolService.ts
index 4f469d46d..37dacef21 100644
--- a/platform/core/src/services/HangingProtocolService/HangingProtocolService.ts
+++ b/platform/core/src/services/HangingProtocolService/HangingProtocolService.ts
@@ -695,15 +695,18 @@ export default class HangingProtocolService extends PubSubService {
   ) {
     viewport.displaySets.forEach(displaySet => {
       const { id } = displaySet;
-      const {
-        displaySetInstanceUID: oldDisplaySetInstanceUID,
-      } = displaySetMatchDetails.get(id);
+      const displaySetMatchDetail = displaySetMatchDetails.get(id);
 
-      displaySetInstanceUIDs.push(
+      const { displaySetInstanceUID: oldDisplaySetInstanceUID } = displaySetMatchDetail;
+
+      const displaySetInstanceUID =
         displaySet.id === displaySetSelectorId
           ? newDisplaySetInstanceUID
-          : oldDisplaySetInstanceUID
-      );
+          : oldDisplaySetInstanceUID;
+
+      displaySetMatchDetail.displaySetInstanceUID = displaySetInstanceUID;
+
+      displaySetInstanceUIDs.push(displaySetInstanceUID);
       displaySetOptions.push(displaySet);
     });
   }