fix primary viewer icon wrt plugin availability

orthanc-server · Sep 20, 2024 · 4439e89 · 4439e89
1 parent 38b3450
commit 4439e89
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/WebApplication/src/components/StudyItem.vue b/WebApplication/src/components/StudyItem.vue
@@ -138,7 +138,7 @@ export default {
             }
         },
         hasPrimaryViewerIcon() {
-            return this.studiesSourceType == SourceType.LOCAL_ORTHANC;
+            return this.studiesSourceType == SourceType.LOCAL_ORTHANC && this.primaryViewerUrl;
         },
         primaryViewerUrl() {
             return resourceHelpers.getPrimaryViewerUrl("study", this.study.ID, this.study.MainDicomTags.StudyInstanceUID);

diff --git a/WebApplication/src/helpers/resource-helpers.js b/WebApplication/src/helpers/resource-helpers.js
@@ -46,7 +46,14 @@ export default {
 
     getPrimaryViewerUrl(level, orthancId, dicomId) {
         if (store.state.configuration.uiOptions.ViewersOrdering.length > 0) {
-            return this.getViewerUrl(level, orthancId, dicomId, store.state.configuration.uiOptions.ViewersOrdering[0]);
+            for (let viewer of store.state.configuration.uiOptions.ViewersOrdering) {
+                if ((["osimis-web-viewer", "stone-webviewer", "volview", "wsi"].indexOf(viewer) != -1 && viewer in store.state.configuration.installedPlugins) ||
+                    (viewer.startsWith("ohif") && viewer in store.state.configuration.installedPlugins) ||
+                    (viewer == "meddream" && store.state.configuration.uiOptions.EnableOpenInMedDreamViewer))
+                {
+                    return this.getViewerUrl(level, orthancId, dicomId, viewer);
+                }
+            }
         }
         return null;
     },