Merge pull request #5362 from bcgov/test-rook-RQ-mergeCFDtoDEV

Fix new observations for CFD
bcgov · Aug 14, 2024 · 6408e36 · 6408e36
2 parents 2d3db9d + 0391cd7
commit 6408e36
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/forms-flow-web/src/components/FOI/customComponents/FileUpload/FileUploadForMCFPersonal.js b/forms-flow-web/src/components/FOI/customComponents/FileUpload/FileUploadForMCFPersonal.js
@@ -712,12 +712,11 @@ const FileUploadForMCFPersonal = ({
             value=""
             multiple={multipleFiles}
             accept={mimeTypes}
-            disabled={modalFor === "add" && (!isPersonSelected || ((isMinistryCoordinator && tagValue == "")))}
             />
           </div>
           <div className="file-upload-column file-upload-column-3">
             {(Object.entries(files).length === 0 && !multipleFiles) || multipleFiles ?
-            <button className="btn-add-files" type="button" onClick={handleUploadBtnClick} disabled={modalFor === "add" && (!isPersonSelected || ((isMinistryCoordinator && tagValue == "")))}>
+            <button className="btn-add-files" type="button" onClick={handleUploadBtnClick}>
                   Add Files
             </button>  : null}
           </div>

diff --git a/forms-flow-web/src/components/FOI/customComponents/Records/MCFPersonal.js b/forms-flow-web/src/components/FOI/customComponents/Records/MCFPersonal.js
@@ -86,6 +86,8 @@ const MCFPersonal = ({
          || personalAttributes?.person === ""
          || personalAttributes?.filetype === undefined
          || personalAttributes?.filetype === ""
+         || personalAttributes?.trackingid === undefined
+         || personalAttributes?.trackingid === ""
          || (!isMinistryCoordinator && comparePersonalAttributes(personalAttributes, curPersonalAttributes))
          || (isMinistryCoordinator && comparePersonalAttributes(personalAttributes, curPersonalAttributes) && compareDivision(currentEditRecord.attributes.divisions[0].divisionid, divisionModalTagValue))
         );

diff --git a/forms-flow-web/src/components/FOI/customComponents/Records/index.js b/forms-flow-web/src/components/FOI/customComponents/Records/index.js
@@ -2462,8 +2462,8 @@ export const RecordsLog = ({
                 {divisionFilters.map((division) => (
                   <ClickableChip
                     item
-                    id={`${division.divisionid}Filter`}
-                    key={`${division.divisionid}-filter`}
+                    // id={`${division.divisionid}Filter`}
+                    // key={`${division.divisionid}-filter`}
                     label={division.divisionname.toUpperCase()}
                     sx={{
                       width: "fit-content",