Merge pull request #3713 from bcgov/NDT-606-Refine-Global-Search-for-…

…the-Internal-and-External-Status feat: filter status on global search
bcgov · Dec 4, 2024 · 386fcaa · 386fcaa
2 parents 8950e15 + 8203abe
commit 386fcaa
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# [1.215.0](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.214.3...v1.215.0) (2024-12-04)
+
+### Features
+
+- filter status on global search ([3ff9226](https://github.com/bcgov/CONN-CCBC-portal/commit/3ff922688c63598096b974284c80c14a4ed2eb5c))
+
 ## [1.214.3](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.214.2...v1.214.3) (2024-12-04)
 
 ## [1.214.2](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.214.1...v1.214.2) (2024-12-04)

diff --git a/app/components/AnalystDashboard/AllDashboard.tsx b/app/components/AnalystDashboard/AllDashboard.tsx
@@ -525,7 +525,7 @@ const AllDashboardTable: React.FC<Props> = ({ query }) => {
     }));
 
     const allCbcApplications = showCbcProjects
-      ? allCbcData.edges.map((project) => {
+      ? (allCbcData.edges.map((project) => {
           const cbcStatus = project.node.jsonData.projectStatus
             ? cbcProjectStatusConverter(project.node.jsonData.projectStatus)
             : null;
@@ -551,7 +551,7 @@ const AllDashboardTable: React.FC<Props> = ({ query }) => {
             showLink: showCbcProjectsLink,
             communities: getCbcCommunities(project),
           };
-        }) ?? []
+        }) ?? [])
       : [];
 
     return [...allCcbcApplications, ...allCbcApplications];
@@ -637,7 +637,8 @@ const AllDashboardTable: React.FC<Props> = ({ query }) => {
         sortingFn: sortZones,
       },
       {
-        accessorKey: 'analystStatus',
+        accessorFn: (row) => normalizeStatusName(row.analystStatus),
+        id: 'analystStatus',
         header: 'Internal Status',
         Cell: AnalystStatusCell,
         filterVariant: 'multi-select',
@@ -646,7 +647,8 @@ const AllDashboardTable: React.FC<Props> = ({ query }) => {
         sortingFn: sortStatus,
       },
       {
-        accessorKey: 'externalStatus',
+        accessorFn: (row) => normalizeStatusName(row.externalStatus),
+        id: 'externalStatus',
         header: 'External Status',
         Cell: ApplicantStatusCell,
         filterVariant: 'multi-select',

diff --git a/db/sqitch.plan b/db/sqitch.plan
@@ -756,3 +756,4 @@ mutations/create_assessment_form [mutations/[email protected]] 2024
 @1.214.1 2024-12-04T03:24:26Z CCBC Service Account <[email protected]> # release v1.214.1
 @1.214.2 2024-12-04T18:39:28Z CCBC Service Account <[email protected]> # release v1.214.2
 @1.214.3 2024-12-04T21:21:10Z CCBC Service Account <[email protected]> # release v1.214.3
+@1.215.0 2024-12-04T23:00:00Z CCBC Service Account <[email protected]> # release v1.215.0
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CONN-CCBC-portal",
-  "version": "1.214.3",
+  "version": "1.215.0",
   "main": "index.js",
   "repository": "https://github.com/bcgov/CONN-CCBC-portal.git",
   "author": "Romer, Meherzad CITZ:EX <[email protected]>",