Fixes to make Viewer load

Packages/ohif-viewerbase/client/components/viewer/cineDialog/cineDialog.js

@@ -274,6 +274,12 @@ Template.cineDialog.helpers({
 
     displaySetDisabled(isNext) {
         Session.get('LayoutManagerUpdated');
+
+        // @TODO: Investigate why this is running while OHIF.viewerbase.layoutManager is undefined
+        if (!OHIF.viewerbase.layoutManager) {
+            return;
+        }
+
         return !OHIF.viewerbase.layoutManager.canMoveDisplaySets(isNext) ? 'disabled' : '';
     },
 

Packages/ohif-viewerbase/client/components/viewer/displaySetNavigation/displaySetNavigation.js

@@ -22,6 +22,11 @@ Template.displaySetNavigation.events({
 Template.displaySetNavigation.helpers({
     disableButton(isNext) {
         Session.get('LayoutManagerUpdated');
+
+        if (!OHIF.viewerbase.layoutManager) {
+            return;
+        }
+
         return !OHIF.viewerbase.layoutManager.canMoveDisplaySets(isNext);
     }
 });

Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js

@@ -478,11 +478,11 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
  */
 const setDisplaySet = (data, displaySetInstanceUid, templateData) => {
     const study = data.study;
-    if (!study || !study.series) {
+    if (!study || !study.displaySets) {
         throw new OHIFError('Study does not exist or has no display sets');
     }
 
-    study.series.every(displaySet => {
+    study.displaySets.every(displaySet => {
         if (displaySet.displaySetInstanceUid === displaySetInstanceUid) {
             data.displaySet = displaySet;
             return false;

Packages/ohif-viewerbase/client/index.js

@@ -131,6 +131,11 @@ Viewerbase.sortingManager = sortingManager;
 import { crosshairsSynchronizers } from './lib/crosshairsSynchronizers';
 Viewerbase.crosshairsSynchronizers = crosshairsSynchronizers;
 
+// createStacks.*
+import { createStacks } from './lib/createStacks';
+Viewerbase.createStacks = createStacks;
+
+
 /**
  * Exported Singletons
  */

Packages/ohif-viewerbase/client/lib/classes/LayoutManager.js

@@ -55,13 +55,11 @@ export class LayoutManager {
             // Keep the displayed display sets
             self.viewportData = oldViewportData;
             currentViewportIndex = oldViewportData.length;
-        } 
-        else if (viewportsAmount <= oldViewportData.length) {
+        } else if (viewportsAmount <= oldViewportData.length) {
             // Reduce the original displayed display sets
             self.viewportData = oldViewportData.slice(0, viewportsAmount);
             return;
-        } 
-        else {
+        } else {
             // Reset all display sets
             self.viewportData = [];
         }
@@ -69,7 +67,7 @@ export class LayoutManager {
         // Get all the display sets for the viewer studies
         let displaySets = [];
         this.studies.forEach(study => {
-            study.series.forEach(displaySet => {
+            study.displaySets.forEach(displaySet => {
                 displaySet.images.length && displaySets.push(displaySet);
             });
         });
@@ -82,8 +80,7 @@ export class LayoutManager {
             const beginIndex = sequenceMap.values().next().value[0].displaySetIndex + currentLength;
             const endIndex = beginIndex + (viewportsAmount - currentLength);
             appendix = displaySets.slice(beginIndex, endIndex);
-        } 
-        else {
+        } else {
             // Get available display sets from the first to the grid size
             appendix = displaySets.slice(0, viewportsAmount);
         }