Merge pull request #3512 from bcgov/NDT-474-refine-filter-drop-down-o…

…rder

fix: status orders on all dashboard table

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [1.190.8](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.190.7...v1.190.8) (2024-09-04)
+
+### Bug Fixes
+
+- status order ([ef3d679](https://github.com/bcgov/CONN-CCBC-portal/commit/ef3d67989c495d887d642d2e3c6d848aceac4dec))
+
 ## [1.190.7](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.190.6...v1.190.7) (2024-09-04)
 
 ## [1.190.6](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.190.5...v1.190.6) (2024-09-04)

app/components/AnalystDashboard/AllDashboard.tsx

@@ -281,6 +281,7 @@ const AllDashboardTable: React.FC<Props> = ({ query }) => {
   const statusOrderMap = useMemo(() => {
     return allApplicationStatusTypes?.nodes?.reduce((acc, status) => {
       acc[status.name] = status.statusOrder;
+      acc[normalizeStatusName(status.name)] = status.statusOrder;
       return acc;
     }, {});
   }, [allApplicationStatusTypes?.nodes]);
@@ -467,7 +468,11 @@ const AllDashboardTable: React.FC<Props> = ({ query }) => {
         allApplications.edges.map((edge) => edge.node?.intakeNumber?.toString())
       ),
       'N/A',
-    ];
+    ].toSorted((a, b) => {
+      if (a === 'N/A') return -1;
+      if (b === 'N/A') return 1;
+      return Number(a) - Number(b);
+    });
 
     const uniqueZones = [
       ...new Set(allApplications.edges.flatMap((edge) => edge.node.zones)),
@@ -481,7 +486,7 @@ const AllDashboardTable: React.FC<Props> = ({ query }) => {
           return normalizeStatusName(edge.node.analystStatus);
         })
       ),
-    ];
+    ].toSorted((a, b) => statusOrderMap[a] - statusOrderMap[b]);
 
     const externalStatuses = [
       ...new Set([
@@ -494,7 +499,7 @@ const AllDashboardTable: React.FC<Props> = ({ query }) => {
             normalizeStatusName(cbcProjectStatusConverter(status))
           ),
       ]),
-    ];
+    ].toSorted((a, b) => statusOrderMap[a] - statusOrderMap[b]);
 
     const uniqueLeads = [
       ...new Set(allApplications.edges.map((edge) => edge.node.analystLead)),
@@ -504,7 +509,9 @@ const AllDashboardTable: React.FC<Props> = ({ query }) => {
       ...new Set(
         allApplications.edges.map((edge) => edge.node.package?.toString())
       ),
-    ].filter(filterOutNullishs);
+    ]
+      .filter(filterOutNullishs)
+      .toSorted((a, b) => Number(a) - Number(b));
 
     return [
       {
@@ -570,7 +577,7 @@ const AllDashboardTable: React.FC<Props> = ({ query }) => {
       // adding dummy columns for filter purposes
       ...additionalFilterColumns,
     ];
-  }, [AssignAnalystLead, allApplications]);
+  }, [AssignAnalystLead, allApplications, statusOrderMap]);
 
   const handleOnSortChange = (sort: MRT_SortingState) => {
     if (!isFirstRender) {

db/sqitch.plan

@@ -665,3 +665,4 @@ tables/communities_source_data_001_service_account 2024-08-28T16:32:48Z Rafael S
 @1.190.5 2024-09-04T22:11:54Z CCBC Service Account <[email protected]> # release v1.190.5
 @1.190.6 2024-09-04T22:32:44Z CCBC Service Account <[email protected]> # release v1.190.6
 @1.190.7 2024-09-04T22:50:09Z CCBC Service Account <[email protected]> # release v1.190.7
+@1.190.8 2024-09-04T23:08:50Z CCBC Service Account <[email protected]> # release v1.190.8

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CONN-CCBC-portal",
-  "version": "1.190.7",
+  "version": "1.190.8",
   "main": "index.js",
   "repository": "https://github.com/bcgov/CONN-CCBC-portal.git",
   "author": "Romer, Meherzad CITZ:EX <[email protected]>",