chore: filter package by null

bcgov · Dec 4, 2024 · 1a3e90d · 1a3e90d
1 parent ddf4ba5
commit 1a3e90d
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/app/components/AnalystDashboard/AllDashboard.tsx b/app/components/AnalystDashboard/AllDashboard.tsx
@@ -157,6 +157,9 @@ const ApplicantStatusCell = ({ cell }) => {
 
 const filterOutNullishs = (val) => val !== undefined && val !== null;
 
+const toLabelValuePair = (value) =>
+  value ? { label: value, value } : { label: 'Unassigned', value: ' ' };
+
 const accessorFunctionGeneratorInjectsEmptyString = (accessorKey) => {
   return (row) => row[accessorKey] ?? '';
 };
@@ -609,8 +612,8 @@ const AllDashboardTable: React.FC<Props> = ({ query }) => {
         allApplications.edges.map((edge) => edge.node.package?.toString())
       ),
     ]
-      .filter(filterOutNullishs)
-      .sort((a, b) => Number(a) - Number(b));
+      .map(toLabelValuePair)
+      .toSorted((a, b) => Number(a.value) - Number(b.value));
 
     return [
       {

diff --git a/app/tests/pages/analyst/dashboard.test.tsx b/app/tests/pages/analyst/dashboard.test.tsx
@@ -34,6 +34,7 @@ const mockQueryPayload = {
               zones: [1, 2],
               program: 'CCBC',
               status: 'received',
+              package: '1',
               applicationFormTemplate9DataByApplicationId: {
                 nodes: [
                   {
@@ -64,6 +65,7 @@ const mockQueryPayload = {
               zones: [],
               program: 'CCBC',
               status: 'approved',
+              package: null,
               applicationFormTemplate9DataByApplicationId: {
                 nodes: [
                   {
@@ -931,6 +933,44 @@ describe('The index page', () => {
     expect(screen.getAllByText('Reporting complete')).toHaveLength(6);
   });
 
+  it('should correctly filter by package filter', async () => {
+    jest
+      .spyOn(moduleApi, 'useFeature')
+      .mockReturnValue(mockShowCbcProjects(true));
+
+    pageTestingHelper.loadQuery();
+    pageTestingHelper.renderPage();
+
+    expect(screen.getByText('CCBC-010001')).toBeVisible();
+    expect(screen.getByText('CCBC-010002')).toBeVisible();
+
+    const columnActions = document.querySelectorAll(
+      '[aria-label="Show/Hide filters"]'
+    )[0];
+
+    await act(async () => {
+      fireEvent.click(columnActions);
+    });
+
+    const packageFilter = screen.getAllByText('Filter by Package')[0];
+
+    expect(packageFilter).toBeInTheDocument();
+
+    await act(async () => {
+      fireEvent.keyDown(packageFilter, { key: 'Enter', code: 'Enter' });
+    });
+
+    const option = screen.getByRole('option', { name: 'Unassigned' });
+    await act(async () => {
+      fireEvent.click(option);
+    });
+
+    await waitFor(() => {
+      expect(screen.getByText('CCBC-010002')).toBeInTheDocument();
+      expect(screen.queryByText('CCBC-010001')).not.toBeInTheDocument();
+    });
+  });
+
   it('should correctly filter the cbc projects by analyst status filter', async () => {
     jest
       .spyOn(moduleApi, 'useFeature')