diff --git a/caseworker/queues/views/cases.py b/caseworker/queues/views/cases.py index 48e5162a0..1a684a90c 100644 --- a/caseworker/queues/views/cases.py +++ b/caseworker/queues/views/cases.py @@ -143,9 +143,11 @@ def get_params(self): if session_sort_by: params["sort_by"] = session_sort_by elif self.queue_pk == ALL_CASES_QUEUE_ID: - params["sort_by"] = "submitted_at" - else: + # newest to oldest params["sort_by"] = "-submitted_at" + else: + # oldest to newest + params["sort_by"] = "submitted_at" self.request.session["case_search_sort_by"] = params["sort_by"] diff --git a/unit_tests/caseworker/queues/views/test_cases.py b/unit_tests/caseworker/queues/views/test_cases.py index 518d657e6..a4d81ab7a 100644 --- a/unit_tests/caseworker/queues/views/test_cases.py +++ b/unit_tests/caseworker/queues/views/test_cases.py @@ -19,7 +19,7 @@ "queue_id": ["00000000-0000-0000-0000-000000000001"], "selected_tab": ["all_cases"], "hidden": ["true"], - "sort_by": ["submitted_at"], + "sort_by": ["-submitted_at"], } @@ -313,7 +313,7 @@ def test_cases_queue_page_assigned_queues(authorized_client, mock_cases_search_t "queue_id": [queue_pk], "selected_tab": ["all_cases"], "hidden": ["false"], - "sort_by": ["-submitted_at"], + "sort_by": ["submitted_at"], } @@ -620,7 +620,7 @@ def test_tabs_with_all_cases_default(authorized_client, mock_cases_search, mock_ "page": ["1"], "queue_id": ["00000000-0000-0000-0000-000000000001"], "selected_tab": [tab], - "sort_by": ["submitted_at"], + "sort_by": ["-submitted_at"], } in head_request_history @@ -655,7 +655,7 @@ def test_tabs_on_all_cases_queue(authorized_client, mock_cases_search, tab_name, "page": ["1"], "queue_id": ["00000000-0000-0000-0000-000000000001"], "selected_tab": [tab_name], - "sort_by": ["submitted_at"], + "sort_by": ["-submitted_at"], } @@ -684,7 +684,7 @@ def test_tabs_on_team_queue( "page": ["1"], "queue_id": [queue_pk], "selected_tab": [tab_name], - "sort_by": ["-submitted_at"], + "sort_by": ["submitted_at"], } head_request_history = [x.qs for x in mock_cases_search_head.request_history] assert { @@ -692,7 +692,7 @@ def test_tabs_on_team_queue( "page": ["1"], "queue_id": [queue_pk], "selected_tab": ["all_cases"], - "sort_by": ["-submitted_at"], + "sort_by": ["submitted_at"], } in head_request_history tabs_with_hidden_param = ("my_cases", "open_queries") @@ -702,7 +702,7 @@ def test_tabs_on_team_queue( "page": ["1"], "queue_id": [queue_pk], "selected_tab": [tab], - "sort_by": ["-submitted_at"], + "sort_by": ["submitted_at"], } in head_request_history @@ -717,7 +717,7 @@ def test_tabs_on_team_queue_with_hidden_param( "page": ["1"], "queue_id": [queue_pk], "selected_tab": ["all_cases"], - "sort_by": ["-submitted_at"], + "sort_by": ["submitted_at"], } head_request_history = [x.qs for x in mock_cases_search_head.request_history] tabs_with_hidden_param = ("all_cases", "my_cases", "open_queries") @@ -727,7 +727,7 @@ def test_tabs_on_team_queue_with_hidden_param( "page": ["1"], "queue_id": [queue_pk], "selected_tab": [tab], - "sort_by": ["-submitted_at"], + "sort_by": ["submitted_at"], } in head_request_history @@ -1156,8 +1156,8 @@ def test_product_search_is_visible_to_specific_users_only( def test_queue_view_sort_params_persist(authorized_client): response = authorized_client.get(reverse("core:index")) assert response.status_code == 200 - assert authorized_client.session["case_search_sort_by"] == "submitted_at" + assert authorized_client.session["case_search_sort_by"] == "-submitted_at" - authorized_client.get(reverse("core:index") + "?sort_by=-submitted_at") + authorized_client.get(reverse("core:index") + "?sort_by=submitted_at") assert response.status_code == 200 - assert authorized_client.session["case_search_sort_by"] == "-submitted_at" + assert authorized_client.session["case_search_sort_by"] == "submitted_at"