From c6f19988deb402ed7d551cb824917ddce73149de Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Wed, 6 Sep 2023 17:41:58 -0500
Subject: [PATCH] add selenium and unit test for published histories username
 filter

---
 .../History/HistoryPublishedList.vue          |  7 ++-
 lib/galaxy/managers/histories.py              |  2 +-
 .../selenium/test_histories_published.py      | 23 +++++++++
 test/unit/app/managers/test_HistoryManager.py | 47 +++++++++++++++++++
 4 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/client/src/components/History/HistoryPublishedList.vue b/client/src/components/History/HistoryPublishedList.vue
index f624c17750d7..02b165a05a62 100644
--- a/client/src/components/History/HistoryPublishedList.vue
+++ b/client/src/components/History/HistoryPublishedList.vue
@@ -306,7 +306,12 @@ watch([filterText, sortBy, sortDesc], async () => {
                     </router-link>
                 </template>
                 <template v-slot:cell(username)="row">
-                    <a href="#" @click="setFilter('user', row.item.username)">{{ row.item.username }}</a>
+                    <a
+                        href="#"
+                        class="published-histories-username-link"
+                        @click="setFilter('user', row.item.username)"
+                        >{{ row.item.username }}</a
+                    >
                 </template>
                 <template v-slot:cell(tags)="row">
                     <StatelessTags
diff --git a/lib/galaxy/managers/histories.py b/lib/galaxy/managers/histories.py
index ca23379c3746..7d0e93cf6577 100644
--- a/lib/galaxy/managers/histories.py
+++ b/lib/galaxy/managers/histories.py
@@ -885,7 +885,7 @@ def _add_parsers(self):
             }
         )
         self.fn_filter_parsers.update(
-            {"username": {"op": {"eq": self.username_eq, "contains": self.username_contains,},},}
+            {"username": {"op": {"eq": self.username_eq, "contains": self.username_contains, }, }, }
         )
 
     def username_eq(self, item, val: str) -> bool:
diff --git a/lib/galaxy_test/selenium/test_histories_published.py b/lib/galaxy_test/selenium/test_histories_published.py
index c3d0ba4868f0..aa609a7880e8 100644
--- a/lib/galaxy_test/selenium/test_histories_published.py
+++ b/lib/galaxy_test/selenium/test_histories_published.py
@@ -54,6 +54,29 @@ def test_published_histories_tag_click(self):
 
         self.assert_histories_present([self.history3_name, self.history1_name])
 
+    @selenium_test
+    def test_published_histories_username_click(self):
+        self._login()
+        self.navigate_to_published_histories()
+        self.sleep_for(self.wait_types.UX_RENDER)
+        present_histories = self.get_present_histories()
+        clicked = False
+        for row in present_histories:
+            his = row.find_elements(By.TAG_NAME, "td")[0]
+            if self.history2_name in his.text:
+                row.find_elements(By.TAG_NAME, "td")[2].find_elements(
+                    By.CSS_SELECTOR, ".published-histories-username-link"
+                )[0].click()
+                clicked = True
+                break
+
+        assert clicked
+        text = self.components.published_histories.search_input.wait_for_value()
+        if "test2" not in text:
+            raise AssertionError("Failed to update search filter with username on username click")
+
+        self.assert_histories_present([self.history2_name])
+
     @selenium_test
     def test_published_histories_search_standard(self):
         self._login()
diff --git a/test/unit/app/managers/test_HistoryManager.py b/test/unit/app/managers/test_HistoryManager.py
index f24ff8ffc3e6..6809f564af82 100644
--- a/test/unit/app/managers/test_HistoryManager.py
+++ b/test/unit/app/managers/test_HistoryManager.py
@@ -795,10 +795,57 @@ def test_orm_filter_parsing(self):
 
     def test_fn_filter_parsing(self):
         user2 = self.user_manager.create(**user2_data)
+        user3 = self.user_manager.create(**user3_data)
         history1 = self.history_manager.create(name="history1", user=user2)
         history2 = self.history_manager.create(name="history2", user=user2)
         history3 = self.history_manager.create(name="history3", user=user2)
+        history4 = self.history_manager.create(name="history4", user=user3)
+
+        # test username eq filter
+        filters_2 = self.filter_parser.parse_filters(
+            [
+                ("username", "eq", "user2"),
+            ]
+        )
+        filters_3 = self.filter_parser.parse_filters(
+            [
+                ("username", "eq", "user3"),
+            ]
+        )
+        username_filter_2 = filters_2[0].filter
+        username_filter_3 = filters_3[0].filter
+
+        assert username_filter_2(history1)
+        assert username_filter_2(history2)
+        assert username_filter_2(history3)
+        assert not username_filter_2(history4)
+        assert not username_filter_3(history1)
+        assert not username_filter_3(history2)
+        assert not username_filter_3(history3)
+        assert username_filter_3(history4)
+
+        assert self.history_manager.list(filters=filters_2) == [history1, history2, history3]
+        assert self.history_manager.list(filters=filters_3) == [history4]
+
+        # test username contains filter
+        filters = self.filter_parser.parse_filters(
+            [
+                ("username", "contains", "user"),
+            ]
+        )
+
+        assert self.history_manager.list(filters=filters) == [history1, history2, history3, history4]
+
+        # test username eq filter (inequality)
+        filters = self.filter_parser.parse_filters(
+            [
+                ("username", "eq", "user"),
+            ]
+        )
+
+        assert self.history_manager.list(filters=filters) == []
 
+        # test annotation filter
         filters = self.filter_parser.parse_filters(
             [
                 ("annotation", "has", "no play"),