Check response.png_luts_new for is_dynamic_lut

will-moore · will-moore · commit 3e50fb03d501 · 2024-11-19T16:19:27.000Z
diff --git a/plugin/omero_iviewer/urls.py b/plugin/omero_iviewer/urls.py
@@ -49,6 +49,4 @@
     # Find the index of an ROI within all ROIs for the Image (for pagination)
     re_path(r'^(?P<obj_type>(roi|shape))/(?P<obj_id>[0-9]+)/page_data/$',
             views.roi_page_data, name='omero_iviewer_roi_page_data'),
-    re_path('^is_dynamic_lut/$', views.is_dynamic_lut,
-            name='iviewer_dynamic_lut'),
 ]
diff --git a/src/app/context.js b/src/app/context.js
@@ -302,11 +302,11 @@ export default class Context {
      */
     setUpLuts() {
         $.ajax(
-            {url : this.server + this.getPrefixedURI(IVIEWER) + "/is_dynamic_lut/",
+            {url : this.server + this.getPrefixedURI(WEBGATEWAY) + "/luts/",
             success : (response) => {
                 // Check first whether omero-web can provides LUT dynamically
                 // and set URL accordingly
-                let is_dynamic_lut = response.is_dynamic_lut;
+                let is_dynamic_lut = Boolean(response.png_luts_new);
                 if (is_dynamic_lut) {
                     this.luts_png.url =
                         this.server + this.getPrefixedURI(WEBGATEWAY, false) + "/luts_png/";
@@ -324,33 +324,22 @@ export default class Context {
                 }
                 lutsPng.src = this.luts_png.url;
 
-                // now query the luts list
-                let server = this.server;
-                let uri_prefix =  this.getPrefixedURI(WEBGATEWAY);
-                $.ajax(
-                    {url : server + uri_prefix + "/luts/",
-                    success : (response) => {
-                        if (typeof response !== 'object' || response === null ||
-                            !Misc.isArray(response.luts)) return;
-
-                        if (is_dynamic_lut) {
-                            // If it's dynamic, uses the new list instead
-                            response.png_luts = response.png_luts_new
-                        }
+                if (is_dynamic_lut) {
+                    // If it's dynamic, uses the new list instead
+                    response.png_luts = response.png_luts_new
+                }
 
-                        response.luts.map(
-                            (l) => {
-                                let mapValue =
-                                    Object.assign({
-                                        nice_name :
-                                            l.name.replace(/.lut/g, "").replace(/_/g, " "),
-                                        index : is_dynamic_lut ? l.png_index_new : l.png_index
-                                    }, l);
-                                this.luts.set(mapValue.name, mapValue);
-                            });
-                        for (let [id, conf] of this.image_configs) conf.changed();
-                    }
-                });
+                response.luts.forEach(
+                    (l) => {
+                        let mapValue =
+                            Object.assign({
+                                nice_name :
+                                    l.name.replace(/.lut/g, "").replace(/_/g, " "),
+                                index : is_dynamic_lut ? l.png_index_new : l.png_index
+                            }, l);
+                        this.luts.set(mapValue.name, mapValue);
+                    });
+                for (let [id, conf] of this.image_configs) conf.changed();
             }
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,4 @@`
`49`	`49`	`# Find the index of an ROI within all ROIs for the Image (for pagination)`
`50`	`50`	`re_path(r'^(?P<obj_type>(roi\|shape))/(?P<obj_id>[0-9]+)/page_data/$',`
`51`	`51`	`views.roi_page_data, name='omero_iviewer_roi_page_data'),`
`52`		`- re_path('^is_dynamic_lut/$', views.is_dynamic_lut,`
`53`		`- name='iviewer_dynamic_lut'),`
`54`	`52`	`]`