Merge pull request #429 from DigitalSlideArchive/early-settings-load

Load settings earlier.
DigitalSlideArchive · Oct 17, 2024 · 938f474 · 938f474
2 parents 18a7051 + 757a95f
commit 938f474
Showing 1 changed file with 30 additions and 26 deletions.
diff --git a/histomicsui/web_client/views/itemList.js b/histomicsui/web_client/views/itemList.js
@@ -63,32 +63,6 @@ wrap(ItemListWidget, 'render', function (render) {
     }
 
     HuiSettings.getSettings().then((settings) => {
-        const brandName = (settings['histomicsui.brand_name'] || 'HistomicsUI');
-        const webrootPath = (settings['histomicsui.webroot_path'] || 'histomics');
-
-        ItemListWidget.registeredApplications.histomicsui = {
-            name: brandName,
-            // icon:
-            check: (modelType, model) => {
-                if (modelType !== 'item' || !model.get('largeImage')) {
-                    return false;
-                }
-                const li = model.get('largeImage');
-                if (!li.fileId || li.expected === true) {
-                    return false;
-                }
-                let priority = 0;
-                try {
-                    if (model.get('meta') && model.get('meta').dicom && model.get('meta').dicom.Modality && model.get('meta').dicom.Modality !== 'SM') {
-                        priority = 1;
-                    }
-                } catch (e) {}
-                return {
-                    url: `${webrootPath}#?image=${model.id}`,
-                    priority: priority
-                };
-            }
-        };
         if (this.accessLevel >= AccessType.WRITE) {
             adjustView.call(this, settings);
         }
@@ -100,3 +74,33 @@ wrap(ItemListWidget, 'render', function (render) {
         this.delegateEvents();
     }
 });
+
+HuiSettings.getSettings().then((settings) => {
+    const brandName = (settings['histomicsui.brand_name'] || 'HistomicsUI');
+    const webrootPath = (settings['histomicsui.webroot_path'] || 'histomics');
+
+    ItemListWidget.registeredApplications.histomicsui = {
+        name: brandName,
+        // icon:
+        check: (modelType, model) => {
+            if (modelType !== 'item' || !model.get('largeImage')) {
+                return false;
+            }
+            const li = model.get('largeImage');
+            if (!li.fileId || li.expected === true) {
+                return false;
+            }
+            let priority = 0;
+            try {
+                if (model.get('meta') && model.get('meta').dicom && model.get('meta').dicom.Modality && model.get('meta').dicom.Modality !== 'SM') {
+                    priority = 1;
+                }
+            } catch (e) {}
+            return {
+                url: `${webrootPath}#?image=${model.id}`,
+                priority: priority
+            };
+        }
+    };
+    return settings;
+});