Merge pull request #218 from nitheesh-aot/req-changes

Regulatory Consideration

Author: dinesh-aot

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

@@ -200,13 +200,8 @@ def validate_agency_id(
         """Validate the agency if the requirement type is regulatory considerations."""
         req_type = data.get("req_type")
         agency_id = data.get("agency_id", None)
-        if req_type == InspectionRequirementTypeEnum.REG and not agency_id:
-            raise ValidationError(
-                "Agency is required if the requirement type is Regulatory Consideration",
-                field_name="agency_id",
-            )
         enforcement_action_ids = data.get("enforcement_action_ids")
-        if (
+        if req_type == InspectionRequirementTypeEnum.REQ and (
             EnforcementActionOptionEnum.REFERRAL_TO_ANOTHER_AGENCY
             in enforcement_action_ids
             and not agency_id

compliance-api/src/compliance_api/services/inspection_requirement.py

@@ -226,12 +226,12 @@ def _handle_deletion_req_detail_nd_doc(
     existing_detail_ids = {detail.id for detail in existing_details}
     incoming_details_ids = {
         detail.get("id", None)
-        for detail in requirement_data.get("requirement_source_details")
+        for detail in requirement_data.get("requirement_source_details", [])
         if detail.get("id", None) is not None
     }
     incoming_doc_detail_ids = set(
         doc.get("id", None)
-        for detail in requirement_data.get("requirement_source_details")
+        for detail in requirement_data.get("requirement_source_details", [])
         for doc in detail.get("documents", [])
         if doc.get("id", None) is not None
     )

compliance-web/src/components/App/CaseFiles/CaseFileDrawer.tsx

@@ -91,7 +91,7 @@ const CaseFileDrawer: React.FC<CaseFileDrawerProps> = ({
         caseFileNumber: caseFile.case_file_number,
         authorization: formatAuthorization(caseFile.authorization),
         regulatedParty: caseFile.regulated_party,
-        projectDescription: caseFile.project_description,
+        projectDescription: caseFile.project_description ?? "",
         projectType: caseFile.type,
         projectSubType: caseFile.sub_type,
       };

compliance-web/src/components/App/CaseFiles/Profile/CaseFileComplaintsTable.tsx

@@ -51,7 +51,6 @@ const CaseFileComplaintsTable = ({ caseFileId }: { caseFileId: number }) => {
       {
         accessorKey: "complaint_number",
         header: "Complaint #",
-        sortingFn: "sortFn",
         filterFn: searchFilter,
         Cell: ({ row }) => {
           return (

compliance-web/src/components/App/CaseFiles/Profile/CaseFileInspectionsTable.tsx

@@ -36,7 +36,6 @@ const CaseFileInspectionsTable = ({ caseFileId }: { caseFileId: number }) => {
       {
         accessorKey: "ir_number",
         header: "IR #",
-        sortingFn: "sortFn",
         filterFn: searchFilter,
         Cell: ({ row }) => {
           return (

compliance-web/src/components/App/Complaints/ComplaintFormLeft.tsx

@@ -47,6 +47,7 @@ const ComplaintFormLeft: FC<ComplaintFormLeftProps> = ({ staffUsersList }) => {
             getOptionKey={(option) => option.id}
             isOptionEqualToValue={(option, value) => option.id === value.id}
             fullWidth
+            isSortOptions
           />
           <ControlledDateField
             name="dateReceived"

compliance-web/src/components/App/Inspections/InspectionDrawer.tsx

@@ -64,13 +64,11 @@ const InspectionDrawer: React.FC<InspectionDrawerProps> = ({
   const { data: attendanceList } = useAttendanceOptionsData();
   const { data: agenciesList } = useAgenciesData();
   const { data: firstNationsList } = useFirstNationsData();
-  const { data: inattendanceOfficersList } = useStaffUsersData(true)
+  const { data: inattendanceOfficersList } = useStaffUsersData(true);
   const currentUser = useCurrentLoggedInUser();
 
-  const staffUserList = [
-    caseFile.primary_officer,
-    ...(caseFile.officers ?? []),
-  ].filter(Boolean) as StaffUser[];
+  const staffUserList = [caseFile.primary_officer, ...(caseFile.officers ?? [])]
+    .filter(Boolean) as StaffUser[];
 
   const defaultValues = useMemo<InspectionFormData>(() => {
     if (inspection) {

compliance-web/src/components/App/Inspections/InspectionFormLeft.tsx

@@ -72,6 +72,7 @@ const InspectionFormLeft: FC<InspectionFormLeftProps> = ({
             getOptionKey={(option) => option.id}
             isOptionEqualToValue={(option, value) => option.id === value.id}
             fullWidth
+            isSortOptions
           />
           <ControlledAutoComplete
             name="initiation"

compliance-web/src/components/App/Inspections/InspectionFormUtils.ts

@@ -39,15 +39,7 @@ export const InspectionFormSchema = yup.object().shape({
   endDate: yup
     .mixed<Dayjs>()
     .nullable()
-    .typeError("Invalid date")
-    .test(
-      "is-greater",
-      "End date must be greater than start date",
-      function (value) {
-        const { startDate } = this.parent;
-        return !value || !startDate || value.isAfter(startDate);
-      }
-    ),
+    .typeError("Invalid date"),
   initiation: yup
     .object<Initiation>()
     .nullable()

compliance-web/src/components/App/Inspections/Profile/InspectionRequirements.tsx

@@ -8,8 +8,9 @@ import { AddRounded } from "@mui/icons-material";
 import { Box, Button, Typography } from "@mui/material";
 import { useQueryClient } from "@tanstack/react-query";
 import { Reorder } from "framer-motion";
-import React, { useCallback } from "react";
+import React, { useCallback, useEffect } from "react";
 import RequirementCard from "./Requirements/RequirementCard";
+import { REGULATORY_CONSIDERATION_TYPE_ID, REQUIREMENT_TYPE_ID } from "./Requirements/RequirementUtils";
 
 interface InspectionRequirementsProps {
   inspectionData: Inspection;
@@ -19,21 +20,33 @@ const InspectionRequirements: React.FC<InspectionRequirementsProps> = ({
   inspectionData,
 }) => {
   const queryClient = useQueryClient();
-  const { setOpen } = useDrawer();
+  const { setOpen, isOpen } = useDrawer();
   const [activeRequirementId, setActiveRequirementId] = React.useState<
     number | null
   >(null);
   const [inspectionRequirements, setInspectionRequirements] = React.useState<
     InspectionRequirement[]
   >([]);
+  const [regulatoryConsideration, setRegulatoryConsideration] = React.useState<
+    InspectionRequirement | null
+  >(null);
 
   const { data: inspectionRequirementsData } = useInspectionRequirementsData(
     inspectionData.id
   );
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (inspectionRequirementsData) {
-      setInspectionRequirements(inspectionRequirementsData);
+      setInspectionRequirements(
+        inspectionRequirementsData.filter(
+          (req) => req.req_type?.id === REQUIREMENT_TYPE_ID
+        )
+      );
+      setRegulatoryConsideration(
+        inspectionRequirementsData.find(
+          (req) => req.req_type?.id === REGULATORY_CONSIDERATION_TYPE_ID
+        ) ?? null
+      );
     }
   }, [inspectionRequirementsData]);
 
@@ -53,11 +66,12 @@ const InspectionRequirements: React.FC<InspectionRequirementsProps> = ({
         <RequirementDrawer
           onSubmit={handleOnSubmit}
           inspectionData={inspectionData}
+          isRegulatoryConsiderationExists={!!regulatoryConsideration}
         />
       ),
       width: "1228px",
     });
-  }, [setOpen, handleOnSubmit, inspectionData]);
+  }, [setOpen, handleOnSubmit, inspectionData, regulatoryConsideration]);
 
   const handleOpenEditRequirementModal = useCallback(
     (requirement: InspectionRequirement, index: number) => {
@@ -66,20 +80,26 @@ const InspectionRequirements: React.FC<InspectionRequirementsProps> = ({
         content: (
           <RequirementDrawer
             onSubmit={(submitMsg) => {
-              setActiveRequirementId(null);
               handleOnSubmit(submitMsg);
             }}
             inspectionData={inspectionData}
-            requirement={requirement}
+            requirement={requirement} 
             index={index}
+            isRegulatoryConsiderationExists={!!regulatoryConsideration}
           />
         ),
         width: "1228px",
       });
     },
-    [setOpen, handleOnSubmit, inspectionData]
+    [setOpen, handleOnSubmit, inspectionData, regulatoryConsideration]
   );
 
+  React.useEffect(() => {
+    if (!isOpen) {
+      setActiveRequirementId(null);
+    }
+  }, [isOpen]);
+
   return (
     <Box
       display={"flex"}
@@ -115,6 +135,15 @@ const InspectionRequirements: React.FC<InspectionRequirementsProps> = ({
           />
         ))}
       </Reorder.Group>
+      {regulatoryConsideration && (
+        <RequirementCard
+          key={regulatoryConsideration.id}
+          requirement={regulatoryConsideration}
+          index={inspectionRequirements.length}
+          onEdit={() => handleOpenEditRequirementModal(regulatoryConsideration, inspectionRequirements.length)}
+          isActive={regulatoryConsideration.id === activeRequirementId}
+        />
+      )}
     </Box>
   );
 };