ENGCOM-8502: Issue 30286 - Fix widget layout update removal button to…

… work for multiple layout updates #30992 - Merge Pull Request #30992 from zaximus84/magento2:ISSUE-30286-widget-remove-layout-update - Merged commits: 1. 54788a8 2. 1921d68 3. 3f81a91 4. c7ee4fb 5. 942656c
magento · Dec 19, 2020 · 1113db5 · 1113db5
2 parents 285b397 + 942656c
commit 1113db5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 20 deletions.
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -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
      *

diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
@@ -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"/>

diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
@@ -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"/>

diff --git a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
@@ -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">'+