From 1c37fa90f339474e46c1b3dcebc61dfe9576cb59 Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Thu, 12 Oct 2023 13:30:28 -0500
Subject: [PATCH] fix seleniums and minor bug fixes for `FilterMenu`

---
 client/src/components/Common/FilterMenu.vue             | 2 +-
 client/src/components/Common/FilterMenuMultiTags.vue    | 2 +-
 client/src/components/Page/PageList.vue                 | 4 ++--
 client/src/utils/navigation/navigation.yml              | 1 +
 lib/galaxy/selenium/navigates_galaxy.py                 | 9 ---------
 lib/galaxy_test/selenium/test_history_related_filter.py | 2 +-
 lib/galaxy_test/selenium/test_workflow_management.py    | 8 ++++++--
 7 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/client/src/components/Common/FilterMenu.vue b/client/src/components/Common/FilterMenu.vue
index 72e59bba3cd3..b418d1ca2355 100644
--- a/client/src/components/Common/FilterMenu.vue
+++ b/client/src/components/Common/FilterMenu.vue
@@ -157,7 +157,7 @@ watch(
             @onToggle="onToggle" />
         <b-button
             v-if="props.menuType == 'separate' && props.showAdvanced"
-            v-b-tooltip.hover.noninteractive
+            v-b-tooltip.hover.bottom.noninteractive
             class="w-100"
             aria-haspopup="true"
             size="sm"
diff --git a/client/src/components/Common/FilterMenuMultiTags.vue b/client/src/components/Common/FilterMenuMultiTags.vue
index c8b570559375..8434837470ef 100644
--- a/client/src/components/Common/FilterMenuMultiTags.vue
+++ b/client/src/components/Common/FilterMenuMultiTags.vue
@@ -3,7 +3,7 @@ import { computed, type PropType, ref, watch } from "vue";
 
 import { ValidFilter } from "@/utils/filtering";
 
-import StatelessTags from "../Tags/StatelessTags.vue";
+import StatelessTags from "@/components/TagsMultiselect/StatelessTags.vue";
 
 const props = defineProps({
     name: { type: String, required: true },
diff --git a/client/src/components/Page/PageList.vue b/client/src/components/Page/PageList.vue
index 8f8c66380b8e..e7e0f3ac311c 100644
--- a/client/src/components/Page/PageList.vue
+++ b/client/src/components/Page/PageList.vue
@@ -26,7 +26,7 @@
         </b-row>
         <b-table v-model="pageItemsModel" v-bind="{ ...defaultTableAttrs, ...indexTableAttrs }">
             <template v-slot:empty>
-                <loading-span v-if="loading" message="Loading pages" />
+                <LoadingSpan v-if="loading" message="Loading pages" />
                 <b-alert v-else id="no-pages" variant="info" show>
                     <div v-if="filterText !== ''">
                         No matching entries found for: <span class="font-weight-bold">{{ filterText }}</span
@@ -249,7 +249,7 @@ export default {
     computed: {
         dataProviderParameters() {
             const extraParams = {
-                search: this.effectiveFilter,
+                search: this.searchQuery,
                 show_published: false,
                 show_shared: true,
             };
diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
index e1d0afd669a1..cb02d9174e3c 100644
--- a/client/src/utils/navigation/navigation.yml
+++ b/client/src/utils/navigation/navigation.yml
@@ -583,6 +583,7 @@ workflows:
     advanced_search_toggle: '.workflows-list [data-description="toggle advanced search"]'
     advanced_search_name_input: '#workflows-advanced-filter-name'
     advanced_search_tag_input: '#workflows-advanced-filter-tag .stateless-tags'
+    advanced_search_submit: '#workflows-advanced-filter-submit'
     workflow_table: "#workflow-table"
     workflow_rows: "#workflow-table > tbody > tr:not(.b-table-empty-row, [style*='display: none'])"
     external_link: '.workflow-external-link'
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index cb8b939d004a..af04ac19281e 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -17,7 +17,6 @@
     Any,
     cast,
     Dict,
-    List,
     NamedTuple,
     Optional,
     Union,
@@ -1396,14 +1395,6 @@ def workflow_index_search_for(self, search_term=None):
             escape_to_clear=True,
         )
 
-    def workflow_index_add_advanced_tag_filter(self, tags: List[str]):
-        for tag in tags:
-            tag_display = self.components.workflows.advanced_search_tag_input
-            if tag_display.is_absent:
-                self.components.workflows.advanced_search_toggle.wait_for_and_click()
-            tag_display.wait_for_and_click()
-            self.tagging_add([tag])
-
     def workflow_index_click_import(self):
         return self.components.workflows.import_button.wait_for_and_click()
 
diff --git a/lib/galaxy_test/selenium/test_history_related_filter.py b/lib/galaxy_test/selenium/test_history_related_filter.py
index d61482cc57e2..5ea2e4311c3d 100644
--- a/lib/galaxy_test/selenium/test_history_related_filter.py
+++ b/lib/galaxy_test/selenium/test_history_related_filter.py
@@ -36,6 +36,6 @@ def test_history_related_filter(self):
         ).wait_for_and_click()
         initial_value = filter_element.get_attribute("value")
         assert initial_value == f"related:{CURRENT_HID}", initial_value
-        self.history_element("clear filters").wait_for_and_click()
+        self.history_element(attribute_value="reset query", scope=".content-operations-filters").wait_for_and_click()
         filter_element.send_keys(f"related:{UNRELATED_HID}")
         current_hda.wait_for_absent()
diff --git a/lib/galaxy_test/selenium/test_workflow_management.py b/lib/galaxy_test/selenium/test_workflow_management.py
index fc9e811036df..e3f2304f6a46 100644
--- a/lib/galaxy_test/selenium/test_workflow_management.py
+++ b/lib/galaxy_test/selenium/test_workflow_management.py
@@ -192,7 +192,9 @@ def test_index_advanced_search(self):
         self.components.workflows.advanced_search_toggle.wait_for_and_click()
         # search by tag and name
         self.components.workflows.advanced_search_name_input.wait_for_and_send_keys("searchforthis")
-        self.workflow_index_add_advanced_tag_filter(["mytag"])
+        self.components.workflows.advanced_search_tag_input.wait_for_and_click()
+        self.tagging_add(["mytag"])
+        self.components.workflows.advanced_search_submit.wait_for_and_click()
         self._assert_showing_n_workflows(1)
         curr_value = self.workflow_index_get_current_filter()
         assert curr_value == "name:searchforthis tag:mytag", curr_value
@@ -204,7 +206,9 @@ def test_index_advanced_search(self):
 
         self.components.workflows.advanced_search_toggle.wait_for_and_click()
         # search by 2 tags, one of which is not present
-        self.workflow_index_add_advanced_tag_filter(["mytag", "DNEtag"])
+        self.components.workflows.advanced_search_tag_input.wait_for_and_click()
+        self.tagging_add(["mytag", "DNEtag"])
+        self.components.workflows.advanced_search_submit.wait_for_and_click()
         curr_value = self.workflow_index_get_current_filter()
         assert curr_value == "tag:mytag tag:DNEtag", curr_value
         self._assert_showing_n_workflows(0)