Skip to content

Commit 000007c

Browse files
author
Hwashiang Yu
committed
MC-5810: Improve naming of the critical variables/parameters in the code and configuration
- Resolved product attribute failure - Reverted non content type data-roles
1 parent dbc556c commit 000007c

File tree

11 files changed

+69
-69
lines changed

11 files changed

+69
-69
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-content-type=pagebuilder-conditions-form-placeholder-' . $this->getData('attribute') . ']' => [
88+
'[data-role=pagebuilder-conditions-form-placeholder-' . $this->getData('attribute') . ']' => [
8989
'Magento_PageBuilder/js/form/element/conditions-loader' => $this->getConfig(),
9090
]
9191
]);

app/code/Magento/PageBuilder/Test/Mftf/Data/ProductAttributeData.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
<data key="is_required">false</data>
1717
<data key="is_unique">false</data>
1818
<data key="is_searchable">false</data>
19-
<data key="is_system">true</data>
19+
<data key="is_visible">true</data>
2020
<data key="backend_type">text</data>
2121
<data key="is_wysiwyg_enabled">false</data>
22-
<data key="is_system_in_advanced_search">false</data>
23-
<data key="is_system_on_front">true</data>
22+
<data key="is_visible_in_advanced_search">false</data>
23+
<data key="is_visible_on_front">true</data>
2424
<data key="is_filterable">false</data>
2525
<data key="is_filterable_in_search">false</data>
2626
<data key="used_in_product_listing">false</data>
2727
<data key="is_used_for_promo_rules">false</data>
2828
<data key="is_comparable">true</data>
2929
<data key="is_used_in_grid">false</data>
30-
<data key="is_system_in_grid">false</data>
30+
<data key="is_visible_in_grid">false</data>
3131
<data key="is_filterable_in_grid">false</data>
3232
<data key="used_for_sort_by">false</data>
3333
<requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>

app/code/Magento/PageBuilder/view/adminhtml/web/js/panel.js

Lines changed: 2 additions & 2 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/template/content-type/preview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
-->
77
<div class="pagebuilder-stage"
8-
attr="id: id, 'data-content-type': 'pagebuilder-stage'"
8+
attr="id: id, 'data-role': 'pagebuilder-stage'"
99
css="'pagebuilder-show-borders': showBorders, 'pagebuilder-no-user-select': !userSelect(), 'panel-collapsed': pageBuilder.panel.isCollapsed, 'interacting': interacting, 'focus-child': focusChild">
1010
<div class="pagebuilder-stage-loading" visible="loading">
1111
<span class="spinner">

app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/preview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<button
2222
type="button"
2323
class="action-remove"
24-
data-content-type="delete-button"
24+
data-role="delete-button"
2525
attr="title: $t('Delete image')"
2626
disable="$parent.disabled"
2727
click="$parent.removeFile.bind($parent, $file)">

app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/preview/image.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
-->
77

8-
<div class="pagebuilder-image-uploader-container" data-content-type="drop-zone" css="_loading: isLoading, 'has-data': hasData()">
8+
<div class="pagebuilder-image-uploader-container" data-role="drop-zone" css="_loading: isLoading, 'has-data': hasData()">
99
<div class="pagebuilder-options" data-bind="visible: hasData() || isShowImageUploadOptions">
1010
<div class="pagebuilder-options-wrapper">
1111
<ul class="pagebuilder-options-links">

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/panel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ export default class Panel {
237237
_.map(
238238
_.where(contentTypes, {
239239
group: id,
240-
is_system: true,
240+
is_visible: true,
241241
}), /* Retrieve content types with group id */
242242
(contentType: ContentTypeConfigInterface, identifier: string) => {
243243
return new GroupContentType(

dev/tests/api-functional/testsuite/Magento/PageBuilder/Api/ProductAttributeRepositoryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ private function createPageBuilderAttribute($attributeCode)
4444
"default_value" => "",
4545
"frontend_input" => "textarea",
4646
"is_wysiwyg_enabled" => 1,
47-
"is_system_on_front" => true,
47+
"is_visible_on_front" => true,
4848
"is_searchable" => true,
49-
"is_system_in_advanced_search" => true,
49+
"is_visible_in_advanced_search" => true,
5050
"is_filterable" => true,
5151
"is_filterable_in_search" => true,
5252
\Magento\Framework\Api\ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY => [

dev/tests/integration/_files/Magento/TestModulePageBuilderDataMigration/Setup/InstallSchema.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
484484
['unsigned' => true, 'nullable' => false, 'default' => '0'],
485485
'Is WYSIWYG Enabled'
486486
)->addColumn(
487-
'is_system',
487+
'is_visible',
488488
\Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
489489
null,
490490
['unsigned' => true, 'nullable' => false, 'default' => '1'],

0 commit comments

Comments
 (0)