Ensure /all-crawls?sortBy=qaState always sorts crawls above uploads (#…

…1691)

Follow-up to #1686

backend/btrixcloud/basecrawls.py

@@ -627,9 +627,11 @@ async def list_all_base_crawls(
 
             sort_query = {sort_by: sort_direction}
 
-            # Add secondary sort for qaState - sorted by current, then last
+            # Secondary sort for qaState - sorted by current, then last
+            # Tertiary sort for qaState - type, always ascending so crawls are first
             if sort_by == "qaState":
                 sort_query["lastQAState"] = sort_direction
+                sort_query["type"] = 1
 
             aggregate.extend([{"$sort": sort_query}])
 

backend/test/test_uploads.py

@@ -419,6 +419,20 @@ def test_list_all_crawls(
         assert item["finished"]
         assert item["state"]
 
+    # Test that all-crawls qaState sort always puts crawls before uploads
+    r = requests.get(
+        f"{API_PREFIX}/orgs/{default_org_id}/all-crawls?sortBy=qaState",
+        headers=admin_auth_headers,
+    )
+    assert r.status_code == 200
+    data = r.json()
+
+    last_type = None
+    for item in data["items"]:
+        if last_type == "upload":
+            assert item["type"] != "crawl"
+        last_type = item["type"]
+
 
 def test_get_all_crawls_by_name(
     admin_auth_headers, default_org_id, replaced_upload_id, upload_id_2