From dea4d508210fe01694cbde110c8d8e6afade95b3 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Tue, 30 Aug 2022 16:16:07 -0700
Subject: [PATCH] IO-1949 Add additional buttons to email overlay.

---
 bodyshop_translations.babel                   | 21 ++++++
 .../email-overlay/email-overlay.container.jsx | 69 ++++++++++++++-----
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 5 files changed, 77 insertions(+), 16 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 776e3e524..60953c7a6 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -15416,6 +15416,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>send</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>senderrortosupport</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/email-overlay/email-overlay.container.jsx b/client/src/components/email-overlay/email-overlay.container.jsx
index 95ad60426..5a939ae31 100644
--- a/client/src/components/email-overlay/email-overlay.container.jsx
+++ b/client/src/components/email-overlay/email-overlay.container.jsx
@@ -1,4 +1,4 @@
-import { Divider, Form, Modal, notification } from "antd";
+import { Button, Divider, Form, Modal, notification, Space } from "antd";
 import axios from "axios";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -180,8 +180,10 @@ export function EmailOverlayContainer({
       onCancel={() => {
         toggleEmailOverlayVisible();
       }}
+      okText={t("general.actions.send")}
       okButtonProps={{
         loading: sending,
+
         disabled:
           selectedMedia &&
           (selectedMedia
@@ -191,21 +193,56 @@ export function EmailOverlayContainer({
             selectedMedia.filter((s) => s.isSelected).length > 10),
       }}
     >
-      <Form layout="vertical" form={form} onFinish={handleFinish}>
-        {loading && (
-          <div>
-            <LoadingSkeleton />
-            <Divider>{t("emails.labels.preview")}</Divider>
-            <LoadingSpinner message={t("emails.labels.generatingemail")} />
-          </div>
-        )}
-        {!loading && (
-          <EmailOverlayComponent
-            form={form}
-            selectedMediaState={[selectedMedia, setSelectedMedia]}
-          />
-        )}
-      </Form>
+      <div>
+        <div
+          style={{
+            marginTop: "1rem",
+            display: "flex",
+            justifyContent: "flex-end",
+          }}
+        >
+          <Space style={{ alignSelf: "flex-end" }} align="right">
+            <Button
+              onClick={() => {
+                toggleEmailOverlayVisible();
+              }}
+            >
+              {t("general.actions.cancel")}
+            </Button>
+            <Button
+              loading={sending}
+              onClick={() => form.submit()}
+              disabled={
+                selectedMedia &&
+                (selectedMedia
+                  .filter((s) => s.isSelected)
+                  .reduce((acc, val) => (acc = acc + val.size), 0) >=
+                  10485760 - new Blob([form.getFieldValue("html")]).size ||
+                  selectedMedia.filter((s) => s.isSelected).length > 10)
+              }
+              type="primary"
+            >
+              {t("general.actions.send")}
+            </Button>
+          </Space>
+        </div>
+        <Form layout="vertical" form={form} onFinish={handleFinish}>
+          {loading && (
+            <div>
+              <LoadingSkeleton />
+              <Divider>{t("emails.labels.preview")}</Divider>
+              <LoadingSpinner message={t("emails.labels.generatingemail")} />
+            </div>
+          )}
+
+          {!loading && (
+            <EmailOverlayComponent
+              form={form}
+              selectedMediaState={[selectedMedia, setSelectedMedia]}
+            />
+          )}
+        </Form>
+      </div>
     </Modal>
   );
 }
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 81da5a4d8..eacfb5b06 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -964,6 +964,7 @@
 				"save": "Save",
 				"saveandnew": "Save and New",
 				"selectall": "Select All",
+				"send": "Send",
 				"senderrortosupport": "Send Error to Support",
 				"submit": "Submit",
 				"tryagain": "Try Again",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 713cacc30..57e0e7ad8 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -964,6 +964,7 @@
 				"save": "Salvar",
 				"saveandnew": "",
 				"selectall": "",
+				"send": "",
 				"senderrortosupport": "",
 				"submit": "",
 				"tryagain": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 566c5e541..fbf06c781 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -964,6 +964,7 @@
 				"save": "sauvegarder",
 				"saveandnew": "",
 				"selectall": "",
+				"send": "",
 				"senderrortosupport": "",
 				"submit": "",
 				"tryagain": "",