Skip to content

Commit cbb7a73

Browse files
author
Hwashiang Yu
committed
Merge remote-tracking branch 'origin/MC-4959-need-to-remove-is-hideable' into cms-team-1-delivery
2 parents 42c2e49 + ed085b3 commit cbb7a73

File tree

47 files changed

+667
-103
lines changed

Some content is hidden

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

47 files changed

+667
-103
lines changed

‎app/code/Magento/PageBuilder/Model/Stage/Config.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,6 @@ private function flattenContentTypeData(string $name, array $contentType)
179179
'label' => $contentType['label'],
180180
'icon' => $contentType['icon'],
181181
'form' => $contentType['form'],
182-
'is_hideable' =>
183-
isset($contentType['is_hideable']) && $contentType['is_hideable'] === 'false' ? false : true,
184182
'contentType' => '',
185183
'group' => $contentType['group'] ?? 'general',
186184
'fields' => $this->uiComponentConfig->getFields($contentType['form']),

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

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,14 +1246,14 @@
12461246
<seeElementInDOM selector="{{ButtonItemOnStage.moveHandleDisabled('1')}}" stepKey="seeMoveHandleDisabled2"/>
12471247
<dontSeeElementInDOM selector="{{ButtonItemOnStage.moveHandle('1')}}" stepKey="dontSeeMoveHandleEnabled2"/>
12481248
</test>
1249-
<test name="ValidateShowHideOnButtonItemDefaultState">
1249+
<test name="ValidateButtonItemNotHideable">
12501250
<annotations>
12511251
<features value="PageBuilder"/>
12521252
<stories value="Buttons"/>
1253-
<title value="Button Item is shown by default"/>
1254-
<description value="Button Item is shown by default in stage and storefront"/>
1253+
<title value="Validate button item has no hide / show capabilities"/>
1254+
<description value="Validate button item has no hide / show capabilities"/>
12551255
<severity value="CRITICAL"/>
1256-
<useCaseId value="MC-965"/>
1256+
<useCaseId value="MC-4959"/>
12571257
<testCaseId value="MC-3547"/>
12581258
<group value="pagebuilder"/>
12591259
<group value="pagebuilder-buttons"/>
@@ -1268,35 +1268,16 @@
12681268
<after>
12691269
<actionGroup ref="logout" stepKey="logout"/>
12701270
</after>
1271-
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1272-
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
1273-
</actionGroup>
1274-
<!-- Add Button Item to Stage -->
1275-
<comment userInput="Add Button Item to Stage" stepKey="commentAddButtonItemToStage"/>
1276-
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupAddContent">
1271+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
12771272
<argument name="group" value="PageBuilderButtonsContentType"/>
12781273
</actionGroup>
1279-
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonItemIntoStage">
1274+
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsIntoStage">
12801275
<argument name="contentType" value="PageBuilderButtonsContentType"/>
12811276
</actionGroup>
1282-
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton1">
1283-
<argument name="text" value="PageBuilderButtonItemText_First"/>
1284-
<argument name="index" value="1"/>
1285-
</actionGroup>
1286-
<!-- Stage: Validate Default Show/Hide State - Before Save -->
1287-
<comment userInput="Stage: Validate Default Show/Hide State Before Save" stepKey="CommentValidateDefaultShowHideStateOnStageBeforeSave"/>
1288-
<seeElement selector="{{ButtonItemOnStage.notHidden('1')}}" stepKey="seeContentTypeNotHiddenStageBeforeSave"/>
1289-
<!-- Stage: Validate Default Show/Hide State - After Save -->
1290-
<comment userInput="Stage: Validate Default Show/Hide State - After Save" stepKey="CommentValidateDefaultShowHideStateOnStageAfterSave"/>
1291-
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1292-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1293-
<seeElement selector="{{ButtonItemOnStage.notHidden('1')}}" stepKey="seeContentTypeNotHiddenStageAfterSave"/>
1294-
<!-- Storefront: Validate Default Show/Hide State -->
1295-
<comment userInput="Storefront: Validate Default Show/Hide State" stepKey="CommentValidateDefaultShowHideStateOnStorefront"/>
1296-
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1297-
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
1298-
</actionGroup>
1299-
<seeElement selector="{{ButtonItemOnStorefront.notHidden('1')}}" stepKey="seeContentTypeNotHiddenStorefront"/>
1277+
<click selector="{{ButtonItemOnStage.openOptionsMenu('1')}}" stepKey="clickButtonItem"/>
1278+
<waitForPageLoad stepKey="waitForPageLoad"/>
1279+
<waitForElementVisible selector="{{ButtonItemOnStage.optionsMenu('1')}}" stepKey="waitForButtonItemOptionsMenuVisible"/>
1280+
<dontSeeElementInDOM selector="{{PageBuilderContentTypeOptionsMenu.contentTypeHide(PageBuilderButtonItemContentType.role, '1')}}" stepKey="dontSeeDomHideOption" />
13001281
</test>
13011282
<test name="ButtonItemCanSaveButtonTextWithoutFocusingOutsideOfLiveEdit">
13021283
<annotations>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@
945945
<test name="ValidateTabItemNotHideable">
946946
<annotations>
947947
<features value="PageBuilder"/>
948-
<stories value="Slider"/>
948+
<stories value="Tabs"/>
949949
<title value="Validate tab has no hide / show capabilities"/>
950950
<description value="Validate tab has no hide / show capabilities"/>
951951
<severity value="CRITICAL"/>

‎app/code/Magento/PageBuilder/etc/content_type.xsd‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<xs:attribute type="xs:string" name="master_component" use="optional"/>
3838
<xs:attribute type="xs:string" name="form" use="optional"/>
3939
<xs:attribute type="xs:string" name="group" use="optional"/>
40-
<xs:attribute type="xs:string" name="is_hideable" use="optional"/>
4140
</xs:complexType>
4241
</xs:element>
4342
</xs:choice>

‎app/code/Magento/PageBuilder/etc/content_type_merged.xsd‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<xs:attribute type="xs:string" name="master_component" use="optional"/>
3838
<xs:attribute type="xs:string" name="form" use="optional"/>
3939
<xs:attribute type="xs:string" name="group" use="optional"/>
40-
<xs:attribute type="xs:string" name="is_hideable" use="optional"/>
4140
</xs:complexType>
4241
</xs:element>
4342
</xs:choice>

‎app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/button_item.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
form="pagebuilder_button_item_form"
1515
group="elements"
1616
icon="icon-pagebuilder-button"
17-
translate="label"
18-
is_hideable="false">
17+
translate="label">
1918
<parents default_policy="deny">
2019
<parent name="buttons" policy="allow"/>
2120
</parents>

‎app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/column.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
group="layout"
1616
icon="icon-pagebuilder-column"
1717
sortOrder="15"
18-
translate="label"
19-
is_hideable="false">
18+
translate="label">
2019
<parents default_policy="deny">
2120
<parent name="row" policy="allow"/>
2221
<parent name="column-group" policy="allow"/>

‎app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/column_group.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
group="layout"
1616
icon="icon-pagebuilder-column"
1717
sortOrder="10"
18-
translate="label"
19-
is_hideable="false">
18+
translate="label">
2019
<parents default_policy="deny">
2120
<parent name="row" policy="allow"/>
2221
<parent name="tab-item" policy="allow"/>

‎app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/divider.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<type name="divider"
1010
label="Divider"
1111
component="Magento_PageBuilder/js/content-type"
12+
preview_component="Magento_PageBuilder/js/content-type/divider/preview"
1213
form="pagebuilder_divider_form"
1314
group="elements"
1415
icon="icon-pagebuilder-divider"

‎app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/html.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<type name="html"
1010
label="HTML Code"
1111
component="Magento_PageBuilder/js/content-type"
12+
preview_component="Magento_PageBuilder/js/content-type/html/preview"
1213
form="pagebuilder_html_form"
1314
group="elements"
1415
icon="icon-pagebuilder-code"

0 commit comments

Comments
 (0)