Review board (#577)

* issuing officer added

* filter behaviour corrected for deputy directors

* lint fix

Author: nitheesh-aot

compliance-api/src/compliance_api/schemas/review_board.py

@@ -28,7 +28,7 @@ class ReviewBoardInspectionRecordSchema(Schema):  # pylint: disable=no-self-use
 
     # Approval fields - if under review
     send_for_review_date = fields.Method("get_send_for_review_date", dump_only=True)
-    deputy_director_name = fields.Method("get_deputy_director_name", dump_only=True)
+    deputy_director = fields.Method("get_deputy_director", dump_only=True)
     approved_date = fields.Method("get_approved_date", dump_only=True)
 
     # Approval fields from inspection record approval
@@ -71,11 +71,17 @@ def get_send_for_review_date(self, obj):  # pylint: disable=no-self-use
             return latest_approval.created_date.strftime(INPUT_DATE_TIME_FORMAT)
         return None
 
-    def get_deputy_director_name(self, obj):  # pylint: disable=no-self-use
+    def get_deputy_director(self, obj):  # pylint: disable=no-self-use
         """Get deputy director name from latest approval."""
         latest_approval = self._get_latest_approval(obj)
         if latest_approval and latest_approval.approved_by:
-            return f"{latest_approval.approved_by.first_name} {latest_approval.approved_by.last_name}"
+            officer = latest_approval.approved_by
+            return {
+                "id": officer.id,
+                "first_name": officer.first_name,
+                "last_name": officer.last_name,
+                "name": f"{officer.first_name} {officer.last_name}",
+            }
         return None
 
     def get_approved_date(self, obj):  # pylint: disable=no-self-use
@@ -158,6 +164,7 @@ class ReviewBoardWarningLetterSchema(Schema):  # pylint: disable=no-self-use
     approved_date = fields.Method("get_approved_date")
     review_requested_date = fields.Method("get_review_requested_date")
     approved_by = fields.Method("get_approved_by")
+    deputy_director = fields.Method("get_deputy_director")
     intended_issuance_date = fields.DateTime(
         format=INPUT_DATE_TIME_FORMAT, dump_only=True
     )
@@ -229,6 +236,21 @@ def get_approved_by(self, obj):  # pylint: disable=no-self-use
                 return f"{staff_user.first_name} {staff_user.last_name}"
         return None
 
+    def get_deputy_director(self, obj):  # pylint: disable=no-self-use
+        """Get deputy director name from latest approval."""
+        latest_approval = self._get_latest_approval(obj)
+        if latest_approval and latest_approval.approved_by_id:
+            # Need to fetch the staff user for the name
+            staff_user = StaffUser.query.get(latest_approval.approved_by_id)
+            if staff_user:
+                return {
+                    "id": staff_user.id,
+                    "first_name": staff_user.first_name,
+                    "last_name": staff_user.last_name,
+                    "name": f"{staff_user.first_name} {staff_user.last_name}",
+                }
+        return None
+
     def get_warning_letter_status(self, obj):  # pylint: disable=no-self-use
         """Get warning letter status."""
         if hasattr(obj, "warning_letter_status") and obj.warning_letter_status:
@@ -287,7 +309,7 @@ class ReviewBoardOrderSchema(Schema):  # pylint: disable=no-self-use
     issuing_officer = fields.Method("get_issuing_officer", dump_only=True)
     # Approval fields
     send_for_review_date = fields.Method("get_send_for_review_date", dump_only=True)
-    deputy_director_name = fields.Method("get_deputy_director_name", dump_only=True)
+    deputy_director = fields.Method("get_deputy_director", dump_only=True)
     approved_date = fields.Method("get_approved_date", dump_only=True)
 
     # Order specific fields
@@ -334,14 +356,19 @@ def get_send_for_review_date(self, obj):  # pylint: disable=no-self-use
             return latest_approval.created_date.strftime(INPUT_DATE_TIME_FORMAT)
         return None
 
-    def get_deputy_director_name(self, obj):  # pylint: disable=no-self-use
+    def get_deputy_director(self, obj):  # pylint: disable=no-self-use
         """Get deputy director name from latest approval."""
         latest_approval = self._get_latest_approval(obj)
         if latest_approval and latest_approval.approved_by_id:
             # Need to fetch the staff user for the name
             staff_user = StaffUser.query.get(latest_approval.approved_by_id)
             if staff_user:
-                return f"{staff_user.first_name} {staff_user.last_name}"
+                return {
+                    "id": staff_user.id,
+                    "first_name": staff_user.first_name,
+                    "last_name": staff_user.last_name,
+                    "name": f"{staff_user.first_name} {staff_user.last_name}",
+                }
         return None
 
     def get_approved_date(self, obj):  # pylint: disable=no-self-use

compliance-web/src/components/App/ReviewBoard/ReviewBoardFilters.tsx

@@ -69,18 +69,38 @@ const ReviewBoardFilters: React.FC<ReviewBoardFiltersProps> = ({
 
       if (newChecked && currentStaff) {
         // When turning ON, set the primary officer filter to current user
-        onFilterChange("primary_officer_id", [currentStaff.id.toString()]);
-        onFilterChange("is_deputy_director", isDeputyDirector.toString());
+        if (isDeputyDirector) {
+          onFilterChange("deputy_director_id", [currentStaff.id.toString()]);
+        } else {
+          onFilterChange("primary_officer_id", [currentStaff.id.toString()]);
+        }
       } else {
         // When turning OFF, clear the primary officer filter
-        onFilterChange("primary_officer_id", []);
-        onFilterChange("is_deputy_director", "");
+        // Remove only currentStaff.id from the "primary_officer_id" filter
+        if (
+          externalFilters.primary_officer_id &&
+          Array.isArray(externalFilters.primary_officer_id)
+        ) {
+          const filtered = externalFilters.primary_officer_id.filter(
+            (id) => id !== currentStaff?.id?.toString()
+          );
+          onFilterChange("primary_officer_id", filtered);
+        } else {
+          onFilterChange("primary_officer_id", []);
+        }
+        onFilterChange("deputy_director_id", []);
       }
 
       // Notify parent so it can persist switch state explicitly
       onSwitchChange?.(newChecked);
     },
-    [currentStaff, onFilterChange, onSwitchChange, isDeputyDirector]
+    [
+      currentStaff,
+      onSwitchChange,
+      isDeputyDirector,
+      onFilterChange,
+      externalFilters,
+    ]
   );
 
   const switchLabel = useMemo(() => {

compliance-web/src/components/App/ReviewBoard/ReviewBoardSectionItem.tsx

@@ -191,16 +191,14 @@ const ReviewBoardSectionItem = ({
                     {getFormattedDate(item.send_for_review_date)}
                   </Typography>
                 </Typography>
-                {item.deputy_director_name && (
+                {item.deputy_director && (
                   <Typography
                     variant="caption"
                     color={BCDesignTokens.typographyColorPlaceholder}
                   >
                     Deputy Director:
                     <Typography variant="caption" ml={0.25}>
-                      {item.deputy_director_name.substring(
-                        item.deputy_director_name.indexOf(" ") + 1
-                      )}
+                      {item.deputy_director.last_name}
                     </Typography>
                   </Typography>
                 )}
@@ -244,15 +242,28 @@ const ReviewBoardSectionItem = ({
               </Typography>
             )}
             {sectionId === ReviewBoardCardTypeEnum.PENDING_ISSUANCE && (
-              <Typography
-                variant="caption"
-                color={BCDesignTokens.typographyColorPlaceholder}
-              >
-                Issuance Date:
-                <Typography variant="caption" ml={0.25}>
-                  {getFormattedDate(item.intended_issuance_date)}
+              <>
+                <Typography
+                  variant="caption"
+                  color={BCDesignTokens.typographyColorPlaceholder}
+                >
+                  Issuance Date:
+                  <Typography variant="caption" ml={0.25}>
+                    {getFormattedDate(item.intended_issuance_date)}
+                  </Typography>
                 </Typography>
-              </Typography>
+                {item.issuing_officer && (
+                  <Typography
+                    variant="caption"
+                    color={BCDesignTokens.typographyColorPlaceholder}
+                  >
+                    Issuing Officer:
+                    <Typography variant="caption" ml={0.25}>
+                      {item.issuing_officer?.last_name}
+                    </Typography>
+                  </Typography>
+                )}
+              </>
             )}
           </Box>
         </>

compliance-web/src/components/App/ReviewBoard/ReviewBoardUtils.tsx

@@ -41,11 +41,14 @@ export const formatInspectionRecordsToReviewBoardItems = (
     ir_progress: record.ir_progress,
     ir_number: record.ir_number,
     intended_issuance_date: record.intended_issuance_date,
-    deputy_director_name: record.deputy_director_name,
+    deputy_director: record.deputy_director,
     send_for_review_date: record.send_for_review_date,
     date_report_sent: record.date_report_sent,
     expected_return_date: record.expected_return_date,
     date_response: record.date_response,
+    issuing_officer: record.intended_issuance_date
+      ? record.deputy_director
+      : undefined,
   }));
 };
 
@@ -67,8 +70,9 @@ export const formatOrderRecordsToReviewBoardItems = (
     review_date: record.approved_date,
     ir_number: record.ir_number,
     intended_issuance_date: record.intended_issuance_date,
-    deputy_director_name: record.deputy_director_name,
+    deputy_director: record.deputy_director,
     send_for_review_date: record.send_for_review_date,
+    issuing_officer: record.issuing_officer,
   }));
 };
 
@@ -90,8 +94,9 @@ export const formatWarningLettersToReviewBoardItems = (
     review_date: record.approved_date,
     ir_number: record.ir_number,
     intended_issuance_date: record.intended_issuance_date,
-    deputy_director_name: record.deputy_director_name,
+    deputy_director: record.deputy_director,
     send_for_review_date: record.review_requested_date,
+    issuing_officer: record.issuing_officer,
   }));
 };
 
@@ -264,9 +269,16 @@ export const generateDynamicSections = (
   orderRecords?: OrderReviewBoardItem[],
   warningLetters?: WarningLetterReviewBoardItem[],
   administrativePenalties?: APReviewBoardItem[],
-  primaryOfficerFilter?: string[],
-  isDeputyDirectorFilter?: boolean
+  externalFilters?: Record<string, string[] | string>
 ): ReviewBoardSection[] => {
+  // Extract primary officer filter from external filters
+  const primaryOfficerFilter = externalFilters?.primary_officer_id as
+    | string[]
+    | undefined;
+  const deputyDirectorFilter = externalFilters?.deputy_director_id as
+    | string[]
+    | undefined;
+
   // Initialize the 6 sections with empty items
   const sections = createInitialSections();
 
@@ -292,11 +304,14 @@ export const generateDynamicSections = (
         primaryOfficerFilter.includes(item.primary_officer.id.toString())
     );
   }
-  if (isDeputyDirectorFilter) {
+  if (deputyDirectorFilter && deputyDirectorFilter.length > 0) {
     allItems = allItems.filter(
       (item) =>
-        item.approval_status?.id === APPROVAL_STATUS.APPROVAL_PENDING ||
-        item.approval_status?.id === AdministrativePenaltyStatus.DEPUTY_REVIEW
+        (item.approval_status?.id === APPROVAL_STATUS.APPROVAL_PENDING ||
+          item.approval_status?.id ===
+            AdministrativePenaltyStatus.DEPUTY_REVIEW) &&
+        item.deputy_director &&
+        deputyDirectorFilter.includes(item.deputy_director.id.toString())
     );
   }
 

compliance-web/src/models/ReviewBoard.ts

@@ -26,11 +26,12 @@ export interface ReviewBoardItem {
   ir_progress?: IRProgress;
   ir_number?: string;
   intended_issuance_date?: string;
-  deputy_director_name?: string;
+  deputy_director?: StaffUser;
   send_for_review_date?: string;
   date_report_sent?: string;
   expected_return_date?: string;
   date_response?: string;
+  issuing_officer?: StaffUser;
 }
 
 export interface ReviewBoardSection {
@@ -45,7 +46,7 @@ export interface IRReviewBoardItem {
   inspection_start_date: string,
   primary_officer: StaffUser,
   send_for_review_date: string,
-  deputy_director_name: string,
+  deputy_director: StaffUser,
   approved_date: string,
   date_report_sent: string,
   expected_return_date: string,
@@ -54,6 +55,7 @@ export interface IRReviewBoardItem {
   ir_status: IRStatus,
   ir_progress: IRProgress,
   approval_status: ApprovalStatus,
+  issuing_officer: StaffUser,
 }
 
 export interface OrderReviewBoardItem {
@@ -64,7 +66,7 @@ export interface OrderReviewBoardItem {
   primary_officer: StaffUser,
   issuing_officer: StaffUser,
   send_for_review_date: string,
-  deputy_director_name: string,
+  deputy_director: StaffUser,
   approved_date: string,
   order_status: OrderStatus,
   order_progress: OrderProgress,
@@ -80,7 +82,7 @@ export interface WarningLetterReviewBoardItem {
   primary_officer: StaffUser,
   issuing_officer: StaffUser,
   approved_date: string,
-  deputy_director_name: string,
+  deputy_director: StaffUser,
   review_requested_date: string,
   approved_by: StaffUser,
   intended_issuance_date: string,

compliance-web/src/routes/_authenticated/review-board.tsx

@@ -14,7 +14,7 @@ import { createFileRoute } from "@tanstack/react-router";
 import { BCDesignTokens } from "epic.theme";
 import { useState, useEffect, useRef, useCallback, useMemo } from "react";
 import { useAuth } from "react-oidc-context";
-import { STAFF_USER_POSITION } from "@/utils/constants";
+// STAFF_USER_POSITION no longer needed after removing default ON logic
 
 export const Route = createFileRoute("/_authenticated/review-board")({
   component: ReviewBoard,
@@ -37,20 +37,12 @@ function ReviewBoard() {
 
   // Create the exact 6 sections like mockReviewBoard and populate with dynamic data
   const dynamicSections = useMemo(() => {
-    // Extract primary officer filter from external filters
-    const primaryOfficerFilter = externalFilters.primary_officer_id as
-      | string[]
-      | undefined;
-    const isDeputyDirectorFilter =
-      (externalFilters.is_deputy_director as string | undefined) === "true";
-
     return generateDynamicSections(
       inspectionRecords,
       orderRecords,
       warningLetters,
       administrativePenalties,
-      primaryOfficerFilter,
-      isDeputyDirectorFilter
+      externalFilters
     );
   }, [
     inspectionRecords,
@@ -105,31 +97,7 @@ function ReviewBoard() {
         setInitialChecked(derivedSwitchState);
       }
     } else {
-      // No cached filters - apply default "My Files" filter for first-time users
-      if (currentUser?.profile?.preferred_username && staffUsers) {
-        const currentStaff = staffUsers.find(
-          (staff) =>
-            staff.auth_user_guid === currentUser.profile.preferred_username
-        );
-        if (currentStaff) {
-          const isDeputyDirector =
-            currentStaff.position_id === STAFF_USER_POSITION.DEPUTY_DIRECTOR;
-          const defaultExternalFilters = {
-            primary_officer_id: [currentStaff.id.toString()],
-            is_deputy_director: isDeputyDirector.toString(),
-          };
-
-          setExternalFilters(defaultExternalFilters);
-          setInitialChecked(true);
-
-          // Update prevFilters to prevent unnecessary caching during initial setup
-          prevFilters.current = {
-            ...prevFilters.current,
-            externalFilters: defaultExternalFilters,
-            initialChecked: true,
-          };
-        }
-      }
+      // No cached filters - do not auto-apply any filters or switch state
     }
 
     // Mark restoration as complete and initial load as complete