COMP-686: Record Approved by disappears when the next step in the Rec… (#605)

* COMP-686: Record Approved by disappears when the next step in the Record Stepper is selected

* COMP-689: change label on the Record prepared by

* COMP-687: Label change: Findings to Inspection Details

Author: nitheesh-aot

compliance-web/cypress/components/_components/_App/_Inspections/_Requirements/mockData.ts

@@ -16,7 +16,7 @@ export const baseRequirement: InspectionRequirement = {
   is_active: true,
   requirement_source_details: [
     {
-      requirement_source: { id: "1", name: "Test Source" },
+      requirement_source: { id: "1", name: "Test Source", source_title: "Test Source Title" },
       requirement_source_id: 1,
       section_number: "1.1",
       condition_number: null,
@@ -26,14 +26,24 @@ export const baseRequirement: InspectionRequirement = {
       is_active: true,
       id: 1,
       requirement_id: 1,
+      source_title: "Test Source Title",
+      appendix_id: 1,
+      appendix: { id: 1, appendix_no: "A", document_title: "Test Document Title", inspection_id: 1 },
+      images: [],
+      order_id: 1,
+      order: { id: 1, order_number: "1", inspection_id: 1, where_as: "Test Where As", now_therefore: "Test Now Therefore", is_active: true },
       documents: [
-        { id: 1, req_detail_id: 1, document_type: { id: "1", name: "Test Document" },
+        {
+          id: 1, req_detail_id: 1, document_type: { id: "1", name: "Test Document" },
           document_type_id: 1,
           document_title: "Test Document",
           section_number: "1.1",
           section_title: "Test Section",
           description: "Test Description",
           is_active: true,
+          appendix: { id: 1, appendix_no: "A", document_title: "Test Document Title", inspection_id: 1 },
+          appendix_id: 1,
+          images: [],
         },
       ],
     },
@@ -73,4 +83,5 @@ export const mockInspection: Inspection = {
   project_status: null,
   project: null,
   initiation: null,
+  debrief_date: "2021-01-01",
 };

compliance-web/src/components/App/Inspections/Profile/Reports/OfficerSteppr/RegPartyResponse.tsx

@@ -121,12 +121,13 @@ const RegPartyResponse: React.FC<RegPartyResponseProps> = ({
           }}
         >
           {responseReceived === "yes" && (
-            <ControlledDateField
-              name="responseDate"
-              label="Preliminary IR Response Date"
-              height="2rem"
-              width="40%"
-            />
+            <Box maxWidth="270px">
+              <ControlledDateField
+                name="responseDate"
+                label="Preliminary IR Response Date"
+                height="2rem"
+              />
+            </Box>
           )}
           <Box
             sx={{

compliance-web/src/components/App/Inspections/Profile/Reports/ReportTabContents/IROverview/PreparedByPopover.tsx

@@ -17,7 +17,7 @@ const preparedByFormSchema = yup.object().shape({
   primaryOfficer: yup
     .object<StaffUser>()
     .nullable()
-    .required("Primary Officer is required"),
+    .required("Record Prepared By is required"),
 });
 
 type PreparedBySchemaType = yup.InferType<typeof preparedByFormSchema>;
@@ -79,8 +79,8 @@ const PreparedByPopover: React.FC<PreparedByPopoverProps> = ({
           <Box display="flex" flexDirection="column" px={2} pt={2}>
             <ControlledAutoComplete
               name="primaryOfficer"
-              label="Primary Officer"
-              placeholder="Select Primary Officer"
+              label="Record Prepared By"
+              placeholder="Select Record Prepared By"
               options={staffUserList ?? []}
               getOptionLabel={(option) => option.name}
               getOptionKey={(option) => option.id}

compliance-web/src/components/App/Inspections/Profile/Reports/ReportTabContents/IROverview/ProjectOverview.tsx

@@ -116,6 +116,7 @@ const ProjectOverview = () => {
   const getApprovedBy = () => {
     const isApproved = [
       IRProgressEnum.PRELIMINARY_APPROVED,
+      IRProgressEnum.HOLDER_PRELIMINARY_REVIEW,
       IRProgressEnum.FINAL_APPROVED,
       IRProgressEnum.ISSUED,
     ].includes(inspectionReportsData?.ir_progress?.id as IRProgressEnum);

compliance-web/src/components/App/Inspections/Profile/Requirements/RequirementFormLeft.tsx

@@ -382,9 +382,9 @@ Changing it will delete the existing document so you can create a new one`;
         />
       )}
       <ControlledLexicalEditor
-        label="Findings"
+        label="Inspection Details"
         name="findings"
-        placeholder="Enter Findings..."
+        placeholder="Enter Inspection Details..."
         height={`calc(100vh - ${appHeaderHeight + 363}px)`}
         isAdvanced
         mentionsList={mentionDataList}