IO-1937 Update email sizing error message.
This commit is contained in:
@@ -23,7 +23,7 @@ export default connect(
|
|||||||
|
|
||||||
export function EmailDocumentsComponent({
|
export function EmailDocumentsComponent({
|
||||||
emailConfig,
|
emailConfig,
|
||||||
|
form,
|
||||||
selectedMediaState,
|
selectedMediaState,
|
||||||
}) {
|
}) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
@@ -48,7 +48,8 @@ export function EmailDocumentsComponent({
|
|||||||
{selectedMedia &&
|
{selectedMedia &&
|
||||||
selectedMedia
|
selectedMedia
|
||||||
.filter((s) => s.isSelected)
|
.filter((s) => s.isSelected)
|
||||||
.reduce((acc, val) => (acc = acc + val.size), 0) >= 9961472 ? (
|
.reduce((acc, val) => (acc = acc + val.size), 0) >=
|
||||||
|
10485760 - new Blob([form.getFieldValue("html")]).size ? (
|
||||||
<div style={{ color: "red" }}>{t("general.errors.sizelimit")}</div>
|
<div style={{ color: "red" }}>{t("general.errors.sizelimit")}</div>
|
||||||
) : null}
|
) : null}
|
||||||
{data && (
|
{data && (
|
||||||
|
|||||||
@@ -162,7 +162,10 @@ export function EmailOverlayComponent({
|
|||||||
<Tabs>
|
<Tabs>
|
||||||
{!bodyshop.uselocalmediaserver && (
|
{!bodyshop.uselocalmediaserver && (
|
||||||
<Tabs.TabPane tab={t("emails.labels.documents")} key="documents">
|
<Tabs.TabPane tab={t("emails.labels.documents")} key="documents">
|
||||||
<EmailDocumentsComponent selectedMediaState={selectedMediaState} />
|
<EmailDocumentsComponent
|
||||||
|
selectedMediaState={selectedMediaState}
|
||||||
|
form={form}
|
||||||
|
/>
|
||||||
</Tabs.TabPane>
|
</Tabs.TabPane>
|
||||||
)}
|
)}
|
||||||
<Tabs.TabPane tab={t("emails.labels.attachments")} key="attachments">
|
<Tabs.TabPane tab={t("emails.labels.attachments")} key="attachments">
|
||||||
@@ -188,7 +191,8 @@ export function EmailOverlayComponent({
|
|||||||
0
|
0
|
||||||
);
|
);
|
||||||
|
|
||||||
const limit = 9961472;
|
const limit =
|
||||||
|
10485760 - new Blob([form.getFieldValue("html")]).size;
|
||||||
|
|
||||||
if (totalSize > limit) {
|
if (totalSize > limit) {
|
||||||
return Promise.reject(t("general.errors.sizelimit"));
|
return Promise.reject(t("general.errors.sizelimit"));
|
||||||
|
|||||||
@@ -168,7 +168,6 @@ export function EmailOverlayContainer({
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (modalVisible) render();
|
if (modalVisible) render();
|
||||||
}, [modalVisible]); // eslint-disable-line react-hooks/exhaustive-deps
|
}, [modalVisible]); // eslint-disable-line react-hooks/exhaustive-deps
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Modal
|
<Modal
|
||||||
destroyOnClose={true}
|
destroyOnClose={true}
|
||||||
@@ -178,7 +177,15 @@ export function EmailOverlayContainer({
|
|||||||
onCancel={() => {
|
onCancel={() => {
|
||||||
toggleEmailOverlayVisible();
|
toggleEmailOverlayVisible();
|
||||||
}}
|
}}
|
||||||
okButtonProps={{ loading: sending }}
|
okButtonProps={{
|
||||||
|
loading: sending,
|
||||||
|
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),
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<Form layout="vertical" form={form} onFinish={handleFinish}>
|
<Form layout="vertical" form={form} onFinish={handleFinish}>
|
||||||
{loading && (
|
{loading && (
|
||||||
|
|||||||
Reference in New Issue
Block a user