Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Refactor blocks client id generating from form data

Browse Source 
[MAILPOET-2462]
This commit is contained in:
Rostislav Wolny
2019-12-11 11:19:05 +01:00
committed by Pavel Dohnal
parent d3bc831f69
commit a577680122
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/css/src/components/formEditor/components/_block_editor.scss
View File

@@ -23,8 +23,8 @@
// We don't want to allow user to remove Submit or Email.
// There is no way to hide the delete button programmatically so we hide last toolbar that contains the delete option
// There is a feature request for adding that into Gutenberg https://github.com/WordPress/gutenberg/issues/16364
#block-email,
#block-submit {
.wp-block[data-type='mailpoet-form/email-input'],
.wp-block[data-type='mailpoet-form/submit-button'] {
.components-toolbar:last-child {
display: none;
}

4
assets/js/src/form_editor/store/form_body_to_blocks.jsx
View File

@@ -8,7 +8,7 @@ export default (data) => {
}
return data.map((item, index) => {
const mapped = {
clientId: item.id,
clientId: `${item.id}_${index}`,
isValid: true,
innerBlocks: [],
attributes: {
@@ -68,13 +68,11 @@ export default (data) => {
return {
...mapped,
name: 'mailpoet-form/divider',
clientId: `divider_${index}`,
};
case 'html':
return {
...mapped,
name: 'mailpoet-form/custom-html',
clientId: `custom_html_${index}`,
attributes: {
content: item.params && item.params.text ? item.params.text : '',
},

16
tests/javascript/form_editor/store/form_body_to_blocks.spec.js
View File

@@ -114,7 +114,7 @@ describe('Form Body To Blocks', () => {
it('Should map email input to block', () => {
const [block] = formBodyToBlocks([{ ...emailInput, position: '1' }]);
checkBlockBasics(block);
expect(block.clientId).to.be.equal('email');
expect(block.clientId).to.be.equal('email_0');
expect(block.name).to.be.equal('mailpoet-form/email-input');
expect(block.attributes.label).to.be.equal('Email');
expect(block.attributes.labelWithinInput).to.be.equal(false);
@@ -130,7 +130,7 @@ describe('Form Body To Blocks', () => {
it('Should map first name input to block', () => {
const [block] = formBodyToBlocks([{ ...firstNameInput, position: '1' }]);
checkBlockBasics(block);
expect(block.clientId).to.be.equal('first_name');
expect(block.clientId).to.be.equal('first_name_0');
expect(block.name).to.be.equal('mailpoet-form/first-name-input');
expect(block.attributes.label).to.be.equal('First Name');
expect(block.attributes.labelWithinInput).to.be.equal(false);
@@ -149,7 +149,7 @@ describe('Form Body To Blocks', () => {
it('Should map last name input to block', () => {
const [block] = formBodyToBlocks([{ ...lastNameInput, position: '1' }]);
checkBlockBasics(block);
expect(block.clientId).to.be.equal('last_name');
expect(block.clientId).to.be.equal('last_name_0');
expect(block.name).to.be.equal('mailpoet-form/last-name-input');
expect(block.attributes.label).to.be.equal('Last Name');
expect(block.attributes.labelWithinInput).to.be.equal(false);
@@ -168,7 +168,7 @@ describe('Form Body To Blocks', () => {
it('Should map segments input to block', () => {
const [block] = formBodyToBlocks([{ ...segmentsInput, position: '1' }]);
checkBlockBasics(block);
expect(block.clientId).to.be.equal('segments');
expect(block.clientId).to.be.equal('segments_0');
expect(block.name).to.be.equal('mailpoet-form/segment-select');
expect(block.attributes.label).to.be.equal('Select list(s):');
expect(block.attributes.values).to.be.an('Array');
@@ -182,7 +182,7 @@ describe('Form Body To Blocks', () => {
input.params.values = undefined;
const [block] = formBodyToBlocks([input]);
checkBlockBasics(block);
expect(block.clientId).to.be.equal('segments');
expect(block.clientId).to.be.equal('segments_0');
expect(block.attributes.values).to.be.an('Array');
expect(block.attributes.values).to.have.length(0);
});
@@ -190,7 +190,7 @@ describe('Form Body To Blocks', () => {
it('Should map submit button to block', () => {
const [block] = formBodyToBlocks([{ ...submitInput, position: '1' }]);
checkBlockBasics(block);
expect(block.clientId).to.be.equal('submit');
expect(block.clientId).to.be.equal('submit_0');
expect(block.name).to.be.equal('mailpoet-form/submit-button');
expect(block.attributes.label).to.be.equal('Subscribe!');
});
@@ -214,11 +214,11 @@ describe('Form Body To Blocks', () => {
{ ...customHtml, position: '2', params: { text: 'nice one' } },
]);
checkBlockBasics(block1);
expect(block1.clientId).to.be.equal('custom_html_0');
expect(block1.clientId).to.be.equal('html_0');
expect(block1.name).to.be.equal('mailpoet-form/custom-html');
expect(block1.attributes.content).to.be.equal('123');
checkBlockBasics(block2);
expect(block2.clientId).to.be.equal('custom_html_1');
expect(block2.clientId).to.be.equal('html_1');
expect(block2.name).to.be.equal('mailpoet-form/custom-html');
expect(block2.attributes.content).to.be.equal('nice one');
});