From 979242c8194047fb0ce3475e0f9e947828fcac4e Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.sweed@gmail.com>
Date: Mon, 18 May 2020 20:05:26 +0200
Subject: [PATCH] wip

---
 .../DisplaySetService/DisplaySetService.js     |  1 -
 .../viewer/src/components/ViewportGrid.jsx     | 18 ++++++++++++------
 platform/viewer/src/routes/Mode/Mode.jsx       |  1 -
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/platform/core/src/services/DisplaySetService/DisplaySetService.js b/platform/core/src/services/DisplaySetService/DisplaySetService.js
index 4c3dd9baa..b4fad7b98 100644
--- a/platform/core/src/services/DisplaySetService/DisplaySetService.js
+++ b/platform/core/src/services/DisplaySetService/DisplaySetService.js
@@ -27,7 +27,6 @@ export default class DisplaySetService {
    * @return {Object} Observable object with actions
    */
   subscribe(eventName, callback) {
-    debugger;
     if (this._isValidEvent(eventName)) {
       const listenerId = guid();
       const subscription = { id: listenerId, callback };
diff --git a/platform/viewer/src/components/ViewportGrid.jsx b/platform/viewer/src/components/ViewportGrid.jsx
index 03225857d..cd1fe5a0f 100644
--- a/platform/viewer/src/components/ViewportGrid.jsx
+++ b/platform/viewer/src/components/ViewportGrid.jsx
@@ -8,8 +8,6 @@ import { ViewportGrid, ViewportPane } from '@ohif/ui';
 // import EmptyViewport from './EmptyViewport.js';
 
 function ViewerViewportGrid(props) {
-  debugger;
-
   const {
     activeViewportIndex,
     servicesManager,
@@ -22,14 +20,15 @@ function ViewerViewportGrid(props) {
 
   // TODO -> Make a HangingProtocolService
   const HangingProtocolService = displaySets => {
+    const displaySetInstanceUid = displaySets[Object.keys(displaySets)[0]][0].displaySetInstanceUid;
+
     return {
       numRows: 1,
       numCols: 1,
       activeViewportIndex: 0,
       viewports: [
         {
-          displaySetInstanceUid: Object.keys(displaySets)[0][0]
-            .displaySetInstanceUid,
+          displaySetInstanceUid,
         },
       ],
     };
@@ -40,7 +39,6 @@ function ViewerViewportGrid(props) {
   });
 
   useEffect(() => {
-    debugger;
     const { unsubscribe } = DisplaySetService.subscribe(
       DisplaySetService.EVENTS.DISPLAY_SET_ADDED,
       handleDisplaySetSubscription
@@ -60,7 +58,14 @@ function ViewerViewportGrid(props) {
 
   const getViewportPanes = () =>
     viewportGrid.viewports.map((viewport, viewportIndex) => {
-      const displaySet = viewportData[viewportIndex];
+      const displaySetInstanceUid = viewport.displaySetInstanceUid;
+      if (!displaySetInstanceUid) {
+        return null;
+      }
+
+      // TODO: Is this ever being hit??
+      debugger;
+      const displaySet = DisplaySetService.getDisplaySetByUID(displaySetInstanceUid);
 
       if (!displaySet) {
         return (
@@ -115,6 +120,7 @@ function ViewerViewportGrid(props) {
   const ViewportPanes = React.useMemo(getViewportPanes, [
     viewportComponents,
     activeViewportIndex,
+    viewportGrid
   ]);
 
   return (
diff --git a/platform/viewer/src/routes/Mode/Mode.jsx b/platform/viewer/src/routes/Mode/Mode.jsx
index 610aa5d1d..b9fe165ee 100644
--- a/platform/viewer/src/routes/Mode/Mode.jsx
+++ b/platform/viewer/src/routes/Mode/Mode.jsx
@@ -54,7 +54,6 @@ export default function ModeRoute({
     Compose({ components: contextModuleProviders, children });
 
   function ViewportGridWithDataSource(props) {
-    debugger;
     return ViewportGrid({ ...props, dataSource });
   }