Do not list archived histories with regular histories

Author: davelopez

lib/galaxy/webapps/galaxy/services/histories.py

@@ -155,7 +155,9 @@ def index(
                 raise glx_exceptions.AdminRequiredException(message)
         else:
             filters += [model.History.user == current_user]
-        # and any sent in from the query string
+        # exclude archived histories
+        filters += [model.History.archived == false()]
+        # and apply any other filters
         filters += self.filters.parse_filters(filter_params)
         order_by = self._build_order_by(filter_query_params.order)
 

lib/galaxy_test/api/test_histories.py

@@ -815,3 +815,13 @@ def test_archiving_an_archived_history_conflicts(self):
 
         archive_response = self.dataset_populator.archive_history(history_id)
         self._assert_status_code_is(archive_response, 409)
+
+    def test_archived_histories_are_not_listed_by_default(self):
+        history_id = self.dataset_populator.new_history()
+        archive_response = self.dataset_populator.archive_history(history_id)
+        self._assert_status_code_is(archive_response, 200)
+        assert archive_response.json()["archived"] is True
+
+        histories = self.dataset_populator.get_histories()
+        for history in histories:
+            assert history["id"] != history_id