Merge pull request #498 from knabar/cache-available-scripts

Cache script names
ome · Oct 17, 2023 · 953a40b · 953a40b
2 parents 82e2d74 + faa0992
commit 953a40b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/omeroweb/webclient/controller/container.py b/omeroweb/webclient/controller/container.py
@@ -311,10 +311,14 @@ def canDownload(self, objDict=None):
                 or self.plate.canDownload()
             )
 
-    def list_scripts(self):
+    def list_scripts(self, request=None):
         """
         Get the file names of all scripts
         """
+
+        if request and "list_scripts" in request.session:
+            return request.session["list_scripts"]
+
         scriptService = self.conn.getScriptService()
         scripts = scriptService.getScripts()
 
@@ -324,16 +328,19 @@ def list_scripts(self):
             name = s.name.val
             scriptlist.append(name)
 
+        if request:
+            request.session["list_scripts"] = scriptlist
+
         return scriptlist
 
-    def listFigureScripts(self, objDict=None):
+    def listFigureScripts(self, objDict=None, request=None):
         """
         This configures all the Figure Scripts, setting their enabled status
         given the currently selected object (self.image etc) or batch objects
         (uses objDict) and the script availability.
         """
 
-        availableScripts = self.list_scripts()
+        availableScripts = self.list_scripts(request=request)
         image = None
         if self.image or self.well:
             image = self.image or self.getWellSampleImage()

diff --git a/omeroweb/webclient/views.py b/omeroweb/webclient/views.py
@@ -1738,7 +1738,7 @@ def load_metadata_details(request, c_type, c_id, conn=None, share_id=None, **kwa
             context["canExportAsJpg"] = manager.canExportAsJpg(request)
             context["annotationCounts"] = manager.getAnnotationCounts()
             context["tableCountsOnParents"] = manager.countTablesOnParents()
-            figScripts = manager.listFigureScripts()
+            figScripts = manager.listFigureScripts(request=request)
     context["manager"] = manager
 
     if c_type in ("tag", "tagset"):
@@ -2280,7 +2280,7 @@ def batch_annotate(request, conn=None, **kwargs):
     conn.SERVICE_OPTS.setOmeroGroup(groupId)
 
     manager = BaseContainer(conn)
-    figScripts = manager.listFigureScripts(objs)
+    figScripts = manager.listFigureScripts(objs, request=request)
     canExportAsJpg = manager.canExportAsJpg(request, objs)
     filesetInfo = None
     iids = []