COMP-478:Make fields editable for Unapproved project (#543)

* COMP-478:Make fields editable for Unapproved project

* COMP-478:Make fields editable for Unapproved project

Author: don-aot

compliance-api/src/compliance_api/resources/case_file.py

@@ -52,7 +52,7 @@
     API, StaffUserSchema(), "StaffList"
 )
 case_file_update_model = ApiHelper.convert_ma_schema_to_restx_model(
-    API, CaseFileSchema(), "CaseFileUpdate"
+    API, CaseFileUpdateSchema(), "CaseFileUpdate"
 )
 case_file_status_model = ApiHelper.convert_ma_schema_to_restx_model(
     API, CaseFileStatusSchema(), "CaseFileStatus"

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

@@ -104,6 +104,23 @@ class Meta:  # pylint: disable=too-few-public-methods
     project_description = fields.Str(
         metadata={"description": "The project description"}, allow_none=True
     )
+    project_id = fields.Int(
+        metadata={
+            "description": "The unique identifier for the project associated with the case file."
+        },
+        allow_none=True,
+    )
+    unapproved_project_regulated_party = fields.Str(
+        metadata={"description": "The regulated_party name of the unapproved project"},
+        allow_none=True,
+    )
+    unapproved_project_type = fields.Str(
+        metadata={"description": "The type of the unapproved project"}, allow_none=True
+    )
+    unapproved_project_sub_type = fields.Str(
+        metadata={"description": "The sub type of the unapproved project"},
+        allow_none=True,
+    )
 
 
 class CaseFileCreateSchema(CaseFileUpdateSchema):  # pylint: disable=too-many-ancestors

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

@@ -206,6 +206,17 @@ def update(cls, case_file_id: int, case_file_data: dict, ho_session=None):
                 case_file_data.get("officer_ids", []),
                 ho_session or session,
             )
+
+            if not case_file_data.get("project_id", None):
+                existing_unapproved_project = UnapprovedProjectModel.get_by_case_file_id(case_file_id)
+                if existing_unapproved_project:
+                    unapproved_project_update_data = {
+                        "regulated_party": case_file_data.get("unapproved_project_regulated_party"),
+                        "type": case_file_data.get("unapproved_project_type"),
+                        "sub_type": case_file_data.get("unapproved_project_sub_type"),
+                    }
+                    existing_unapproved_project.update(unapproved_project_update_data, commit=False)
+
         return updated_case_file
 
     @classmethod

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

@@ -152,20 +152,18 @@ const CaseFileDrawer: React.FC<CaseFileDrawerProps> = ({
         case_file_number: data.caseFileNumber ?? undefined,
         project_description: data.projectDescription ?? "",
       };
-
+      if (!projectId) {
+        caseFileData = {
+          ...caseFileData,
+          unapproved_project_authorization: data.authorization ?? "",
+          unapproved_project_regulated_party: data.regulatedParty ?? "",
+          unapproved_project_type: data.projectType ?? "",
+          unapproved_project_sub_type: data.projectSubType ?? "",
+        };
+      }
       if (caseFile) {
         updateCaseFile({ id: caseFile.id, caseFile: caseFileData });
       } else {
-        if (!projectId) {
-          // map the unapproved fields only during create mode
-          caseFileData = {
-            ...caseFileData,
-            unapproved_project_authorization: data.authorization ?? "",
-            unapproved_project_regulated_party: data.regulatedParty ?? "",
-            unapproved_project_type: data.projectType ?? "",
-            unapproved_project_sub_type: data.projectSubType ?? "",
-          };
-        }
         createCaseFile(caseFileData);
       }
     },
@@ -193,6 +191,7 @@ const CaseFileDrawer: React.FC<CaseFileDrawerProps> = ({
             staffUsersList={staffUserList ?? []}
             isEditMode={!!caseFile}
             isSuperUser={isSuperUser}
+            caseFileProjectId={caseFile?.project_id}
           />
         </Box>
         <DrawerActionBarBottom

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

@@ -15,6 +15,7 @@ type CaseFileFormProps = {
   staffUsersList: StaffUser[];
   isEditMode: boolean;
   isSuperUser: boolean;
+  caseFileProjectId?: number | null;
 };
 
 const CaseFileForm: React.FC<CaseFileFormProps> = ({
@@ -23,6 +24,7 @@ const CaseFileForm: React.FC<CaseFileFormProps> = ({
   staffUsersList,
   isEditMode,
   isSuperUser,
+  caseFileProjectId,
 }) => {
   return (
     <>
@@ -41,6 +43,7 @@ const CaseFileForm: React.FC<CaseFileFormProps> = ({
           <ProjectDetailsForm
             projectList={projectList}
             isEditMode={isEditMode}
+            caseFileProjectId={caseFileProjectId}
           />
           <Stack flex={1}>
             <ControlledAutoComplete

compliance-web/src/components/App/ProjectDetailsForm.tsx

@@ -12,11 +12,13 @@ import { formatAuthorization } from "@/utils/appUtils";
 type ProjectDetailsFormProps = {
   projectList: Project[];
   isEditMode?: boolean;
+  caseFileProjectId?: number | null;
 };
 
 const ProjectDetailsForm: FC<ProjectDetailsFormProps> = ({
   projectList,
   isEditMode,
+  caseFileProjectId,
 }) => {
   const { isOpen } = useDrawer();
   const { setValue, resetField } = useFormContext();
@@ -86,21 +88,21 @@ const ProjectDetailsForm: FC<ProjectDetailsFormProps> = ({
         name="regulatedParty"
         label="Regulated Party"
         placeholder="Regulated Party"
-        disabled={!!selectedProjectId || isEditMode}
+        disabled={!!selectedProjectId || (isEditMode && caseFileProjectId !== null)}
         fullWidth
       />
       <ControlledTextField
         name="projectType"
         label="Project Type"
         placeholder="Project Type"
-        disabled={!!selectedProjectId || isEditMode}
+        disabled={!!selectedProjectId || (isEditMode && caseFileProjectId !== null)}
         fullWidth
       />
       <ControlledTextField
         name="projectSubType"
         label="Project Subtype"
         placeholder="Project Subtype"
-        disabled={!!selectedProjectId || isEditMode}
+        disabled={!!selectedProjectId || (isEditMode && caseFileProjectId !== null)}
         fullWidth
       />
     </Stack>