COMP-508: Save Changes dialog come every time the drawer is opened (#604)

Author: nitheesh-aot

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

@@ -84,7 +84,7 @@ const CaseFileDrawer: React.FC<CaseFileDrawerProps> = ({
     if (caseFile) {
       return {
         project: caseFile.project,
-        dateCreated: dayjs(caseFile.date_created),
+        dateCreated: caseFile.date_created ? dayjs(caseFile.date_created) : undefined,
         primaryOfficer: caseFile.primary_officer,
         officers: caseFile.officers,
         initiation: caseFile.initiation,

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

@@ -39,11 +39,22 @@ type ComplaintDrawerProps = {
 };
 
 const initFormData: ComplaintFormData = {
-  project: undefined,
-  dateReceived: undefined,
+  concernDescription: "",
+  locationDescription: "",
+  topic: undefined,
   primaryOfficer: undefined,
+  dateReceived: undefined,
   complaintSource: undefined,
+  contactFullName: "",
+  contactTitle: "",
+  contactEmail: "",
+  contactPhoneNumber: "",
+  contactComments: "",
+  agency: undefined,
+  firstNation: undefined,
+  otherDescription: "",
   requirementSource: undefined,
+  requirementSourceDescription: "",
   order: undefined,
 };
 
@@ -81,7 +92,9 @@ const ComplaintDrawer: React.FC<ComplaintDrawerProps> = ({
         locationDescription: complaint.location_description,
         primaryOfficer: complaint.primary_officer,
         topic: complaint.topic,
-        dateReceived: dayjs(complaint.date_received),
+        dateReceived: complaint.date_received
+          ? dayjs(complaint.date_received)
+          : undefined,
         complaintSource: complaint.source_type,
         contactFullName: complaint.source_contact.full_name ?? "",
         contactTitle: complaint.source_contact.title ?? "",
@@ -105,17 +118,9 @@ const ComplaintDrawer: React.FC<ComplaintDrawerProps> = ({
     );
     return {
       ...initFormData,
-      caseFileId: caseFile.id.toString(),
       primaryOfficer: selectedOfficer,
     };
-  }, [
-    agenciesList,
-    complaint,
-    firstNationsList,
-    caseFile,
-    staffUserList,
-    currentUser,
-  ]);
+  }, [agenciesList, complaint, firstNationsList, staffUserList, currentUser]);
 
   const methods = useForm<ComplaintSchemaType>({
     resolver: yupResolver(ComplaintFormSchema),

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

@@ -87,9 +87,9 @@ const InspectionDrawer: React.FC<InspectionDrawerProps> = ({
     if (inspection) {
       return {
         project: inspection.project,
-        startDate: dayjs(inspection.start_date),
-        endDate: dayjs(inspection.end_date),
-        debriefDate: dayjs(inspection.debrief_date),
+        startDate: inspection.start_date ? dayjs(inspection.start_date) : undefined,
+        endDate: inspection.end_date ? dayjs(inspection.end_date) : undefined,
+        debriefDate: inspection.debrief_date ? dayjs(inspection.debrief_date) : undefined,
         primaryOfficer: inspection.primary_officer,
         initiation: inspection.initiation,
         irTypes: inspection.types,

compliance-web/src/components/Shared/Controlled/ControlledDateField.tsx

@@ -32,12 +32,12 @@ const ControlledDateField: FC<IFormDateInputProps> = ({
     <Controller
       name={name}
       control={control}
-      defaultValue={null}
       render={({ field }) => (
         <DatePicker
           {...field}
           label={label}
           format={DATE_FORMAT}
+          value={field.value ?? null}
           onChange={(date: Dayjs | null) => {
             field.onChange(date);
           }}

compliance-web/src/models/Complaint.ts

@@ -67,13 +67,22 @@ export interface ComplaintGridItems {
 }
 
 export interface ComplaintFormData {
-  project?: Project;
-  dateReceived?: Dayjs;
-  primaryOfficer?: StaffUser;
   concernDescription?: string;
   locationDescription?: string;
+  topic?: Topic;
+  primaryOfficer?: StaffUser;
+  dateReceived?: Dayjs;
   complaintSource?: ComplaintSource;
+  contactFullName?: string;
+  contactTitle?: string;
+  contactEmail?: string;
+  contactPhoneNumber?: string;
+  contactComments?: string;
+  agency?: Agency;
+  firstNation?: FirstNation;
+  otherDescription?: string;
   requirementSource?: RequirementSource;
+  requirementSourceDescription?: string;
   order?: InspectionOrder;
 }