Skip to content

Commit 31ccd71

Browse files
committed
Display user-friendly name in notice.
1 parent 204b86c commit 31ccd71

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

includes/blocks/mailchimp/variation-picker.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ const getHiddenRequiredFields = (variation) => {
3232

3333
const requiredFields = merge_fields.filter((field) => field.required).map((field) => field.tag);
3434
const variationFields = formFields[variationName] || [];
35-
return requiredFields.filter((field) => !variationFields.includes(field));
35+
return requiredFields
36+
.filter((field) => !variationFields.includes(field))
37+
.map((field) => formFieldTitles[field] || field);
3638
};
3739

3840
export const VariationPicker = ({ name, setAttributes, clientId }) => {
@@ -50,7 +52,7 @@ export const VariationPicker = ({ name, setAttributes, clientId }) => {
5052
[name],
5153
);
5254
const { replaceInnerBlocks } = useDispatch(blockEditorStore);
53-
const { createNotice } = useDispatch('core/notices');
55+
const { createNotice, removeNotice } = useDispatch('core/notices');
5456
const blockProps = useBlockProps();
5557

5658
return (
@@ -69,6 +71,10 @@ export const VariationPicker = ({ name, setAttributes, clientId }) => {
6971
const missingFields = getMissingFields(nextVariation);
7072
const hiddenRequiredFields = getHiddenRequiredFields(nextVariation);
7173

74+
// Remove any existing notices.
75+
removeNotice('mailchimp-form-template-required-field-notice');
76+
removeNotice('mailchimp-form-template-field-notice');
77+
7278
replaceInnerBlocks(
7379
clientId,
7480
createBlocksFromInnerBlocksTemplate(nextVariation.innerBlocks),
@@ -85,6 +91,10 @@ export const VariationPicker = ({ name, setAttributes, clientId }) => {
8591
),
8692
hiddenRequiredFields.join(', '),
8793
),
94+
{
95+
id: 'mailchimp-form-template-required-field-notice',
96+
isDismissible: true,
97+
},
8898
);
8999
}
90100

0 commit comments

Comments
 (0)