🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #15863: [Backport] Refactored javascript code of admin notification modal popup (by @rahul-kachhadiya)

Author: Stanislav Idolov

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

@@ -19,20 +19,12 @@
     </ul>
 </div>
 
-<script>
-require([
-    "jquery",
-    "Magento_Ui/js/modal/modal"
-], function($){
-    if (this.modal) {
-        this.modal.html($('[data-role="system_messages_list"]').html());
-    } else {
-        this.modal = $('[data-role="system_messages_list"]').modal({
-            modalClass: 'modal-system-messages ui-popup-message',
-            type: 'popup',
-            buttons: []
-        });
+<script type="text/x-magento-init">
+    {
+        "[data-role=system_messages_list]": {
+            "Magento_AdminNotification/js/system/messages/popup": {
+                "class":"modal-system-messages ui-popup-message"
+            }
+        }
     }
-    this.modal.modal('openModal');
-});
 </script>

app/code/Magento/AdminNotification/view/adminhtml/web/js/system/messages/popup.js

@@ -0,0 +1,26 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'Magento_Ui/js/modal/modal'
+], function ($, modal) {
+    'use strict';
+
+    return function (data, element) {
+
+        if (modal.modal) {
+            modal.modal.html($(element).html());
+        } else {
+            modal.modal = $(element).modal({
+                modalClass: data.class,
+                type: 'popup',
+                buttons: []
+            });
+        }
+
+        modal.modal.modal('openModal');
+    };
+});

dev/tests/functional/tests/app/Magento/Tax/Test/Page/Adminhtml/TaxConfiguration.xml

@@ -7,7 +7,7 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
     <page name="TaxConfiguration" area="Adminhtml" mca="admin/system_config/edit/section/tax" module="Magento_Tax">
-        <block name="notificationBlockPopup" class="Magento\Tax\Test\Block\Adminhtml\System\Config\NotificationPopup" locator=".ui-popup-message .modal-inner-wrap" strategy="css selector" />
+        <block name="notificationBlockPopup" class="Magento\Tax\Test\Block\Adminhtml\System\Config\NotificationPopup" locator=".ui-popup-message._show .modal-inner-wrap" strategy="css selector" />
         <block name="notificationBlock" class="Magento\Tax\Test\Block\Adminhtml\System\Config\Notification" locator="#system_messages" strategy="css selector" />
         <block name="pageActions" class="Magento\Backend\Test\Block\System\Config\PageActions" locator=".page-main-actions" strategy="css selector" />
         <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages" strategy="css selector" />