Skip to content

Commit 2431429

Browse files
irenelagnoirenelagno
committed
MC-2245: Build stabilization
1 parent 6618efd commit 2431429

File tree

6 files changed

+20
-35
lines changed

6 files changed

+20
-35
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Data/HtmlData.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@
1616
<data key="role">html</data>
1717
<data key="value">Type your HTML here...</data>
1818
</entity>
19-
<entity name="PageBuilderHtmlProperty_Empty" type="pagebuilder_html_property">
20-
<data key="name">HTML</data>
21-
<data key="section">general</data>
22-
<data key="fieldName">html</data>
23-
<data key="role">html</data>
24-
<data key="value"/>
25-
<data key="errorMessage">This is a required field.</data>
26-
</entity>
2719
<entity name="PageBuilderHtmlPropertyButton" type="pagebuilder_html_property">
2820
<data key="name">HTML</data>
2921
<data key="section">general</data>

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1010
<section name="HtmlOnStage">
11-
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'html: data.main.html')])[{{arg1}}]" parameterized="true"/>
12-
<element name="html" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'html: data.main.html')])[{{arg1}}]{{arg2}}" parameterized="true"/>
11+
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'text: data.main.html')])[{{arg1}}]" parameterized="true"/>
12+
<element name="html" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'text: data.main.html')])[{{arg1}}]{{arg2}}" parameterized="true"/>
1313
<!-- Advanced Configuration -->
14-
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'html: data.main.html')])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
15-
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'html: data.main.html')])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
16-
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'html: data.main.html')])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
17-
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'html: data.main.html')])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
18-
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'html: data.main.html')])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
19-
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'html: data.main.html')])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
20-
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'html: data.main.html')])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
21-
<element name="cssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'html: data.main.html')])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
22-
<element name="noCssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'html: data.main.html')])[{{arg1}}][not(@class)]" parameterized="true"/>
23-
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'html: data.main.html')])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
24-
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'html: data.main.html')])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
14+
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'text: data.main.html')])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
15+
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'text: data.main.html')])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
16+
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'text: data.main.html')])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
17+
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'text: data.main.html')])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
18+
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'text: data.main.html')])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
19+
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'text: data.main.html')])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
20+
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'text: data.main.html')])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
21+
<element name="cssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'text: data.main.html')])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
22+
<element name="noCssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'text: data.main.html')])[{{arg1}}][not(@class)]" parameterized="true"/>
23+
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'text: data.main.html')])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
24+
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'text: data.main.html')])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
2525
</section>
2626
<section name="HtmlOnStorefront">
2727
<element name="base" type="text" selector="(//div[@data-role='html'])[{{arg1}}]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,9 @@
319319
</actionGroup>
320320
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
321321
<!-- Update Values -->
322+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterHtmlContent">
323+
<argument name="property" value="PageBuilderHtmlPropertyButton"/>
324+
</actionGroup>
322325
<comment userInput="Update Values" stepKey="commentUpdateValues"/>
323326
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
324327
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
@@ -746,13 +749,6 @@
746749
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
747750
<argument name="contentType" value="PageBuilderHtmlContentType"/>
748751
</actionGroup>
749-
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="clearHTMLField">
750-
<argument name="property" value="PageBuilderHtmlProperty_Empty"/>
751-
</actionGroup>
752-
<!-- Validate Error Message -->
753-
<comment userInput="Validate Error Message" stepKey="commentValidateError"/>
754-
<waitForElementVisible selector="{{HTMLOnConfiguration.htmlFieldError}}" stepKey="waitForFieldError"/>
755-
<waitForElementVisible selector="{{HTMLOnConfiguration.htmlFieldErrorMessage(PageBuilderHtmlProperty_Empty.errorMessage)}}" stepKey="waitForErrorMessage"/>
756752
<!-- Validate Cannot Save -->
757753
<comment userInput="Validate Cannot Save" stepKey="commentValidateCannotSave"/>
758754
<waitForElementVisible time="5" selector="{{PageBuilderActionsSection.editFormSave}}" stepKey="waitForColumnSaveButton"/>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@
8888
<dataScope>html</dataScope>
8989
<dataType>text</dataType>
9090
<placeholder translate="true">Enter HTML, CSS or JavaScript code</placeholder>
91-
<validation>
92-
<rule name="required-entry" xsi:type="boolean">true</rule>
93-
</validation>
9491
</settings>
9592
</field>
9693
</fieldset>

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/html/_default.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
background-color: @color-gray98;
1616
color: @color-gray65-lighten;
1717
display: flex;
18-
justify-content: center;
1918
height: 60px;
19+
justify-content: center;
2020
position: relative;
2121
}
2222
.placeholder-html-code {
23+
background-color: @color-gray98;
2324
font-family: @font-family__console;
2425
font-weight: @font-weight__light;
25-
position: relative;
2626
height: 60px;
2727
overflow: hidden;
28-
background-color: @color-gray98;
28+
position: relative;
2929
white-space: pre;
3030
&:before {
3131
background: linear-gradient(to bottom, rgba(0,0,0,0) 0%, @color-gray98 100%);

‎app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/html/default/preview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<div class="pagebuilder-content-type pagebuilder-html" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
99
<div class="placeholder-html-code" if="data.main.html" attr="data.main.attributes" css="data.main.css" ko-style="data.main.style" text="data.main.html"></div>
10-
<div class="placeholder-html-empty" ifnot="data.main.html" attr="data.main.attributes" ko-style="data.main.style" translate="'Enter HTML, CSS or JavaScript code here'" css="data.main.css" >
10+
<div class="placeholder-html-empty" ifnot="data.main.html" attr="data.main.attributes" ko-style="data.main.style" translate="'Enter HTML, CSS or JavaScript code'" css="data.main.css" >
1111
</div>
1212
<render args="getOptions().template" />
1313
</div>

0 commit comments

Comments
 (0)