fix: fix the sort order params (#1659)

Author: chrimesdev

application/CohortManager/src/Web/app/api/GetValidationExceptions/route.ts

@@ -4,13 +4,15 @@ import mockDataStore from "@/app/data/mockDataStore";
 function sortExceptions<
   T extends { DateCreated: string; ServiceNowCreatedDate?: string }
 >(items: T[], sortBy: string | null, dateField: keyof T = "DateCreated"): T[] {
-  if (sortBy === "1") {
+  if (sortBy === "0") {
+    // Ascending: oldest first
     return items.sort(
       (a, b) =>
         new Date(a[dateField] as string).getTime() -
         new Date(b[dateField] as string).getTime()
     );
-  } else if (sortBy === "0") {
+  } else if (sortBy === "1") {
+    // Descending: newest first
     return items.sort(
       (a, b) =>
         new Date(b[dateField] as string).getTime() -

application/CohortManager/src/Web/app/exceptions/[filter]/page.tsx

@@ -39,19 +39,19 @@ export default async function Page({
 
   const breadcrumbItems = [{ label: "Home", url: "/" }];
   const resolvedSearchParams = searchParams ? await searchParams : {};
-  const sortBy = resolvedSearchParams.sortBy === "1" ? 1 : 0;
+  const sortBy = resolvedSearchParams.sortBy === "0" ? 0 : 1;
   const currentPage = Math.max(
     1,
     parseInt(resolvedSearchParams.page || "1", 10)
   );
 
   const sortOptions = [
     {
-      value: "0",
+      value: "1",
       label: "Status last updated (most recent first)",
     },
     {
-      value: "1",
+      value: "0",
       label: "Status last updated (oldest first)",
     },
   ];

application/CohortManager/src/Web/app/exceptions/page.tsx

@@ -49,19 +49,19 @@ export default async function Page({
 
   const breadcrumbItems = [{ label: "Home", url: "/" }];
   const resolvedSearchParams = searchParams ? await searchParams : {};
-  const sortBy = resolvedSearchParams.sortBy === "1" ? 1 : 0;
+  const sortBy = resolvedSearchParams.sortBy === "0" ? 0 : 1;
   const currentPage = Math.max(
     1,
     parseInt(resolvedSearchParams.page || "1", 10)
   );
 
   const sortOptions = [
     {
-      value: "0",
+      value: "1",
       label: "Date exception created (newest first)",
     },
     {
-      value: "1",
+      value: "0",
       label: "Date exception created (oldest first)",
     },
   ];

application/CohortManager/src/Web/tests/features/notRaisedExceptions.feature

@@ -11,7 +11,7 @@ Feature: Not raised exceptions page
   Scenario: Table shows 10 "Not raised" exceptions with expected columns
     Then the table "exceptions-table" has 10 rows
     And every row in the table "exceptions-table" has status "Not raised"
-    And the first row in the table "exceptions-table" has exception ID "2073"
+    And the first row in the table "exceptions-table" has exception ID "2028"
 
     Scenario: Sort the not raised exceptions table by "Date exception created (oldest first)"
       Given I should see the heading "Not raised breast screening exceptions"
@@ -23,7 +23,7 @@ Feature: Not raised exceptions page
       Given I should see the heading "Not raised breast screening exceptions"
       When I sort the table by "Date exception created (newest first)"
       Then the table "exceptions-table" has 10 rows
-      And the first row in the table "exceptions-table" has exception ID "2073"
+      And the first row in the table "exceptions-table" has exception ID "2028"
 
   Scenario: Breadcrumb back to homepage
     Then I see the link "Home"

application/CohortManager/src/Web/tests/features/raisedExceptions.feature

@@ -14,7 +14,7 @@ Feature: Raised exceptions page
       Then I see text containing "Showing 1 to 10" in the element "raised-exception-count"
       And the table "exceptions-table" has 10 rows
       And every row in the table "exceptions-table" has status "Raised"
-      And the first row in the table "exceptions-table" has exception ID "3001"
+      And the first row in the table "exceptions-table" has exception ID "4001"
 
     Scenario: Sort the raised exceptions table by "Status last updated (oldest first)"
       Given I should see the heading "Raised breast screening exceptions"
@@ -26,7 +26,7 @@ Feature: Raised exceptions page
       Given I should see the heading "Raised breast screening exceptions"
       When I sort the table by "Status last updated (most recent first)"
       Then the table "exceptions-table" has 10 rows
-      And the first row in the table "exceptions-table" has exception ID "3001"
+  And the first row in the table "exceptions-table" has exception ID "4001"
 
     Scenario: Check for breadcrumb navigation back to homepage
       When I go to the page "/exceptions"