Skip to content

Issue 30286 - Fix widget layout update removal button to work for multiple layout updates #30992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 21, 2020
Merged

Issue 30286 - Fix widget layout update removal button to work for multiple layout updates #30992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54788a8
ISSUE-30286 - Change layout update removal button rendering from a bl…
Nov 18, 2020
1921d68
ISSU-30286 - Update MFTF widget test to confirm add layout / remove l…
Nov 19, 2020
3f81a91
Merge branch '2.4-develop' into ISSUE-30286-widget-remove-layout-update
Nov 23, 2020
c7ee4fb
Merge branch '2.4-develop' into ISSUE-30286-widget-remove-layout-update
engcom-Foxtrot Dec 8, 2020
942656c
Merge branch '2.4-develop' into ISSUE-30286-widget-remove-layout-update
Dec 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,25 +315,6 @@ public function getAddLayoutButtonHtml()
return $button->toHtml();
}

/**
* Retrieve remove layout button html
*
* @return string
*/
public function getRemoveLayoutButtonHtml()
{
$button = $this->getLayout()->createBlock(
\Magento\Backend\Block\Widget\Button::class
)->setData(
[
'label' => $this->escapeHtmlAttr(__('Remove Layout Update')),
'onclick_attribute' => 'WidgetInstance.removePageGroup(this)',
'class' => 'action-delete',
]
);
return $button->toHtml();
}

/**
* Prepare and retrieve page groups data of widget instance
*
Expand Down
4 changes: 4 additions & 0 deletions app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
<fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widget.name}}" stepKey="fillTitle"/>
<selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" userInput="{{widget.store_ids[0]}}" stepKey="setWidgetStoreIds"/>
<click selector="{{AdminNewWidgetSection.addLayoutUpdate}}" stepKey="clickAddLayoutUpdate"/>
<click selector="{{AdminNewWidgetSection.addLayoutUpdate}}" stepKey="clickAddLayoutUpdate2"/>
<seeNumberOfElements userInput="2" selector="{{AdminNewWidgetSection.layoutUpdate}}" stepKey="seeTwoLayoutUpdates"/>
<click selector="{{AdminNewWidgetSection.removeLastLayoutUpdate}}" stepKey="clickRemoveLastLayoutUpdate"/>
<seeNumberOfElements userInput="1" selector="{{AdminNewWidgetSection.layoutUpdate}}" stepKey="seeOneLayoutUpdate"/>
<selectOption selector="{{AdminNewWidgetSection.selectDisplayOn}}" userInput="{{widget.display_on}}" stepKey="setDisplayOn"/>
<waitForAjaxLoad stepKey="waitForLoad"/>
<selectOption selector="{{AdminNewWidgetSection.selectContainer}}" userInput="{{widget.container}}" stepKey="setContainer"/>
Expand Down
2 changes: 2 additions & 0 deletions app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<element name="widgetStoreIds" type="select" selector="#store_ids"/>
<element name="widgetSortOrder" type="input" selector="#sort_order"/>
<element name="addLayoutUpdate" type="button" selector=".action-default.scalable.action-add"/>
<element name="layoutUpdate" type="block" selector=".page_group_container"/>
<element name="removeLastLayoutUpdate" type="button" selector=".page_group_container:last-child .action-default.scalable.action-delete"/>
<element name="selectDisplayOn" type="select" selector="#widget_instance[0][page_group]"/>
<element name="selectContainer" type="select" selector="#all_pages_0>table>tbody>tr>td:nth-child(1)>div>div>select"/>
<element name="displayOnByIndex" type="select" selector="select[name='widget_instance[{{index}}][page_group]']" parameterized="true"/>
Expand Down
3 changes: 2 additions & 1 deletion app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
'<label for="widget_instance[<%- data.id %>][page_group]">Display on <span class="required">*</span></label>'+
'{$block->getDisplayOnSelectHtml()}'+
'<div class="actions">'+
{$jsonHelper->jsonEncode($block->getRemoveLayoutButtonHtml())} +
'<button title="{$escaper->escapeHtmlAttr(__('Remove Layout Update'))}" type="button"'+
' class="action-default scalable action-delete" onclick="WidgetInstance.removePageGroup(this)" />'+
'</div>'+
'</div>'+
'<div class="fieldset-wrapper-content">'+
Expand Down