From 1303db1ad81a2c0d6515aa56d3ae96b0fc3defd3 Mon Sep 17 00:00:00 2001
From: Jocelyn Cabildo <Jocelyn.Cabildo@gov.bc.ca>
Date: Thu, 5 Dec 2024 14:41:44 -0800
Subject: [PATCH 1/2] Fix applicant correspondence issues

---
 .../Attachments/AttachmentModal.js             |  2 +-
 .../ContactApplicant/PreviewModal.tsx          |  2 +-
 .../ContactApplicant/index.tsx                 | 12 ++++++------
 .../customComponents/CorrespondenceEmail.js    | 15 +++++++++++++++
 .../FOI/customComponents/FileUpload/index.js   | 18 +++++++++++++++---
 5 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/forms-flow-web/src/components/FOI/customComponents/Attachments/AttachmentModal.js b/forms-flow-web/src/components/FOI/customComponents/Attachments/AttachmentModal.js
index b83502459..4f1f37c00 100644
--- a/forms-flow-web/src/components/FOI/customComponents/Attachments/AttachmentModal.js
+++ b/forms-flow-web/src/components/FOI/customComponents/Attachments/AttachmentModal.js
@@ -865,7 +865,7 @@ export default function AttachmentModal({
               disabled={isSaveDisabled()}
               onClick={handleSave}
             >
-              {uploadFor === "email" ? "Save Changes" :"Continue"}
+              Continue
             </button>
           )}
           <button className="btn-bottom btn-cancel" onClick={handleClose}>
diff --git a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/PreviewModal.tsx b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/PreviewModal.tsx
index 27c5ab1e2..dfb061a32 100644
--- a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/PreviewModal.tsx
+++ b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/PreviewModal.tsx
@@ -86,7 +86,7 @@ export const PreviewModal = React.memo(({
         <DialogContentText id="state-change-dialog-description" component={'span'}>
           <div className="state-change-email-note">
           {enableSend && selectedEmails.length > 0 && (<p>Email to: {selectedEmails.join(', ')}</p>)}
-          {!enableSend && (<p>There is no email associated with this applicant a word doc will be created to be printed.</p>)}
+          {!enableSend && (<p>No email address has been selected to send this correspondence to. Instead, you can export this correspondence as a PDF.</p>)}
           </div>
           <div className="preview-container">
             <iframe srcDoc={ renderTemplate(template, innerhtml, templateVariables) } className="preview-frame" sandbox="allow-same-origin" />
diff --git a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx
index 74fb867a4..2546f542b 100644
--- a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx
+++ b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx
@@ -214,17 +214,16 @@ export const ContactApplicant = ({
       }
     })
 
-    setTemplates((oldArray) => 
+    setTemplates(oldArray =>
       oldArray.filter(
-        (existingItem) =>
-          isEnabledTemplate(existingItem) ||
-          listOfDraftTemplates.includes(existingItem.templateid) ||
-          existingItem.templateid === null
+        template => updatedTemplates.includes(template.value) || template.value === ""
       )
     );
     
+    const updatedTemplates: string[] = [];
     applicantCorrespondenceTemplates.forEach((item: any) => {
       if (isEnabledTemplate(item) || listOfDraftTemplates.includes(item.templateid)) {
+      updatedTemplates.push(item.name)
       const rootpath = OSS_S3_BUCKET_FULL_PATH
       const fileInfoList = [{
         filename: item.name,
@@ -406,6 +405,7 @@ export const ContactApplicant = ({
     const attachments = await saveAttachments(files);
     let callback = (_res: string) => {
       clearcorrespondence();
+      changeCorrespondenceFilter("log");
       if (!skiptoast) {
         toast.success("Message has been sent to applicant successfully", {
         position: "top-right",
@@ -690,7 +690,7 @@ export const ContactApplicant = ({
     setOpenConfirmationModal(true);
     setConfirmationFor("delete-response")
     setConfirmationTitle("Delete Response")
-    setConfirmationMessage("Are you sure you want to delete this response? This can not be undone");
+    setConfirmationMessage("Are you sure you want to delete this response? This can not be undone.");
   }
 
   const deleteResponseAction = () => {
diff --git a/forms-flow-web/src/components/FOI/customComponents/CorrespondenceEmail.js b/forms-flow-web/src/components/FOI/customComponents/CorrespondenceEmail.js
index 71c80932e..01ddc9277 100644
--- a/forms-flow-web/src/components/FOI/customComponents/CorrespondenceEmail.js
+++ b/forms-flow-web/src/components/FOI/customComponents/CorrespondenceEmail.js
@@ -12,6 +12,7 @@ import _ from 'lodash';
 import TextField from "@material-ui/core/TextField";
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faPlusCircle } from '@fortawesome/free-solid-svg-icons';
+import * as EmailValidator from "email-validator";
 
 
 
@@ -55,6 +56,7 @@ export default function CorrespondenceEmail({
     const [requestemailList, setRequestemailList] = React.useState([]);    
     const [noOfSelectedEmails, setNoOfSelectedEmails] = React.useState(0);
     const [showAddEmail, setShowAddEmail] = React.useState(false);
+    const [validation, setValidation] = React.useState({});
 
     React.useEffect(() => {  
       dispatch(
@@ -114,6 +116,17 @@ export default function CorrespondenceEmail({
     
     
     const handleNewCorrespondenceEmailChange = (e) => {
+      let emailValidation = {};
+      if (e.target.value) {
+        const helperText = EmailValidator.validate(e.target.value)
+          ? ""
+          : "Email is not valid.";
+        emailValidation = { field: "Email", helperTextValue: helperText };
+        setValidation(emailValidation);
+      } else {
+        emailValidation = { field: "Email", helperTextValue: "" };
+        setValidation(emailValidation);
+      }
       setNewCorrespondenceEmail(e.target.value);       
     };
     //creates the grouped menu items for assignedTo combobox
@@ -139,6 +152,8 @@ export default function CorrespondenceEmail({
         <TextField id="new-email" label="Add New Email Address" variant="outlined" fullWidth
         value={newCorrespondenceEmail} onChange={handleNewCorrespondenceEmailChange}
         onKeyDown={(e) => {e.stopPropagation();}} onKeyUp={(e) => {e.stopPropagation();}}
+        error={(validation.helperTextValue !== undefined &&validation.helperTextValue !== "")}
+        helperText={validation.helperTextValue}
         />
         <div>
         <button className="btn-bottom btn-save" onClick={handleEmailSave} disabled={!newCorrespondenceEmail || isEmailPresent(newCorrespondenceEmail)}>
diff --git a/forms-flow-web/src/components/FOI/customComponents/FileUpload/index.js b/forms-flow-web/src/components/FOI/customComponents/FileUpload/index.js
index ecd5b51d0..f288a3036 100644
--- a/forms-flow-web/src/components/FOI/customComponents/FileUpload/index.js
+++ b/forms-flow-web/src/components/FOI/customComponents/FileUpload/index.js
@@ -184,6 +184,18 @@ const FileUpload = ({
         return "Drag and drop attachments, or click Add Files"
     }
 
+    const getTagMessage = (uploadFor) => {
+      if (uploadFor === "email") return null;
+      if (uploadFor === "response") {
+        return <p>Only one response may be added at a time.</p>;
+      }
+      return (
+        <p>
+          When uploading more than one {uploadFor}, all {uploadFor}s will have the same selected tag.
+        </p>
+      );
+    };
+
   return (
     <>
       {(modalFor === "add" && (uploadFor === "attachment" || uploadFor === 'record')) && (<div>
@@ -249,9 +261,9 @@ const FileUpload = ({
           </div>
         </div>
       </section>
-      {modalFor === "add" && (<div className="tag-message-container">
-        <p>When uploading more than one {uploadFor}, all {uploadFor}s will have the same selected tag.</p>
-      </div>)}
+      {modalFor === "add" && (
+        <div className="tag-message-container">{getTagMessage(uploadFor)}</div>
+      )}
       <ul className="error-message-ul">
         {errorMessage
           ? errorMessage.map((error) => (

From afef314750fccb70fb0a5f47fca8e660610f4462 Mon Sep 17 00:00:00 2001
From: Jocelyn Cabildo <Jocelyn.Cabildo@gov.bc.ca>
Date: Thu, 5 Dec 2024 15:35:23 -0800
Subject: [PATCH 2/2] added save button validation

---
 .../components/FOI/customComponents/CorrespondenceEmail.js   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/forms-flow-web/src/components/FOI/customComponents/CorrespondenceEmail.js b/forms-flow-web/src/components/FOI/customComponents/CorrespondenceEmail.js
index 01ddc9277..a99e92dc0 100644
--- a/forms-flow-web/src/components/FOI/customComponents/CorrespondenceEmail.js
+++ b/forms-flow-web/src/components/FOI/customComponents/CorrespondenceEmail.js
@@ -156,7 +156,10 @@ export default function CorrespondenceEmail({
         helperText={validation.helperTextValue}
         />
         <div>
-        <button className="btn-bottom btn-save" onClick={handleEmailSave} disabled={!newCorrespondenceEmail || isEmailPresent(newCorrespondenceEmail)}>
+        <button className="btn-bottom btn-save" 
+          onClick={handleEmailSave} 
+          disabled={!newCorrespondenceEmail || isEmailPresent(newCorrespondenceEmail) || 
+            (validation.helperTextValue !== undefined && validation.helperTextValue !== "")}>
                 Save
         </button>
         <button className="btn-cancel" onClick={() => setShowAddEmail(false)} >