[Comp-800] Default My toggle to off for non-officer positions (#727)

Author: tolkamps1

compliance-web/src/routes/_authenticated/ce-database/case-files/index.tsx

@@ -9,7 +9,7 @@ import { CaseFile, CaseFileGridQueryParams } from "@/models/CaseFile";
 import { cachedFiltersStore } from "@/store/cachedFiltersStore";
 import { useDrawer } from "@/store/drawerStore";
 import { notify } from "@/store/snackbarStore";
-import { DRAWER_WIDTHS } from "@/utils/constants";
+import { DRAWER_WIDTHS, STAFF_USER_POSITION } from "@/utils/constants";
 import { AppConfig } from "@/utils/config";
 import { Box, Button, CircularProgress, Typography } from "@mui/material";
 import { useQueryClient } from "@tanstack/react-query";
@@ -158,17 +158,24 @@ export function CaseFiles() {
 
     // Apply default filters for first-time users
     if (!restoredFilters) {
+      const officerPositions = [
+        STAFF_USER_POSITION.OFFICER,
+        STAFF_USER_POSITION.SENIOR_OFFICER,
+      ];
+      const defaultChecked = Boolean(currentStaff.position_id && 
+        officerPositions.includes(currentStaff.position_id));
+
       const defaultExternalFilters = {
-        primary_officer_ids: [currentStaff.id.toString()],
+        primary_officer_ids: [defaultChecked ? currentStaff.id.toString() : ""],
       };
       const defaultColumnFilters = [
-        { id: "primary_officer", value: [currentStaff.id.toString()] },
+        { id: "primary_officer", value: [defaultChecked ? currentStaff.id.toString() : ""] },
         { id: "status", value: ["Open"] },
       ];
 
       setExternalFilters(defaultExternalFilters);
       setColumnFilters(defaultColumnFilters);
-      setMyFilesChecked(true);
+      setMyFilesChecked(defaultChecked);
     }
 
     // Restore sorting

compliance-web/src/routes/_authenticated/ce-database/complaints/index.tsx

@@ -32,6 +32,7 @@ import ComplaintsGridExport from "@/components/App/Complaints/ComplaintsGrid/Com
 import ShowOnlyMyComplaintsSwitch from "@/components/App/Complaints/ComplaintsGrid/ShowOnlyMyComplaintsSwitch";
 import { AppConfig } from "@/utils/config";
 import { StaffUser } from "@/models/Staff";
+import { STAFF_USER_POSITION } from "@/utils/constants";
 
 export const Route = createFileRoute("/_authenticated/ce-database/complaints/")(
   { component: Complaints }
@@ -48,17 +49,28 @@ const getCurrentStaff = (currentUser: User | undefined | null, staffList: StaffU
 };
 
 // Helper to create default filters for a staff member
-const createDefaultFilters = (staffId: string) => ({
-  externalFilters: {
-    primary_officer_ids: [staffId],
-  },
-  columnFilters: [
-    {
-      id: "primary_officer_ids",
-      value: [staffId],
-    },
-  ],
-});
+const createDefaultFilters = (staffId: string, defaultMyChecked: boolean): {
+  externalFilters: Record<string, string[] | string>;
+  columnFilters: MRT_ColumnFiltersState;
+} => {
+  if (defaultMyChecked) {
+    return {
+      externalFilters: {
+        primary_officer_ids: [staffId],
+      },
+      columnFilters: [
+        {
+          id: "primary_officer_ids",
+          value: [staffId],
+        },
+      ],
+    }
+  }
+  return {
+    externalFilters: {},
+    columnFilters: [],
+  };
+}
 
 export function Complaints() {
   const { data: projects } = useProjectsData();
@@ -150,10 +162,17 @@ export function Complaints() {
       }
     } else {
       // Apply defaults for first-time users
-      const defaults = createDefaultFilters(currentStaff.id.toString());
+      const officerPositions = [
+        STAFF_USER_POSITION.OFFICER,
+        STAFF_USER_POSITION.SENIOR_OFFICER,
+      ];
+
+      const defaultChecked = Boolean(currentStaff.position_id && 
+        officerPositions.includes(currentStaff.position_id));
+      const defaults = createDefaultFilters(currentStaff.id.toString(), defaultChecked);
       setExternalFilters(defaults.externalFilters);
       setColumnFilters(defaults.columnFilters);
-      setMyFilesChecked(true);
+      setMyFilesChecked(defaultChecked);
     }
 
     setIsRestored(true);

compliance-web/src/routes/_authenticated/ce-database/inspections/index.tsx

@@ -15,7 +15,7 @@ import { useProjectsData } from "@/hooks/useProjects";
 import { useInitiationsData } from "@/hooks/useInspections";
 import { Inspection, InspectionGridQueryParams } from "@/models/Inspection";
 import { cachedFiltersStore } from "@/store/cachedFiltersStore";
-import { IRProgressEnumText, InspectionStatusEnum } from "@/utils/constants";
+import { IRProgressEnumText, InspectionStatusEnum, STAFF_USER_POSITION } from "@/utils/constants";
 import { Box, CircularProgress, Typography } from "@mui/material";
 import { createFileRoute } from "@tanstack/react-router";
 import { BCDesignTokens } from "epic.theme";
@@ -45,17 +45,28 @@ const getCurrentStaff = (currentUser: User | undefined | null, staffList: StaffU
 };
 
 // Helper to create default filters for a staff member
-const createDefaultFilters = (staffId: string) => ({
-  externalFilters: {
-    primary_officer_ids: [staffId],
-  },
-  columnFilters: [
-    {
-      id: "primary_officer",
-      value: [staffId],
-    },
-  ],
-});
+const createDefaultFilters = (staffId: string, defaultMyChecked: boolean): {
+  externalFilters: Record<string, string[] | string>;
+  columnFilters: MRT_ColumnFiltersState;
+} => {
+  if (defaultMyChecked) {
+    return {
+      externalFilters: {
+        primary_officer_ids: [staffId],
+      },
+      columnFilters: [
+        {
+          id: "primary_officer_ids",
+          value: [staffId],
+        },
+      ],
+    }
+  }
+  return {
+    externalFilters: {},
+    columnFilters: [],
+  };
+}
 
 export function Inspections() {
   const { data: projects } = useProjectsData();
@@ -166,10 +177,17 @@ export function Inspections() {
       }
     } else {
       // Apply defaults for first-time users
-      const defaults = createDefaultFilters(currentStaff.id.toString());
+      const officerPositions = [
+        STAFF_USER_POSITION.OFFICER,
+        STAFF_USER_POSITION.SENIOR_OFFICER,
+      ];
+
+      const defaultChecked = Boolean(currentStaff.position_id && 
+        officerPositions.includes(currentStaff.position_id));
+      const defaults = createDefaultFilters(currentStaff.id.toString(), defaultChecked);
       setExternalFilters(defaults.externalFilters);
       setColumnFilters(defaults.columnFilters);
-      setMyInspectionsChecked(true);
+      setMyInspectionsChecked(defaultChecked);
     }
 
     setIsRestored(true);

compliance-web/src/utils/constants.ts

@@ -10,8 +10,11 @@ export const UNAPPROVED_PROJECT_ID = 99999;
 export const UNAPPROVED_PROJECT_ABBREVIATION = "UNPRVD";
 
 export const STAFF_USER_POSITION = {
+  OFFICER: 1,
+  SENIOR_OFFICER: 2,
   DEPUTY_DIRECTOR: 3,
   DIRECTOR: 4,
+  SPECIALIST: 5,
   OTHER: 6,
 }