From 3896a0b03df9954188a35f17bef760ddce7419be Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 24 Mar 2022 14:54:36 -0600
Subject: [PATCH] IO-1799 Change from address for emails.

---
 bodyshop_translations.babel                   | 42 +++++++++++++++++++
 .../email-overlay/email-overlay.component.jsx | 35 +++++++++++++++-
 .../email-overlay/email-overlay.container.jsx | 12 +++---
 .../shop-info/shop-info.general.component.jsx | 13 ++++++
 client/src/graphql/bodyshop.queries.js        |  2 +
 client/src/translations/en_us/common.json     |  2 +
 client/src/translations/es/common.json        |  2 +
 client/src/translations/fr/common.json        |  2 +
 hasura/metadata/tables.yaml                   |  2 +
 .../down.sql                                  |  4 ++
 .../up.sql                                    |  2 +
 11 files changed, 111 insertions(+), 7 deletions(-)
 create mode 100644 hasura/migrations/1648154167416_alter_table_public_bodyshops_add_column_md_from_emails/down.sql
 create mode 100644 hasura/migrations/1648154167416_alter_table_public_bodyshops_add_column_md_from_emails/up.sql

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 28764f991..fe1e7a2a0 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -4598,6 +4598,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>md_from_emails</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <folder_node>
                                         <name>md_hour_split</name>
                                         <children>
@@ -13231,6 +13252,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>from</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>subject</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/email-overlay/email-overlay.component.jsx b/client/src/components/email-overlay/email-overlay.component.jsx
index 6826eba76..baf52d376 100644
--- a/client/src/components/email-overlay/email-overlay.component.jsx
+++ b/client/src/components/email-overlay/email-overlay.component.jsx
@@ -16,9 +16,14 @@ import EmailDocumentsComponent from "../email-documents/email-documents.componen
 import _ from "lodash";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -28,7 +33,12 @@ export default connect(
   mapDispatchToProps
 )(EmailOverlayComponent);
 
-export function EmailOverlayComponent({ form, selectedMediaState, bodyshop }) {
+export function EmailOverlayComponent({
+  form,
+  selectedMediaState,
+  bodyshop,
+  currentUser,
+}) {
   const { t } = useTranslation();
   const handleClick = ({ item, key, keyPath }) => {
     const email = item.props.value;
@@ -51,6 +61,27 @@ export function EmailOverlayComponent({ form, selectedMediaState, bodyshop }) {
 
   return (
     <div>
+      <Form.Item
+        label={t("emails.fields.from")}
+        name="from"
+        rules={[
+          {
+            required: true,
+            //message: t("general.validation.required"),
+          },
+        ]}
+      >
+        <Select>
+          <Select.Option key={currentUser.email}>
+            {currentUser.email}
+          </Select.Option>
+          <Select.Option key={bodyshop.email}>{bodyshop.email}</Select.Option>
+          {bodyshop.md_from_emails &&
+            bodyshop.md_from_emails.map((e) => (
+              <Select.Option key={e}>{e}</Select.Option>
+            ))}
+        </Select>
+      </Form.Item>
       <Form.Item
         label={
           <Space>
diff --git a/client/src/components/email-overlay/email-overlay.container.jsx b/client/src/components/email-overlay/email-overlay.container.jsx
index c2dc7d261..9276f35ee 100644
--- a/client/src/components/email-overlay/email-overlay.container.jsx
+++ b/client/src/components/email-overlay/email-overlay.container.jsx
@@ -56,13 +56,9 @@ export function EmailOverlayContainer({
         : bodyshop.shopname,
       address: EmailSettings.fromAddress,
     },
-    ReplyTo: {
-      Email: currentUser.validemail ? currentUser.email : bodyshop.email,
-      Name: currentUser.displayName,
-    },
   };
 
-  const handleFinish = async (values) => {
+  const handleFinish = async (allValues) => {
     logImEXEvent("email_send_from_modal");
 
     //const attachments = [];
@@ -77,10 +73,15 @@ export function EmailOverlayContainer({
     //     attachments.push(t);
     //   });
 
+    const { from, ...values } = allValues;
     setSending(true);
     try {
       await axios.post("/sendemail", {
         ...defaultEmailFrom,
+        ReplyTo: {
+          Email: from,
+          Name: currentUser.displayName,
+        },
         ...values,
         html: rawHtml,
         attachments: [
@@ -138,6 +139,7 @@ export function EmailOverlayContainer({
     }
 
     form.setFieldsValue({
+      from: currentUser.validemail ? currentUser.email : bodyshop.email,
       ...emailConfig.messageOptions,
       cc:
         emailConfig.messageOptions.cc &&
diff --git a/client/src/components/shop-info/shop-info.general.component.jsx b/client/src/components/shop-info/shop-info.general.component.jsx
index 29288b9ee..186234adf 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -507,6 +507,19 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Switch />
         </Form.Item>
+        <Form.Item
+          name={["md_from_emails"]}
+          label={t("bodyshop.fields.md_from_emails")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+              type: "array",
+            },
+          ]}
+        >
+          <Select mode="tags" />
+        </Form.Item>
         <Form.Item
           name={["md_email_cc", "parts_order"]}
           label={t("bodyshop.fields.md_email_cc", { template: "parts_order" })}
diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js
index 88f9b7bec..0ce955c15 100644
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -102,6 +102,7 @@ export const QUERY_BODYSHOP = gql`
       md_email_cc
       timezone
       ss_configuration
+      md_from_emails
       employees {
         user_email
         id
@@ -201,6 +202,7 @@ export const UPDATE_SHOP = gql`
         md_email_cc
         timezone
         ss_configuration
+        md_from_emails
         employees {
           id
           first_name
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 595bd958f..0c456db00 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -285,6 +285,7 @@
 				"md_classes": "Classes",
 				"md_ded_notes": "Deductible Notes",
 				"md_email_cc": "Auto Email CC: $t(printcenter.subjects.jobs.{{template}})",
+				"md_from_emails": "Additional From Emails",
 				"md_hour_split": {
 					"paint": "Paint Hour Split",
 					"prep": "Prep Hour Split"
@@ -830,6 +831,7 @@
 			},
 			"fields": {
 				"cc": "CC",
+				"from": "From",
 				"subject": "Subject",
 				"to": "To"
 			},
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 3d3c44a0d..ea698ce2a 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -285,6 +285,7 @@
 				"md_classes": "",
 				"md_ded_notes": "",
 				"md_email_cc": "",
+				"md_from_emails": "",
 				"md_hour_split": {
 					"paint": "",
 					"prep": ""
@@ -830,6 +831,7 @@
 			},
 			"fields": {
 				"cc": "",
+				"from": "",
 				"subject": "",
 				"to": ""
 			},
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index d44d11e95..70f0141b2 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -285,6 +285,7 @@
 				"md_classes": "",
 				"md_ded_notes": "",
 				"md_email_cc": "",
+				"md_from_emails": "",
 				"md_hour_split": {
 					"paint": "",
 					"prep": ""
@@ -830,6 +831,7 @@
 			},
 			"fields": {
 				"cc": "",
+				"from": "",
 				"subject": "",
 				"to": ""
 			},
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 8473f5887..52650b30f 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -834,6 +834,7 @@
       - md_email_cc
       - md_estimators
       - md_filehandlers
+      - md_from_emails
       - md_hour_split
       - md_ins_cos
       - md_jobline_presets
@@ -916,6 +917,7 @@
       - md_email_cc
       - md_estimators
       - md_filehandlers
+      - md_from_emails
       - md_hour_split
       - md_ins_cos
       - md_jobline_presets
diff --git a/hasura/migrations/1648154167416_alter_table_public_bodyshops_add_column_md_from_emails/down.sql b/hasura/migrations/1648154167416_alter_table_public_bodyshops_add_column_md_from_emails/down.sql
new file mode 100644
index 000000000..00a90c958
--- /dev/null
+++ b/hasura/migrations/1648154167416_alter_table_public_bodyshops_add_column_md_from_emails/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "md_from_emails" jsonb
+--  null default jsonb_build_array();
diff --git a/hasura/migrations/1648154167416_alter_table_public_bodyshops_add_column_md_from_emails/up.sql b/hasura/migrations/1648154167416_alter_table_public_bodyshops_add_column_md_from_emails/up.sql
new file mode 100644
index 000000000..108bbd7e8
--- /dev/null
+++ b/hasura/migrations/1648154167416_alter_table_public_bodyshops_add_column_md_from_emails/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "md_from_emails" jsonb
+ null default jsonb_build_array();