From 3bc5193509b2932bbe4794afca41cd60fa651ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Heli=20H=C3=A5rd=20K=C3=A4lloff?= Date: Fri, 27 Dec 2024 16:42:35 +0100 Subject: [PATCH 1/6] add error message for when button in email still has its default text --- .../EmailEditor/EmailSettings/ButtonBlockListItem.tsx | 6 +++++- src/features/emails/l10n/messageIds.ts | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/features/emails/components/EmailEditor/EmailSettings/ButtonBlockListItem.tsx b/src/features/emails/components/EmailEditor/EmailSettings/ButtonBlockListItem.tsx index 74d9a68bae..89532f7e86 100644 --- a/src/features/emails/components/EmailEditor/EmailSettings/ButtonBlockListItem.tsx +++ b/src/features/emails/components/EmailEditor/EmailSettings/ButtonBlockListItem.tsx @@ -39,7 +39,11 @@ const ButtonBlockListItem: FC = ({ hasErrors={hasErrors} readOnly={readOnly} selected={selected} - title={messages.editor.tools.button.title()} + title={ + data.buttonText + ? messages.editor.tools.button.title() + : messages.editor.tools.button.settings.defaultButtonTextWarning() + } > diff --git a/src/features/emails/l10n/messageIds.ts b/src/features/emails/l10n/messageIds.ts index 8efd2c6b60..8bc2fd5399 100644 --- a/src/features/emails/l10n/messageIds.ts +++ b/src/features/emails/l10n/messageIds.ts @@ -63,6 +63,7 @@ export default makeMessages('feat.emails', { noButtonText: m('Click to change this text!'), }, settings: { + defaultButtonTextWarning: m('This button still has the default text'), invalidUrl: m('This is not a valid link'), testLink: m('Click to test link'), urlLabel: m('Link url'), From 809a958ac7db9acfc12b19f0717b4fad8f298fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Heli=20H=C3=A5rd=20K=C3=A4lloff?= Date: Sat, 28 Dec 2024 00:55:44 +0100 Subject: [PATCH 2/6] revert to button title --- .../EmailEditor/EmailSettings/ButtonBlockListItem.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/features/emails/components/EmailEditor/EmailSettings/ButtonBlockListItem.tsx b/src/features/emails/components/EmailEditor/EmailSettings/ButtonBlockListItem.tsx index 89532f7e86..74d9a68bae 100644 --- a/src/features/emails/components/EmailEditor/EmailSettings/ButtonBlockListItem.tsx +++ b/src/features/emails/components/EmailEditor/EmailSettings/ButtonBlockListItem.tsx @@ -39,11 +39,7 @@ const ButtonBlockListItem: FC = ({ hasErrors={hasErrors} readOnly={readOnly} selected={selected} - title={ - data.buttonText - ? messages.editor.tools.button.title() - : messages.editor.tools.button.settings.defaultButtonTextWarning() - } + title={messages.editor.tools.button.title()} > From 2b0cd2e2f6e03c0ca1e8772f18c7c451343b5098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Heli=20H=C3=A5rd=20K=C3=A4lloff?= Date: Sat, 28 Dec 2024 00:57:09 +0100 Subject: [PATCH 3/6] change warning message --- src/features/emails/l10n/messageIds.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/emails/l10n/messageIds.ts b/src/features/emails/l10n/messageIds.ts index 8bc2fd5399..ce72cd871c 100644 --- a/src/features/emails/l10n/messageIds.ts +++ b/src/features/emails/l10n/messageIds.ts @@ -63,7 +63,7 @@ export default makeMessages('feat.emails', { noButtonText: m('Click to change this text!'), }, settings: { - defaultButtonTextWarning: m('This button still has the default text'), + buttonTextWarning: m('Make sure to add your text to the button'), invalidUrl: m('This is not a valid link'), testLink: m('Click to test link'), urlLabel: m('Link url'), From ed036386ca391fadc91d0536ada34fb63f3d7b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Heli=20H=C3=A5rd=20K=C3=A4lloff?= Date: Sat, 28 Dec 2024 01:10:29 +0100 Subject: [PATCH 4/6] add missing button text to block problems --- .../components/EmailEditor/EmailSettings/utils/blockProblems.ts | 2 ++ src/features/emails/types.ts | 1 + 2 files changed, 3 insertions(+) diff --git a/src/features/emails/components/EmailEditor/EmailSettings/utils/blockProblems.ts b/src/features/emails/components/EmailEditor/EmailSettings/utils/blockProblems.ts index 53b493243b..34304f9b2f 100644 --- a/src/features/emails/components/EmailEditor/EmailSettings/utils/blockProblems.ts +++ b/src/features/emails/components/EmailEditor/EmailSettings/utils/blockProblems.ts @@ -13,6 +13,8 @@ export default function blockProblems(block: OutputBlockData): BlockProblem[] { if (!block.data.buttonText) { blockProblems.push(BlockProblem.DEFAULT_BUTTON_TEXT); + } else if (!block.data.buttonText.replaceAll(' ', '').trim().length) { + blockProblems.push(BlockProblem.BUTTON_TEXT_MISSING); } } else if (block.type === BLOCK_TYPES.PARAGRAPH) { const container = document.createElement('div'); diff --git a/src/features/emails/types.ts b/src/features/emails/types.ts index 0214d20575..46841498e2 100644 --- a/src/features/emails/types.ts +++ b/src/features/emails/types.ts @@ -108,6 +108,7 @@ export type EmailContent = { export enum BlockProblem { INVALID_BUTTON_URL = 'invalidButtonURL', DEFAULT_BUTTON_TEXT = 'defaultButtonText', + BUTTON_TEXT_MISSING = 'missingButtonText', INVALID_LINK_URL = 'invalidLinkURL', } From 85e5a7d5359764e9516f0287979da20f8864469b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Heli=20H=C3=A5rd=20K=C3=A4lloff?= Date: Sat, 28 Dec 2024 01:34:48 +0100 Subject: [PATCH 5/6] display warning message --- .../EmailEditor/EmailSettings/ButtonBlockListItem.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/features/emails/components/EmailEditor/EmailSettings/ButtonBlockListItem.tsx b/src/features/emails/components/EmailEditor/EmailSettings/ButtonBlockListItem.tsx index 74d9a68bae..f5818b0b7a 100644 --- a/src/features/emails/components/EmailEditor/EmailSettings/ButtonBlockListItem.tsx +++ b/src/features/emails/components/EmailEditor/EmailSettings/ButtonBlockListItem.tsx @@ -33,6 +33,9 @@ const ButtonBlockListItem: FC = ({ }, 400); const error = inputValue.length > 0 && !formatUrl(inputValue); + const buttonTextError = + !data.buttonText?.replaceAll(' ', '').trim().length || + !data.buttonText; return ( = ({ selected={selected} title={messages.editor.tools.button.title()} > + {buttonTextError && ( + + )} Date: Sat, 28 Dec 2024 04:29:03 +0100 Subject: [PATCH 6/6] amend enum --- src/features/emails/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/emails/types.ts b/src/features/emails/types.ts index 46841498e2..ab3657ca31 100644 --- a/src/features/emails/types.ts +++ b/src/features/emails/types.ts @@ -108,7 +108,7 @@ export type EmailContent = { export enum BlockProblem { INVALID_BUTTON_URL = 'invalidButtonURL', DEFAULT_BUTTON_TEXT = 'defaultButtonText', - BUTTON_TEXT_MISSING = 'missingButtonText', + BUTTON_TEXT_MISSING = 'buttonTextMissing', INVALID_LINK_URL = 'invalidLinkURL', }