From 54788a81bbe47a963d68d4de0e2ed3732d5fda51 Mon Sep 17 00:00:00 2001
From: Zach Nanninga <zach@mediotype.com>
Date: Wed, 18 Nov 2020 13:27:16 -0600
Subject: [PATCH 1/2] ISSUE-30286 - Change layout update removal button
 rendering from a block to directly in the template to prevent inaccurate js
 element selection in SecureHtmlRenderer event listener generation.

---
 .../Widget/Instance/Edit/Tab/Main/Layout.php  | 19 -------------------
 .../templates/instance/edit/layout.phtml      |  3 ++-
 2 files changed, 2 insertions(+), 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
index c48bf9e7e4c7a..a704a5676f632 100644
--- 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' => '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/view/adminhtml/templates/instance/edit/layout.phtml b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
index 93c5cac33f947..2d4f88709fd91 100644
--- 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">'+

From 1921d68f1d57924e089d794ae72e4724107383b0 Mon Sep 17 00:00:00 2001
From: Zach Nanninga <zach@mediotype.com>
Date: Thu, 19 Nov 2020 14:51:43 -0600
Subject: [PATCH 2/2] ISSU-30286 - Update MFTF widget test to confirm add
 layout / remove layout buttons work as expected.

---
 .../Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml    | 4 ++++
 .../Widget/Test/Mftf/Section/AdminNewWidgetSection.xml        | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
index e657b3eb73b53..5cf135f158130 100644
--- 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
index 8a17b589d7ab2..217375fb85a19 100644
--- 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"/>