feat: adds email-from-name & reply-to-name fields to Emails

Author: Patrik Kozak

src/collections/FormSubmissions/hooks/sendEmail.ts

@@ -46,12 +46,14 @@ const sendEmail = async (beforeChangeData: any, formConfig: FormConfig) => {
               subject,
               emailTo,
               emailFrom,
+              emailFromName,
               replyTo: emailReplyTo,
+              replyToName,
             } = email;
 
             const to = replaceDoubleCurlys(emailTo, submissionData);
-            const from = replaceDoubleCurlys(emailFrom, submissionData);
-            const replyTo = replaceDoubleCurlys(emailReplyTo || emailFrom, submissionData);
+            const from = replaceDoubleCurlys(emailFromName ? `"${emailFromName}" ` + emailFrom : emailFrom, submissionData);
+            const replyTo = replaceDoubleCurlys(replyToName ? `"${replyToName}" ` + emailReplyTo :  emailReplyTo || emailFrom, submissionData);
 
             if (to && from) {
               return ({

src/collections/Forms/index.ts

@@ -156,11 +156,10 @@ export const generateFormCollection = (formConfig: FormConfig): CollectionConfig
               },
               {
                 type: 'text',
-                name: 'emailFrom',
-                label: 'Email From',
+                name: 'bcc',
+                label: 'BCC',
                 admin: {
                   width: '50%',
-                  placeholder: 'Email Recipient <{{email}}>',
                 },
               },
             ],
@@ -178,8 +177,30 @@ export const generateFormCollection = (formConfig: FormConfig): CollectionConfig
               },
               {
                 type: 'text',
-                name: 'bcc',
-                label: 'BCC',
+                name: 'replyToName',
+                label: 'Reply To Name',
+                admin: {
+                  width: '50%',
+                },
+              },
+            ],
+          },
+          {
+            type: 'row',
+            fields: [
+              {
+                type: 'text',
+                name: 'emailFrom',
+                label: 'Email From',
+                admin: {
+                  width: '50%',
+                  placeholder: 'Email Recipient <{{email}}>',
+                },
+              },
+              {
+                type: 'text',
+                name: 'emailFromName',
+                label: 'Email From Name',
                 admin: {
                   width: '50%',
                 },

src/types.ts

@@ -144,8 +144,10 @@ export type FormFieldBlock = TextField | SelectField | EmailField | StateField |
 export type Email = {
   emailTo: string
   emailFrom: string
+  emailFromName?: string
   bcc?: string
   replyTo?: string
+  replyToName?: string
   subject: string
   message?: any // TODO: configure rich text type
 }