Skip to content

Commit 165150c

Browse files
author
Hwashiang Yu
committed
MC-5810: Improve naming of the critical variables/parameters in the code and configuration
- Changed data-role to data-content-type
1 parent 8e5dd9f commit 165150c

File tree

191 files changed

+938
-938
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+938
-938
lines changed

‎app/code/Magento/PageBuilder/Block/Adminhtml/Form/Element/ProductConditions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ private function getConfig(): array
8585
public function getConfigJson(): string
8686
{
8787
return $this->serializer->serialize([
88-
'[data-role=pagebuilder-conditions-form-placeholder-' . $this->getData('attribute') . ']' => [
88+
'[data-content-type=pagebuilder-conditions-form-placeholder-' . $this->getData('attribute') . ']' => [
8989
'Magento_PageBuilder/js/form/element/conditions-loader' => $this->getConfig(),
9090
]
9191
]);

‎app/code/Magento/PageBuilder/Model/WidgetInitializerConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function getConfig(): array
3535
{
3636
$resultConfig = [];
3737
foreach ($this->config as $contentTypeName => $config) {
38-
$selector = sprintf('div[data-role="%s"]', $contentTypeName);
38+
$selector = sprintf('div[data-content-type="%s"]', $contentTypeName);
3939
foreach ($config as $item) {
4040
if (!isset($item['component'])) {
4141
continue;

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<arguments>
8686
<argument name="index" defaultValue="0" type="string"/>
8787
</arguments>
88-
<executeJS function="return document.querySelectorAll('[data-role=row]')[{{index}}].clientWidth" stepKey="rowWidth"/>
88+
<executeJS function="return document.querySelectorAll('[data-content-type=row]')[{{index}}].clientWidth" stepKey="rowWidth"/>
8989
<executeJS function="return document.querySelector('[class=page-wrapper]').clientWidth" stepKey="pageWidth"/>
9090
<assertEquals stepKey="assertRowWidth100Percent">
9191
<expectedResult type="variable">pageWidth</expectedResult>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<data key="content">&lt;img src=&quot;{{media url='wysiwyg/home/home-t-shirts.png'}}&quot;/&gt;</data>
1616
</entity>
1717
<entity name="cmsPageNonexistentDataRole" type="cms_page">
18-
<data key="content">&lt;div data-role=&quot;row&quot;&gt;&lt;div data-role=&quot;non-existent-content-type&quot;&gt;&lt;/div&gt;&lt;/div&gt;</data>
18+
<data key="content">&lt;div data-content-type=&quot;row&quot;&gt;&lt;div data-content-type=&quot;non-existent-content-type&quot;&gt;&lt;/div&gt;&lt;/div&gt;</data>
1919
</entity>
2020
<entity name="_emptyCmsPage" type="cms_page">
2121
<!-- This goes in CE repo -->

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

Lines changed: 59 additions & 59 deletions
Large diffs are not rendered by default.

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,26 +43,26 @@
4343
<element name="selectBlockBtn" type="button" selector="(//div[contains(@class,'pagebuilder-block')]//button/span[text()='Select Block'])"/>
4444
</section>
4545
<section name="BlockOnStorefront">
46-
<element name="ancestor" type="text" selector="[ancestor::div[@data-role='block']]"/>
47-
<element name="html" type="text" selector="(//div[@data-role='html'])[{{arg1}}]//a[contains(@class,'pagebuilder-button-primary')]" parameterized="true"/>
48-
<element name="base" type="text" selector="(//div[@data-role='block'])[{{arg1}}]" parameterized="true"/>
49-
<element name="baseCSS" type="text" selector="[data-role=block]"/>
50-
<element name="hidden" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
51-
<element name="notHidden" type="text" selector="(//div[@data-role='block'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>
52-
<element name="hr" type="button" selector="(//div[@data-role='block'])[{{arg1}}]/hr" parameterized="true"/>
53-
<element name="empty" type="text" selector="//div[@data-role='block'][{{arg1}}][not(*)]" parameterized="true"/>
54-
<element name="textContent" type="text" selector="(//div[@data-role='block'])[{{arg1}}]//div[contains(text(),'{{arg2}}')]" parameterized="true"/>
46+
<element name="ancestor" type="text" selector="[ancestor::div[@data-content-type='block']]"/>
47+
<element name="html" type="text" selector="(//div[@data-content-type='html'])[{{arg1}}]//a[contains(@class,'pagebuilder-button-primary')]" parameterized="true"/>
48+
<element name="base" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}]" parameterized="true"/>
49+
<element name="baseCSS" type="text" selector="[data-content-type=block]"/>
50+
<element name="hidden" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
51+
<element name="notHidden" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>
52+
<element name="hr" type="button" selector="(//div[@data-content-type='block'])[{{arg1}}]/hr" parameterized="true"/>
53+
<element name="empty" type="text" selector="//div[@data-content-type='block'][{{arg1}}][not(*)]" parameterized="true"/>
54+
<element name="textContent" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}]//div[contains(text(),'{{arg2}}')]" parameterized="true"/>
5555
<!-- Advanced Configuration -->
56-
<element name="alignment" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
57-
<element name="noAlignment" type="text" selector="(//div[@data-role='block'])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
58-
<element name="border" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
59-
<element name="borderColor" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
60-
<element name="noBorderColor" type="text" selector="(//div[@data-role='block'])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
61-
<element name="borderWidth" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
62-
<element name="borderRadius" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
63-
<element name="cssClasses" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
64-
<element name="noCssClasses" type="text" selector="(//div[@data-role='row'])[{{arg1}}]/div[not(@class)]" parameterized="true"/>
65-
<element name="margins" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
66-
<element name="padding" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
56+
<element name="alignment" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
57+
<element name="noAlignment" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
58+
<element name="border" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
59+
<element name="borderColor" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
60+
<element name="noBorderColor" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
61+
<element name="borderWidth" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
62+
<element name="borderRadius" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
63+
<element name="cssClasses" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
64+
<element name="noCssClasses" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}]/div[not(@class)]" parameterized="true"/>
65+
<element name="margins" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
66+
<element name="padding" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
6767
</section>
6868
</sections>

0 commit comments

Comments
 (0)