From 79f3c482c162317503de179de8cd2d6a3a7d6f2e Mon Sep 17 00:00:00 2001
From: Bruno Alves de Faria <brunoalvesdefaria@gmail.com>
Date: Tue, 22 Nov 2016 16:28:42 -0200
Subject: [PATCH] LT-382: Fixing image loading after time points disassociation

---
 LesionTracker/client/components/viewer/viewer.js     | 12 ++++++++----
 .../ohif-hanging-protocols/client/protocolEngine.js  |  4 +---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js
index 4ec6f2bab..0a5ffbd85 100644
--- a/LesionTracker/client/components/viewer/viewer.js
+++ b/LesionTracker/client/components/viewer/viewer.js
@@ -1,6 +1,7 @@
 import { Template } from 'meteor/templating';
 import { Session } from 'meteor/session';
 import { OHIF } from 'meteor/ohif:core';
+import { _ } from 'meteor/underscore';
 
 Session.set('ViewerMainReady', false);
 Session.set('TimepointsReady', false);
@@ -73,15 +74,18 @@ Template.viewer.onCreated(() => {
 
     const patientId = instance.data.studies[0].patientId;
 
+    // LT-382: Preventing HP to keep identifying studies in timepoints that might be removed
+    instance.data.studies.forEach(study => (delete study.timepointType));
+
     // TODO: Consider combining the retrieval calls into one?
     const timepointsPromise = instance.data.timepointApi.retrieveTimepoints(patientId);
     timepointsPromise.then(() => {
         const timepoints = instance.data.timepointApi.all();
 
         //  Set timepointType in studies to be used in hanging protocol engine
-        timepoints.forEach(function(timepoint) {
-            timepoint.studyInstanceUids.forEach(function(studyInstanceUid) {
-                const study = _.find(instance.data.studies, function (element) {
+        timepoints.forEach(timepoint => {
+            timepoint.studyInstanceUids.forEach(studyInstanceUid => {
+                const study = _.find(instance.data.studies, element => {
                     return element.studyInstanceUid === studyInstanceUid;
                 });
                 if (!study) {
@@ -204,4 +208,4 @@ Template.viewer.onDestroyed(() => {
     Session.set('ViewerMainReady', false);
     Session.set('TimepointsReady', false);
     Session.set('MeasurementsReady', false);
-});
\ No newline at end of file
+});
diff --git a/Packages/ohif-hanging-protocols/client/protocolEngine.js b/Packages/ohif-hanging-protocols/client/protocolEngine.js
index 95dfb7ed7..5353e0bb5 100644
--- a/Packages/ohif-hanging-protocols/client/protocolEngine.js
+++ b/Packages/ohif-hanging-protocols/client/protocolEngine.js
@@ -636,9 +636,7 @@ HP.ProtocolEngine = class ProtocolEngine {
             }
 
             if (!currentViewportData.displaySetInstanceUid) {
-                // TODO: REMOVE - Temporary for RSNA - LT-382
-                OHIF.log.warn('No matching display set found?');
-                // throw 'No matching display set found?';
+                throw 'No matching display set found?';
             }
 
             viewportData.push(currentViewportData);