Merge pull request #18191 from davelopez/24.1_fix_file_source_query_w…

…ith_empty_str

[24.1] Fix file source search query with empty string value

lib/galaxy/files/sources/__init__.py

@@ -393,6 +393,7 @@ def _parse_common_config_opts(self, kwd: FilesSourceProperties):
         kwd.pop("uri_root", None)
         kwd.pop("type", None)
         kwd.pop("browsable", None)
+        kwd.pop("supports", None)
         return kwd
 
     def to_dict(self, for_serialization=False, user_context: "OptionalUserContext" = None) -> FilesSourceProperties:

lib/galaxy/files/sources/_pyfilesystem2.py

@@ -111,7 +111,7 @@ def _to_page(self, limit: Optional[int] = None, offset: Optional[int] = None) ->
         return (start, end)
 
     def _query_to_filter(self, query: Optional[str]) -> Optional[List[str]]:
-        if query is None:
+        if not query:
             return None
         return [f"*{query}*"]
 

test/unit/files/test_temp.py

@@ -131,6 +131,18 @@ def test_search(temp_file_source: TempFilesSource):
     assert result[0]["name"] == "e"
 
 
+def test_query_with_empty_string(temp_file_source: TempFilesSource):
+    recursive = False
+    root_lvl_entries, count = temp_file_source.list("/", recursive=recursive)
+    assert count == 4
+    assert len(root_lvl_entries) == 4
+
+    result, count = temp_file_source.list("/", recursive=recursive, query="")
+    assert count == 4
+    assert len(result) == 4
+    assert result == root_lvl_entries
+
+
 def test_pagination_not_supported_raises(temp_file_source: TempFilesSource):
     TempFilesSource.supports_pagination = False
     recursive = False