From 34b02964aa3970ca3e1ffb6d86c4a2fa67834437 Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Thu, 26 Oct 2023 12:50:31 -0500
Subject: [PATCH] change `api/tool_panels` from dict of views to dict
 containing `default_panel_view` and `views` dict

use this api instead of waiting for `isConfigLoaded` in `ToolPanel`
---
 client/src/components/Panels/ToolPanel.vue | 49 ++++++++++++----------
 lib/galaxy/webapps/galaxy/api/tools.py     |  7 +++-
 test/integration/test_edam_toolbox.py      | 11 +++--
 3 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/client/src/components/Panels/ToolPanel.vue b/client/src/components/Panels/ToolPanel.vue
index ed166d8fc29b..a4e1a3e9bd18 100644
--- a/client/src/components/Panels/ToolPanel.vue
+++ b/client/src/components/Panels/ToolPanel.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
+import axios from "axios";
 import { storeToRefs } from "pinia";
-import { ref, watch } from "vue";
+import { onMounted, ref, watch } from "vue";
 
-import { useConfig } from "@/composables/config";
+import { getAppRoot } from "@/onload";
 import { useToolStore } from "@/stores/toolStore";
 import localize from "@/utils/localization";
 
@@ -26,7 +27,8 @@ const emit = defineEmits<{
     (e: "onInsertWorkflowSteps", workflowId: string, workflowStepCount: number | undefined): void;
 }>();
 
-const { isConfigLoaded, config } = useConfig();
+const arePanelsFetched = ref(false);
+const defaultPanelView = ref("");
 const toolStore = useToolStore();
 const { currentPanelView, isPanelPopulated } = storeToRefs(toolStore);
 
@@ -34,6 +36,23 @@ const query = ref("");
 const panelViews = ref(null);
 const showAdvanced = ref(false);
 
+onMounted(async () => {
+    await axios
+        .get(`${getAppRoot()}api/tool_panels`)
+        .then(async ({ data }) => {
+            const { default_panel_view, views } = data;
+            defaultPanelView.value = default_panel_view;
+            panelViews.value = views;
+            await initializeTools();
+        })
+        .catch((error) => {
+            console.error(error);
+        })
+        .finally(() => {
+            arePanelsFetched.value = true;
+        });
+});
+
 watch(
     () => currentPanelView.value,
     () => {
@@ -41,34 +60,22 @@ watch(
     }
 );
 
-// as soon as config is loaded, load tools
-watch(
-    () => isConfigLoaded.value,
-    async (newVal) => {
-        if (newVal) {
-            await loadTools();
-        }
-    },
-    { immediate: true }
-);
-
 // if currentPanelView ever becomes null || "", load tools
 watch(
     () => currentPanelView.value,
     async (newVal) => {
-        if (!newVal && isConfigLoaded.value) {
-            await loadTools();
+        if (!newVal && arePanelsFetched.value) {
+            await initializeTools();
         }
     }
 );
 
-async function loadTools() {
-    panelViews.value = panelViews.value === null ? config.value.panel_views : panelViews.value;
+async function initializeTools() {
     try {
         await toolStore.fetchTools();
-        await toolStore.initCurrentPanelView(config.value.default_panel_view);
+        await toolStore.initCurrentPanelView(defaultPanelView.value);
     } catch (error: any) {
-        console.error("ToolPanel - Load tools error:", error);
+        console.error("ToolPanel - Intialize error:", error);
     }
 }
 
@@ -94,7 +101,7 @@ function onInsertWorkflowSteps(workflowId: string, workflowStepCount: number | u
 </script>
 
 <template>
-    <div v-if="isConfigLoaded" class="unified-panel" aria-labelledby="toolbox-heading">
+    <div v-if="arePanelsFetched" class="unified-panel" aria-labelledby="toolbox-heading">
         <div unselectable="on">
             <div class="unified-panel-header-inner">
                 <nav class="d-flex justify-content-between mx-3 my-2">
diff --git a/lib/galaxy/webapps/galaxy/api/tools.py b/lib/galaxy/webapps/galaxy/api/tools.py
index 06763d1fa31f..7e9d0b133b8c 100644
--- a/lib/galaxy/webapps/galaxy/api/tools.py
+++ b/lib/galaxy/webapps/galaxy/api/tools.py
@@ -181,10 +181,13 @@ def index(self, trans: GalaxyWebTransaction, **kwds):
     def panel_views(self, trans: GalaxyWebTransaction, **kwds):
         """
         GET /api/tool_panels
-        returns a dictionary of available tool panel views
+        returns a dictionary of available tool panel views and default view
         """
 
-        return self.app.toolbox.panel_view_dicts()
+        rval = {}
+        rval["default_panel_view"] = self.app.toolbox._default_panel_view
+        rval["views"] = self.app.toolbox.panel_view_dicts()
+        return rval
 
     @expose_api_anonymous_and_sessionless
     def panel_view(self, trans: GalaxyWebTransaction, view, **kwds):
diff --git a/test/integration/test_edam_toolbox.py b/test/integration/test_edam_toolbox.py
index 33da7f23f176..8a52e1762e85 100644
--- a/test/integration/test_edam_toolbox.py
+++ b/test/integration/test_edam_toolbox.py
@@ -23,7 +23,7 @@ def test_edam_toolbox(self):
 
         tool_panels = self.galaxy_interactor.get("tool_panels")
         tool_panels.raise_for_status()
-        panel_views = tool_panels.json()
+        panel_views = tool_panels.json()["views"]
         assert len(panel_views) > 1
         assert isinstance(panel_views, dict)
         edam_panel_view = panel_views["ontology:edam_merged"]
@@ -54,7 +54,10 @@ def test_edam_toolbox(self):
         tool_panels = self.galaxy_interactor.get("tool_panels")
         tool_panels.raise_for_status()
         panel_views = tool_panels.json()
-        assert len(panel_views) > 1
-        assert isinstance(panel_views, dict)
-        edam_panel_view = panel_views["ontology:edam_topics"]
+        default = panel_views["default_panel_view"]
+        assert default == "ontology:edam_topics"
+        views = panel_views["views"]
+        assert len(views) > 1
+        assert isinstance(views, dict)
+        edam_panel_view = views["ontology:edam_topics"]
         assert edam_panel_view["view_type"] == "ontology"