From f8a36ace4a3b56c6379a5dee1235d8263afb64c3 Mon Sep 17 00:00:00 2001 From: Richard Qi Date: Wed, 14 Aug 2024 14:52:50 -0700 Subject: [PATCH 1/3] Fix observation 2 - FOIMOD-3300 --- .../src/components/FOI/customComponents/Records/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forms-flow-web/src/components/FOI/customComponents/Records/index.js b/forms-flow-web/src/components/FOI/customComponents/Records/index.js index e95e27dde..115d11fd8 100644 --- 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) => ( Date: Wed, 14 Aug 2024 15:24:59 -0700 Subject: [PATCH 2/3] Fix new observation 3 & 4 (applied 2nd approach) FOIMOD-3300 --- .../customComponents/FileUpload/FileUploadForMCFPersonal.js | 3 +-- 1 file changed, 1 insertion(+), 2 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 index e2684629f..d0da38187 100644 --- 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 == "")))} />
{(Object.entries(files).length === 0 && !multipleFiles) || multipleFiles ? - : null}
From 0391cd7ea399a32975237afdba782ef69e9e8c05 Mon Sep 17 00:00:00 2001 From: Richard Qi Date: Wed, 14 Aug 2024 15:28:50 -0700 Subject: [PATCH 3/3] Fix new observation 4 FOIMOD-3300 --- .../src/components/FOI/customComponents/Records/MCFPersonal.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/forms-flow-web/src/components/FOI/customComponents/Records/MCFPersonal.js b/forms-flow-web/src/components/FOI/customComponents/Records/MCFPersonal.js index b7cd77788..bdde66378 100644 --- 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)) );