Merge pull request #215 from nitheesh-aot/filters

Filters
bcgov · Jan 31, 2025 · 60c72e4 · 60c72e4
2 parents 7f79618 + b97ed27
commit 60c72e4
Show file tree

Hide file tree

Showing 20 changed files with 359 additions and 693 deletions.
diff --git a/compliance-web/cypress/components/_components/_App/_Staff/StaffForm.cy.tsx b/compliance-web/cypress/components/_components/_App/_Staff/StaffForm.cy.tsx
@@ -37,8 +37,8 @@ const mockPermissions: Permission[] = [
 ];
 
 const mockStaffUsers: StaffUser[] = [
-  { id: 1, name: "Alice Johnson" },
-  { id: 2, name: "Bob Brown" },
+  { id: 1, name: "Alice Johnson", is_active: true, position_id: 3 },
+  { id: 2, name: "Bob Brown", is_active: true, position_id: 2 },
 ];
 
 describe("StaffForm Component", () => {

diff --git a/compliance-web/package-lock.json b/compliance-web/package-lock.json
diff --git a/compliance-web/package.json b/compliance-web/package.json
@@ -31,7 +31,7 @@
     "json-2-csv": "^5.5.5",
     "jwt-decode": "^4.0.0",
     "keycloak-js": "^25.0.1",
-    "material-react-table": "^2.13.1",
+    "material-react-table": "^2.13.3",
     "oidc-client-ts": "^3.0.1",
     "quill": "^2.0.2",
     "react": "^18.2.0",

diff --git a/compliance-web/src/components/App/CaseFiles/Profile/CaseFileComplaintsTable.tsx b/compliance-web/src/components/App/CaseFiles/Profile/CaseFileComplaintsTable.tsx
@@ -1,4 +1,3 @@
-import TableFilter from "@/components/Shared/FilterSelect/TableFilter";
 import MasterDataTable from "@/components/Shared/MasterDataTable/MasterDataTable";
 import { searchFilter } from "@/components/Shared/MasterDataTable/utils";
 import { useComplaintsByCaseFileId } from "@/hooks/useComplaints";
@@ -20,9 +19,7 @@ const CaseFileComplaintsTable = ({ caseFileId }: { caseFileId: number }) => {
     setStaffUserList(
       [
         ...new Set(
-          complaints?.map(
-            (complaint) => complaint.primary_officer?.name ?? ""
-          )
+          complaints?.map((complaint) => complaint.primary_officer?.name ?? "")
         ),
       ].filter(Boolean)
     );
@@ -90,56 +87,20 @@ const CaseFileComplaintsTable = ({ caseFileId }: { caseFileId: number }) => {
         },
         filterVariant: "multi-select",
         filterSelectOptions: complaintStatusList,
-        Filter: ({ header, column }) => {
-          return (
-            <TableFilter
-              isMulti
-              header={header}
-              column={column}
-              variant="inline"
-              name="inspectionStatusFilter"
-              placeholder="Filter"
-            />
-          );
-        },
         size: 100,
       },
       {
         accessorFn: (row) => row.requirement_detail?.topic?.name,
         header: "Topic",
         filterVariant: "multi-select",
         filterSelectOptions: topicList,
-        Filter: ({ header, column }) => {
-          return (
-            <TableFilter
-              isMulti
-              header={header}
-              column={column}
-              variant="inline"
-              name="topicFilter"
-              placeholder="Filter"
-            />
-          );
-        },
         size: 120,
       },
       {
         accessorKey: "source_type.name",
         header: "Source",
         filterVariant: "multi-select",
         filterSelectOptions: complaintSourceList,
-        Filter: ({ header, column }) => {
-          return (
-            <TableFilter
-              isMulti
-              header={header}
-              column={column}
-              variant="inline"
-              name="sourceFilter"
-              placeholder="Filter"
-            />
-          );
-        },
         size: 120,
       },
       {
@@ -148,18 +109,6 @@ const CaseFileComplaintsTable = ({ caseFileId }: { caseFileId: number }) => {
         header: "Primary",
         filterVariant: "multi-select",
         filterSelectOptions: staffUserList,
-        Filter: ({ header, column }) => {
-          return (
-            <TableFilter
-              isMulti
-              header={header}
-              column={column}
-              variant="inline"
-              name="primaryOfficerFilter"
-              placeholder="Filter"
-            />
-          );
-        },
         size: 120,
       },
     ],

diff --git a/compliance-web/src/components/App/CaseFiles/Profile/CaseFileInspectionsTable.tsx b/compliance-web/src/components/App/CaseFiles/Profile/CaseFileInspectionsTable.tsx
@@ -1,4 +1,3 @@
-import TableFilter from "@/components/Shared/FilterSelect/TableFilter";
 import MasterDataTable from "@/components/Shared/MasterDataTable/MasterDataTable";
 import { searchFilter } from "@/components/Shared/MasterDataTable/utils";
 import { useInspectionsByCaseFileId } from "@/hooks/useInspections";
@@ -76,18 +75,6 @@ const CaseFileInspectionsTable = ({ caseFileId }: { caseFileId: number }) => {
         },
         filterVariant: "multi-select",
         filterSelectOptions: inspectionStatusList,
-        Filter: ({ header, column }) => {
-          return (
-            <TableFilter
-              isMulti
-              header={header}
-              column={column}
-              variant="inline"
-              name="inspectionStatusFilter"
-              placeholder="Filter"
-            />
-          );
-        },
         size: 100,
       },
       // TODO: Add map correct values for the next 3 columns
@@ -112,18 +99,6 @@ const CaseFileInspectionsTable = ({ caseFileId }: { caseFileId: number }) => {
         header: "Primary",
         filterVariant: "multi-select",
         filterSelectOptions: staffUserList,
-        Filter: ({ header, column }) => {
-          return (
-            <TableFilter
-              isMulti
-              header={header}
-              column={column}
-              variant="inline"
-              name="primaryOfficerFilter"
-              placeholder="Filter"
-            />
-          );
-        },
         size: 120,
       },
     ],