Merge pull request #5284 from bcgov/dev-marshal-ST-3968

Dev marshal st 3968

forms-flow-web/src/components/FOI/customComponents/ContactApplicant/PreviewModal.tsx

@@ -22,7 +22,8 @@ export const PreviewModal = React.memo(({
   innerhtml,
   handleDraftSave,
   attachments,
-  templateInfo
+  templateInfo,
+  enableSend
 }: previewParams) => {
 
   const dispatch = useDispatch();
@@ -96,7 +97,7 @@ export const PreviewModal = React.memo(({
         />
         <button 
         className="btn-bottom btn-save" 
-        disabled={(attachments?.length <= 0)}
+        disabled={!enableSend}
         onClick={handleSend}
         >
           Send Email

forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx

@@ -40,6 +40,8 @@ import DialogContentText from '@material-ui/core/DialogContentText';
 import DialogTitle from '@material-ui/core/DialogTitle';
 import CloseIcon from '@material-ui/icons/Close';
 
+
+
 export const ContactApplicant = ({
   requestNumber,
   requestState,
@@ -98,6 +100,34 @@ export const ContactApplicant = ({
   const addCorrespondence = () => {
     setShowEditor(true);
     setModal(false);
+    setEditMode(false);
+    setFiles([]);
+    setEditorValue("");
+    setDraftCorrespondence({});
+    setSelectedEmails([]);
+    setCurrentTemplate(0);
+  }
+
+  const  cancelCorrespondence = () => {
+    if (currentTemplate> 0) {
+      setOpenConfirmationModal(true);
+      setConfirmationFor("cancel-correspondence");
+      setConfirmationTitle("Cancel")
+      setConfirmationMessage("Any unsaved changes will be lost.Are you sure you want to proceed? ");
+    } else {
+      setShowEditor(false);
+    }
+  }
+
+  const  clearcorrespondence = () => {
+    setShowEditor(false);
+    setModal(false);
+    setEditMode(false);
+    setFiles([]);
+    setEditorValue("");
+    setDraftCorrespondence({});
+    setSelectedEmails([]);
+    setCurrentTemplate(0);
   }
 
   const handleConfirmationClose = () => {     
@@ -108,11 +138,13 @@ export const ContactApplicant = ({
   }
 
   const handleConfirmationContinue = () => { 
+    setConfirmationFor("");
+    setConfirmationMessage("");
+    setOpenConfirmationModal(false);
     if (confirmationFor === "delete-draft") {
-        setConfirmationFor("");
-        setConfirmationMessage("");
-        setOpenConfirmationModal(false);
-        deleteDraftAction();
+      deleteDraftAction();
+    } else if (confirmationFor === "cancel-correspondence") {
+      clearcorrespondence();
     }
   }
 
@@ -152,7 +184,8 @@ export const ContactApplicant = ({
   const formHistory: Array<any> = useSelector((state: any) => state.foiRequests.foiRequestCFRFormHistory);
   const approvedForm = formHistory?.find(form => form?.status?.toLowerCase() === 'approved');
   const existingCorrespondence = applicantCorrespondence?.find((correspondence: any) => correspondence?.id === approvedForm?.cfrfeeid)
-  const previewButtonValue = existingCorrespondence ? "Preview & Resend" : "Preview & Send";
+  //const previewButtonValue = existingCorrespondence ? "Preview & Resend" : "Preview & Send";
+  const previewButtonValue = "Preview & Send";
   const [editMode, setEditMode] = useState(false);
   const draftButtonValue = editMode ? "Edit Draft" : "Save Draft";
 
@@ -427,6 +460,7 @@ export const ContactApplicant = ({
     setEditMode(true);
     setShowEditor(true);
     setEditorValue(i.text);
+    setSelectedEmails(i.emails);
     if (i.attachments)
       setFiles(i.attachments);
     setCorrespondenceId(i.applicantcorrespondenceid);
@@ -452,9 +486,10 @@ export const ContactApplicant = ({
     setDisablePreview(true);
     setPreviewModal(false);
     let callback = (_res: string) => {
-      setEditorValue("")
-      setCurrentTemplate(0)
-      setFiles([])
+      setEditorValue("");
+      setCurrentTemplate(0);
+      setFiles([]);
+      setSelectedEmails([]);
       setShowEditor(false)
       setEditMode(false);
       setDraftCorrespondence({});
@@ -473,10 +508,11 @@ export const ContactApplicant = ({
       dispatch,
       callback,
       (errorMessage: string) => {
-        setEditorValue("")
-        setCurrentTemplate(0)
-        setFiles([])
-        setShowEditor(false)
+        setEditorValue("");
+        setCurrentTemplate(0);
+        setFiles([]);
+        setSelectedEmails([]);
+        setShowEditor(false);
         setEditMode(false);
         setDraftCorrespondence({});
         dispatch(fetchApplicantCorrespondence(requestId, ministryId));
@@ -497,8 +533,9 @@ export const ContactApplicant = ({
     const attachments = await saveAttachments(files);
     let callback = (_res: string) => {
       setEditorValue("");
-      setCurrentTemplate(0)
-      setFiles([])
+      setCurrentTemplate(0);
+      setFiles([]);
+      setSelectedEmails([]);
       setShowEditor(false);
       toast.success("Message has been saved to draft successfully", {
         position: "top-right",
@@ -532,7 +569,14 @@ export const ContactApplicant = ({
       dispatch,
       callback,
       (errorMessage: string) => {
-        errorToast(errorMessage)
+        errorToast(errorMessage);
+        setEditorValue("")
+        setCurrentTemplate(0)
+        setFiles([])
+        setShowEditor(false)
+        setEditMode(false);
+        setDraftCorrespondence({});
+        setSelectedEmails([]);
         dispatch(setFOICorrespondenceLoader(false));
       },
     );
@@ -791,6 +835,7 @@ export const ContactApplicant = ({
             ministryId={ministryId}
             selectedEmails={selectedEmails}
             setSelectedEmails={setSelectedEmails}
+            defaultEmail={requestDetails.email}
           />
           </Grid>
         </Grid>
@@ -835,12 +880,22 @@ export const ContactApplicant = ({
               handleDraftSave={saveDraft}
               attachments={files}
               templateInfo={templates[currentTemplate]}
-            />            
+              enableSend={selectedEmails.length > 0}
+            />  
+            <button
+            className="btn addCorrespondence"
+            data-variant="contained" 
+            onClick={cancelCorrespondence}             
+            color="primary"
+          >
+            Cancel
+          </button>          
         <button
           className="btn addCorrespondence"
           data-variant="contained" 
           onClick={ editMode ? editCorrespondence : saveDraft}             
           color="primary"
+          disabled={(currentTemplate <= 0)}
         >
           {draftButtonValue}
         </button>

forms-flow-web/src/components/FOI/customComponents/ContactApplicant/types.ts

@@ -29,4 +29,5 @@ export type previewParams = {
   handleDraftSave: () => void;
   attachments: Array<any>
   templateInfo: any;
+  enableSend: boolean;
 }

forms-flow-web/src/components/FOI/customComponents/CorrespondenceEmail.js

@@ -11,6 +11,8 @@ import { saveCorrespondenceEmail, fetchCorrespondenceEmailList } from "../../../
 import _ from 'lodash';
 import TextField from "@material-ui/core/TextField";
 
+
+
 const ITEM_HEIGHT = 48;
 const ITEM_PADDING_TOP = 8;
 const MenuProps = {
@@ -39,8 +41,11 @@ const useStyles = makeStyles((theme) => ({
 export default function CorrespondenceEmail({
   ministryId,
   selectedEmails,
-  setSelectedEmails
-}) {    
+  setSelectedEmails,
+  defaultEmail
+}) {   
+
+
     const classes = useStyles();
     const dispatch = useDispatch();
     const [newCorrespondenceEmail, setNewCorrespondenceEmail] = React.useState();
@@ -50,19 +55,31 @@ export default function CorrespondenceEmail({
     React.useEffect(() => {  
       dispatch(
         fetchCorrespondenceEmailList(ministryId, (_err, res) => {
-          setRequestemailList(res);
-
+          setRequestemailList( [{"email": defaultEmail}, ...res]);
         })
-      );
-    },[ministryId])
+      );  
+    },[ministryId, defaultEmail, dispatch])
+
+    const isEmailPresent = (email) => {
+      let hasMatch =false;
+      for (let requestemail of requestemailList) {      
+        if(requestemail.email === email){
+         hasMatch = true;
+         break;
+       }
+      }
+      return hasMatch;
+    }
 
     const handleEmailSave = (e) => {
+      if (newCorrespondenceEmail && !isEmailPresent(newCorrespondenceEmail)) {
       dispatch(
         saveCorrespondenceEmail(ministryId, {"email": newCorrespondenceEmail}, (_err, res) => {
             setRequestemailList((oldArray) => [...oldArray, {"email": newCorrespondenceEmail}]);
             setNewCorrespondenceEmail(""); 
         })
-      );      
+      );
+      }
     }
 
     const handleChange = (event) => {
@@ -110,7 +127,7 @@ export default function CorrespondenceEmail({
     onChange={handleNewCorrespondenceEmailChange}
     />
     <div>
-    <button className="btn-bottom btn-save" onClick={handleEmailSave}>
+    <button className="btn-bottom btn-save" onClick={handleEmailSave} disabled={!newCorrespondenceEmail || isEmailPresent(newCorrespondenceEmail)}>
             Save
     </button>
     </div>
@@ -126,7 +143,7 @@ export default function CorrespondenceEmail({
     return (
       <>
       <div>
-            <div className="foi-watcher-all">
+            <div className="foi-email-all">
                 <button className="foi-eye-container email-correspondence-button"> <i className="fa fa-envelope"></i> Email To</button>
                 <div className="foi-watcher-select">
                     <i className="fa fa-user-o"></i>                    

forms-flow-web/src/components/FOI/customComponents/CorrespondenceEmail.scss

@@ -44,6 +44,12 @@
     width: 188px;
 }
 
+.foi-email-all {
+    padding-top: 5px; 
+    display: flex;
+    width: 188px;
+}
+
 .foi-watcher-select {
     padding-top: 8px; 
     width: 100px;

request-management-api/request_api/models/FOIApplicantCorrespondenceEmails.py

@@ -6,6 +6,7 @@
 from .default_method_result import DefaultMethodResult
 from sqlalchemy.sql.expression import distinct
 from sqlalchemy import or_,and_,text
+import logging
 
 class FOIApplicantCorrespondenceEmail(db.Model):
     # Name of the table in our database
@@ -34,6 +35,24 @@ def saveapplicantcorrespondenceemail(cls, applicantcorrespondenceid, corresponde
         db.session.commit()            
         return DefaultMethodResult(True,'applicant correpondence emails are added', applicantcorrespondenceid)    
 
+    @classmethod
+    def getapplicantcorrespondenceemails(cls,ministryrequestid):
+        correspondence_emails = []
+        try:
+            sql = """select correspondence_to, 
+                        applicantcorrespondence_id, applicantcorrespondence_version  from "FOIApplicantCorrespondenceEmails" fce join "FOIApplicantCorrespondences" fc 
+                        on fce.applicantcorrespondence_id  = fc.applicantcorrespondenceid and fce.applicantcorrespondence_version = fc."version" 
+                        where fc.foiministryrequest_id = :ministryrequestid;""" 
+            rs = db.session.execute(text(sql), {'ministryrequestid': ministryrequestid})
+            for row in rs:
+                correspondence_emails.append({"correspondence_to": row["correspondence_to"], "applicantcorrespondence_id": row["applicantcorrespondence_id"],
+                                            "applicantcorrespondence_version": row["applicantcorrespondence_version"]})
+        except Exception as ex:
+            logging.error(ex)
+            raise ex
+        finally:
+            db.session.close()
+        return correspondence_emails
 
 class FOIApplicantCorrespondenceEmailSchema(ma.Schema):
     class Meta:

request-management-api/request_api/models/FOICorrespondenceEmails.py

@@ -36,6 +36,8 @@ def getcorrespondenceemails(cls,ministryrequestid):
         query = db.session.query(FOICorrespondenceEmail.email).filter(FOICorrespondenceEmail.foiministryrequest_id == ministryrequestid).order_by(FOICorrespondenceEmail.email.desc()).all()
         return email_schema.dump(query)
 
+
+
     @classmethod
     def savecorrespondenceemail(cls,correpondenceemail)->DefaultMethodResult: 
 

request-management-api/request_api/services/applicantcorrespondence/applicantcorrespondencelog.py

@@ -2,6 +2,8 @@
 from request_api.models.FOIApplicantCorrespondences import FOIApplicantCorrespondence
 from request_api.models.FOIApplicantCorrespondenceAttachments import FOIApplicantCorrespondenceAttachment
 from request_api.models.FOIApplicantCorrespondenceResponses import FOIApplicantCorrespondenceResponse
+from request_api.models.FOIApplicantCorrespondenceEmails import FOIApplicantCorrespondenceEmail
+
 from request_api.models.FOIMinistryRequests import FOIMinistryRequest
 
 import maya
@@ -25,6 +27,7 @@ def getapplicantcorrespondencelogs(self,ministryrequestid):
         """
         _correspondencelogs = FOIApplicantCorrespondence.getapplicantcorrespondences(ministryrequestid)
         _correspondenceattachments = FOIApplicantCorrespondenceAttachment.getcorrespondenceattachmentsbyministryid(ministryrequestid)
+        _correspondenceemails = FOIApplicantCorrespondenceEmail.getapplicantcorrespondenceemails(ministryrequestid)
         correspondencelogs =[]
         for _correpondencelog in _correspondencelogs:
                 attachments = []
@@ -36,12 +39,17 @@ def getapplicantcorrespondencelogs(self,ministryrequestid):
                     }
                     attachments.append(attachment)
                 correpondencelog = self.__createcorrespondencelog(_correpondencelog, attachments)
+                #Email block - Begin
+                correpondencelog['emails'] = self.__getcorrespondenceemailbyid(_correspondenceemails,  _correpondencelog['applicantcorrespondenceid'], _correpondencelog['version'])
+                #Email block - End
                 correspondencelogs.append(correpondencelog)
         return correspondencelogs
 
     def __getattachmentsbyid(self, attachments, correspondenceid, correspondenceversion):
         return [x for x in attachments if x['applicantcorrespondenceid'] == correspondenceid and x['applicantcorrespondence_version'] == correspondenceversion]
 
+    def __getcorrespondenceemailbyid(self, emails, correspondenceid, correspondenceversion):
+        return [x['correspondence_to'] for x in emails if x['applicantcorrespondence_id'] == correspondenceid and x['applicantcorrespondence_version'] == correspondenceversion]
 
     def saveapplicantcorrespondencelog(self, requestid, ministryrequestid, data, userid, isdraft=False):
         applicantcorrespondence = FOIApplicantCorrespondence()