Skip to content

Commit 79107fa

Browse files
fascinosumfascinosum
authored
Merge pull request #139 from magento-l3/L3_PR_21-12-10
L3_PR_21-12-10
2 parents 8e011c4 + 04cf933 commit 79107fa

File tree

12 files changed

+211
-10
lines changed

12 files changed

+211
-10
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/AddTextToHtmlCodeWYSIWYGActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="addTextToHtmlCodeWYSIWYGActionGroup">
11+
<arguments>
12+
<argument name="selector" type="string"/>
13+
<argument name="text" type="string"/>
14+
</arguments>
15+
<waitForPageLoad stepKey="waitForPageLoad"/>
16+
<waitForElement time="2" selector="{{selector}}" stepKey="waitForElementVisible"/>
17+
<!-- Workaround to insert UTF8 MB4 characters -->
18+
<executeJS function="node=document.evaluate('{{selector}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue; node.value += '{{text}}'; node.dispatchEvent(new Event('change')); return 1;" stepKey="testVariable"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/RemoveTextFromHtmlCodeWYSIWYGActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="removeTextFromHtmlCodeWYSIWYGActionGroup">
11+
<arguments>
12+
<argument name="selector" type="string"/>
13+
<argument name="text" type="string"/>
14+
</arguments>
15+
<waitForPageLoad stepKey="waitForPageLoad"/>
16+
<waitForElement time="2" selector="{{selector}}" stepKey="waitForElementVisible"/>
17+
<!-- Workaround to remove UTF8 MB4 characters -->
18+
<executeJS function="node=document.evaluate('{{selector}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;node.value = node.value.replace(new RegExp('{{text}}'), ''); node.dispatchEvent(new Event('change')); return 1;" stepKey="testVariable"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnStageSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<element name="allHtml" type="text" selector="[data-content-type=html]"/>
1212
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'text: data.main.html') or contains(@class,'placeholder-html-empty')])[{{arg1}}]" parameterized="true"/>
1313
<element name="baseCSS" type="text" selector="[data-content-type=html][data-element=main]"/>
14+
<element name="baseErrorLabel" type="text" selector="//aside//div[@data-index='general']/descendant::*[@name='html']/following-sibling::label"/>
1415
<element name="hidden" type="text" selector="(//*[@data-content-type='html'])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>
1516
<element name="notHidden" type="text" selector="(//div[contains(@class,'pagebuilder-html')])[{{arg1}}]/parent::*[contains(@class, 'pagebuilder-content-type-wrapper') and not(contains(@class, 'pagebuilder-content-type-hidden'))][1]" parameterized="true"/>
1617
<element name="empty" type="text" selector="(//div[contains(@class,'placeholder-html-empty')])[{{arg1}}]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageContentValidationTest.xml

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="PageBuilderCMSPageContentValidationTest">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="HTML Code"/>
14+
<title value="Validate UTF-8 MB4 does not break HTML content"/>
15+
<description value="Validate that updating the General form for Html with UTF-8 MB4 will not break the text after on the Stage and Storefront."/>
16+
<severity value="AVERAGE"/>
17+
<useCaseId value="ACP2E-103"/>
18+
<testCaseId value="AC-1539"/>
19+
<group value="pagebuilder"/>
20+
<group value="pagebuilder-html"/>
21+
</annotations>
22+
<before>
23+
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
24+
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
25+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
26+
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
27+
<argument name="CMSPage" value="$$createCMSPage$$"/>
28+
</actionGroup>
29+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
30+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
31+
<argument name="contentType" value="PageBuilderRowContentType"/>
32+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
33+
</actionGroup>
34+
</before>
35+
<after>
36+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
37+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
38+
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
39+
</after>
40+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
41+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
42+
</actionGroup>
43+
<actionGroup ref="dragContentTypeToStage" stepKey="dragHtmlIntoStage">
44+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
45+
</actionGroup>
46+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
47+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
48+
</actionGroup>
49+
<actionGroup ref="fillSlideOutPanelTextArea" stepKey="enterHtmlContent">
50+
<argument name="property" value="PageBuilderHtmlPropertyButton"/>
51+
</actionGroup>
52+
<actionGroup ref="addTextToHtmlCodeWYSIWYGActionGroup" stepKey="enterWrongHtmlContent">
53+
<argument name="selector" value="{{EditPanelForm.panelFieldControl('general', 'html')}}"/>
54+
<argument name="text" value="\u{1F600}"/>
55+
</actionGroup>
56+
<click selector="{{EditPanelForm.editFormSave}}" stepKey="clickSaveButton"/>
57+
<waitForElementVisible selector="{{HtmlOnStage.baseErrorLabel}}" stepKey="waitForHtmlBaseErrorLabelStage1"/>
58+
<grabTextFrom selector="{{HtmlOnStage.baseErrorLabel}}" stepKey="grabTextFromErrorLabel"/>
59+
<assertStringContainsString stepKey="assertErrorMessage">
60+
<expectedResult type="string">Please remove invalid characters</expectedResult>
61+
<actualResult type="variable">grabTextFromErrorLabel</actualResult>
62+
</assertStringContainsString>
63+
<actionGroup ref="removeTextFromHtmlCodeWYSIWYGActionGroup" stepKey="removeWrongHtmlContent">
64+
<argument name="selector" value="{{EditPanelForm.panelFieldControl('general', 'html')}}"/>
65+
<argument name="text" value="\u{1F600}"/>
66+
</actionGroup>
67+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
68+
<waitForElementNotVisible selector="{{HtmlOnStage.baseErrorLabel}}" stepKey="waitForHtmlBaseErrorLabelRemovedStage1"/>
69+
70+
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
71+
<argument name="contentType" value="PageBuilderTextContentType"/>
72+
</actionGroup>
73+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openTextEditMenuOnStage">
74+
<argument name="contentType" value="PageBuilderTextContentType"/>
75+
</actionGroup>
76+
<fillField selector="{{TextOnConfiguration.textArea}}" userInput="Hello Page From PageBuilder" stepKey="addTextToEditor"/>
77+
<actionGroup ref="addTextToHtmlCodeWYSIWYGActionGroup" stepKey="enterWrongTextContent">
78+
<argument name="selector" value="//textarea[@id=&quot;{{TextOnConfiguration.textAreaId}}&quot;][1]"/>
79+
<argument name="text" value="\u{1F600}"/>
80+
</actionGroup>
81+
82+
<actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveTextEditPanelSettings"/>
83+
84+
<!-- Validate Stage -->
85+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
86+
<waitForElementVisible selector="{{HtmlOnStage.base('1')}}" stepKey="waitForHtmlBaseStage1"/>
87+
<waitForElementVisible selector="{{HtmlOnStage.html('1', PageBuilderHtmlPropertyButton.selector)}}" stepKey="waitForHtmlStage1"/>
88+
<executeJS function="return document.querySelectorAll('{{HtmlOnStage.baseCSS}}')[0].innerText;" stepKey="actualTextFromHtmlCode"/>
89+
<assertStringContainsString stepKey="assertButtonOnStage">
90+
<expectedResult type="string">{{PageBuilderHtmlPropertyButton.value}}</expectedResult>
91+
<actualResult type="variable">actualTextFromHtmlCode</actualResult>
92+
</assertStringContainsString>
93+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
94+
95+
<!-- Cannot save invalid text-->
96+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
97+
<waitForElementVisible selector="//div[contains(@class, &quot;field-page-builder&quot;)]//label[@class=&quot;admin__field-error&quot;]" stepKey="waitForErrorLabelVisible"/>
98+
<grabTextFrom selector="//div[contains(@class, &quot;field-page-builder&quot;)]//label[@class=&quot;admin__field-error&quot;]" stepKey="grabTextFromErrorLabel2"/>
99+
<assertStringContainsString stepKey="assertErrorMessage2">
100+
<expectedResult type="string">Please remove invalid characters</expectedResult>
101+
<actualResult type="variable">grabTextFromErrorLabel2</actualResult>
102+
</assertStringContainsString>
103+
104+
<!-- Fix error and save again -->
105+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageToFixText"/>
106+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openTextEditMenuOnStageToFixText">
107+
<argument name="contentType" value="PageBuilderTextContentType"/>
108+
</actionGroup>
109+
<actionGroup ref="removeTextFromHtmlCodeWYSIWYGActionGroup" stepKey="removeWrongTextContent">
110+
<argument name="selector" value="//textarea[@id=&quot;{{TextOnConfiguration.textAreaId}}&quot;][1]"/>
111+
<argument name="text" value="\u{1F600}"/>
112+
</actionGroup>
113+
<actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveTextEditPanelSettings2"/>
114+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
115+
<waitForElementNotVisible selector="//div[contains(@class, &quot;field-page-builder&quot;)]//label[@class=&quot;admin__field-error&quot;]" stepKey="waitForErrorLabelNotVisible"/>
116+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage2"/>
117+
118+
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
119+
<argument name="page" value="$$createCMSPage.identifier$$"/>
120+
</actionGroup>
121+
<!-- Validate Storefront -->
122+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
123+
<waitForElementVisible selector="{{HtmlOnStorefront.base('1')}}" stepKey="waitForHtmlBaseStorefront"/>
124+
<waitForElementVisible selector="{{HtmlOnStorefront.html('1', PageBuilderHtmlPropertyButton.selectorOnFrontend)}}" stepKey="waitForHtmlStorefront"/>
125+
<waitForElementVisible selector="{{TextOnStorefront.allText}}" stepKey="waitForTextStorefront"/>
126+
<grabTextFrom selector="{{TextOnStorefront.allText}}" stepKey="grabTextFromText"/>
127+
<assertStringContainsString stepKey="assertTextOnStoreFront">
128+
<expectedResult type="string">Hello Page From PageBuilder</expectedResult>
129+
<actualResult type="variable">grabTextFromText</actualResult>
130+
</assertStringContainsString>
131+
</test>
132+
</tests>

‎app/code/Magento/PageBuilder/view/adminhtml/ui_component/cms_page_form.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
9+
<fieldset name="content">
10+
<field name="content_heading">
11+
<settings>
12+
<validation>
13+
<rule name="validate-no-utf8mb4-characters" xsi:type="boolean">true</rule>
14+
</validation>
15+
</settings>
16+
</field>
17+
<field name="content">
18+
<settings>
19+
<validation>
20+
<rule name="validate-no-utf8mb4-characters" xsi:type="boolean">true</rule>
21+
</validation>
22+
</settings>
23+
</field>
24+
</fieldset>
25+
</form>

‎app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_html_form.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@
8787
</additionalClasses>
8888
<dataScope>html</dataScope>
8989
<dataType>text</dataType>
90+
<validation>
91+
<rule name="validate-no-utf8mb4-characters" xsi:type="boolean">true</rule>
92+
</validation>
9093
<placeholder translate="true">Enter HTML, CSS or JavaScript code</placeholder>
9194
<notice translate="true">HTML code must be valid, all CSS &amp; JavaScript must be wrapped in their HTML elements.</notice>
9295
</settings>

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/mass-converter/widget-directive-abstract.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/editor.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/nesting-widget-dialog.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/widget-directive-abstract.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default class WidgetDirectiveAbstract implements ConverterInterface {
1919
let attributes: object = {};
2020

2121
get<string>(data, config.html_variable)
22-
.replace(/\{\{widget(.*?)\}\}/i, ((match: string, attributeString: string) => {
22+
.replace(/\{\{widget([\S\s]*?)\}\}/i, ((match: string, attributeString: string) => {
2323
attributes = this.parseAttributesString(attributeString);
2424
}).bind(this));
2525

‎app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/editor.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ function convertVariablesToHtmlPreview(content: string) {
107107
function convertWidgetsToHtmlPreview(content: string) {
108108
const config = Config.getConfig("tinymce").widgets;
109109

110-
return content.replace(/\{\{widget(.*?)\}\}/ig, (match, widgetBody) => {
110+
return content.replace(/\{\{widget([\S\s]*?)\}\}/ig, (match, widgetBody) => {
111111
const attributes = parseAttributesString(widgetBody);
112112
let imageSrc;
113113

@@ -431,7 +431,7 @@ function normalizeTableCellSelection(range: Range): Range {
431431
* @returns {string}
432432
*/
433433
export function escapeDoubleQuoteWithinWidgetDirective(content: string): string {
434-
return content.replace(/\{\{widget.*?\}\}/ig, (match: string) => {
434+
return content.replace(/\{\{widget[\S\s]*?\}\}/ig, (match: string) => {
435435
return match.replace(/&quot;/g, "\\\"");
436436
});
437437
}
@@ -443,7 +443,7 @@ export function escapeDoubleQuoteWithinWidgetDirective(content: string): string
443443
* @returns {string}
444444
*/
445445
export function unescapeDoubleQuoteWithinWidgetDirective(content: string): string {
446-
return content.replace(/\{\{widget.*?\}\}/ig, (match: string) => {
446+
return content.replace(/\{\{widget[\S\s]*?\}\}/ig, (match: string) => {
447447
return match.replace(/\\+"/g, "&quot;");
448448
});
449449
}

‎app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/nesting-widget-dialog.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default function nestingWidgetDialog(
2828
const dataStoreContent = dataStore.getState() as DataObject;
2929
const inlineMessage = dataStoreContent[inlineMessageField] as string;
3030
const linkUrl = dataStoreContent[linkUrlField] as FieldDefaultsInterface;
31-
const widgetRegex = /\{\{widget(.*?)\}\}/ig;
31+
const widgetRegex = /\{\{widget([\S\s]*?)\}\}/ig;
3232
const widgetPlaceholderRegex = /<span.*(class=)(\"|\').*((magento-placeholder).*(magento-widget)|(magento-widget).*(magento-placeholder)).*<\/span>/igm;
3333

3434
if (wysiwyg &&

0 commit comments

Comments
 (0)