search all tags for unquoted (non-name tag) query

ahmedhamidawan · Oct 17, 2023 · a236e0b · a236e0b
1 parent fab8b6c
commit a236e0b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/client/src/utils/filtering.ts b/client/src/utils/filtering.ts
@@ -553,7 +553,7 @@ export default class Filtering<T> {
         ) {
             const { converter } = this.validFilters[filterName]?.handler as HandlerReturn<T>;
             if (converter) {
-                if (converter == toBool && filterValue == "any") {
+                if ((converter == toBool && filterValue == "any") || /^(['"]).*\1$/.test(filterValue as string)) {
                     return filterValue;
                 } else if (!backendFormatted && ([expandNameTag, toDate] as Converter<T>[]).includes(converter)) {
                     return toLower(filterValue) as T;

diff --git a/lib/galaxy/model/index_filter_util.py b/lib/galaxy/model/index_filter_util.py
@@ -52,7 +52,13 @@ def tag_filter(assocation_model_class, term_text, quoted: bool = False):
             )
     else:
         if not quoted:
-            return assocation_model_class.user_tname.ilike(f"%{term_text}%")
+            return or_(
+                assocation_model_class.user_tname.ilike(f"%{term_text}%"),
+                and_(
+                    assocation_model_class.user_tname.ilike("name"),
+                    assocation_model_class.user_value.ilike(f"%{term_text}%"),
+                ),
+            )
         else:
             return assocation_model_class.user_tname == term_text
 

diff --git a/lib/galaxy_test/selenium/test_workflow_management.py b/lib/galaxy_test/selenium/test_workflow_management.py
@@ -207,10 +207,10 @@ 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.components.workflows.advanced_search_tag_input.wait_for_and_click()
-        self.tagging_add(["mytag", "DNEtag"])
+        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
+        assert curr_value == "tag:'mytag' tag:'DNEtag'", curr_value
         self._assert_showing_n_workflows(0)
 
     @selenium_test