Allowing lazy-loading on viewer

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

@@ -463,11 +463,27 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
  */
 const setDisplaySet = (data, displaySetInstanceUid, templateData) => {
     const study = data.study;
-    if (!study || !study.displaySets) {
-        throw new OHIFError('Study does not exist or has no display sets');
+
+    if (!study) {
+        throw new OHIFError('Study does not exist');
     }
 
-    study.displaySets.every(displaySet => {
+    let displaySets = study.getDisplaySets();
+    if (!displaySets.length) {
+        displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(study);
+        study.displaySets = displaySets;
+        study.setDisplaySets(displaySets);
+
+        study.forEachDisplaySet(displaySet => {
+            OHIF.viewerbase.stackManager.makeAndAddStack(study, displaySet);
+        });
+    }
+
+    if (!displaySets) {
+        throw new OHIFError('Study has no display sets');
+    }
+
+    displaySets.every(displaySet => {
         if (displaySet.displaySetInstanceUid === displaySetInstanceUid) {
             data.displaySet = displaySet;
             return false;
@@ -478,7 +494,7 @@ const setDisplaySet = (data, displaySetInstanceUid, templateData) => {
 
     // If we didn't find anything, stop here
     if (!data.displaySet) {
-        data.displaySet = study.displaySets[0];
+        data.displaySet = displaySets[0];
         // throw new OHIFError('Display set not found in specified study!');
     }
 

Packages/ohif-viewerbase/client/components/viewer/seriesQuickSwitch/seriesQuickSwitch.html

@@ -9,9 +9,7 @@
                     {{/each}}
                     {{#scrollArea class='series-browser' scrollStep=201}}
                         <div class="clearfix thumbnails-wrapper">
-                            {{#each thumbnail in (studyThumbnails instance.currentStudy.get)}}
-                                {{>thumbnailEntry (clone this thumbnail=thumbnail)}}
-                            {{/each}}
+                            {{>studyBrowserSeries (clone this studyMetadata=instance.currentStudy)}}
                         </div>
                     {{/scrollArea}}
                 </div>

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

@@ -32,7 +32,9 @@ Template.seriesQuickSwitch.onCreated(() => {
             instance.study = OHIF.viewer.Studies.findBy({
                 studyInstanceUid: viewportData.studyInstanceUid
             });
-        } else {
+        }
+
+        if (!instance.study) {
             instance.study = OHIF.viewer.Studies.getElementByIndex(0);
         }
 
@@ -73,9 +75,20 @@ Template.seriesQuickSwitch.helpers({
 
         const seriesItems = [];
 
-        const items = study.displaySets.length;
+        let displaySets = study.getDisplaySets();
+        if (!displaySets.length) {
+            displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(study);
+            study.displaySets = displaySets;
+            study.setDisplaySets(displaySets);
+
+            study.forEachDisplaySet(displaySet => {
+                OHIF.viewerbase.stackManager.makeAndAddStack(study, displaySet);
+            });
+        }
+
+        const items = displaySets.length;
         for (let i = 0; i < items; i++) {
-            const displaySet = study.displaySets[i];
+            const displaySet = displaySets[i];
             const item = { class: '' };
             seriesItems.push(item);
             if (i === 8 && items !== 9) {
@@ -105,7 +118,10 @@ Template.seriesQuickSwitch.events({
         const $seriesBrowser = $switch.find('.series-browser');
         $seriesBrowser.width(browserWidth - (browserWidth % 237));
 
-        instance.$('.series-quick-switch').addClass('series-triggered');
+        const $quickSwitch = instance.$('.series-quick-switch');
+        if ($quickSwitch.is(':hover')) {
+            $quickSwitch.addClass('series-triggered');
+        }
     },
 
     'mouseleave .series-browser'(event, instance) {