🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #17160: [Backport] Improve "Invalid country code" error message on tax import (by @gelanivishal)
 - #17159: [Backport] Add Confirm Modal Width (by @gelanivishal)
 - #17090: [Backport] Inconsistent Redirect in Admin Notification Controller (by @mageprince)
 - #16992: [Backport] Refactor JavsScript for UrlRewrite module edit page. (by @chirag-wagento)


Fixed GitHub Issues:
 - #15356: Refactore javascript for module URL rewrite (reported by @vgelani) has been fixed in #16992 by @chirag-wagento in 2.1-develop branch
   Related commits:
     1. 846347d

Author: Stanislav Idolov

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php

@@ -39,6 +39,6 @@ public function execute()
                 $this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
             }
         }
-        $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
+        $this->_redirect('adminhtml/*/');
     }
 }

app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php

@@ -234,7 +234,7 @@ protected function _importRate(array $rateData, array $regionsCache, array $stor
         $countryCode = $rateData[1];
         $country = $this->_countryFactory->create()->loadByCode($countryCode, 'iso2_code');
         if (!$country->getId()) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('One of the countries has invalid code.'));
+            throw new \Magento\Framework\Exception\LocalizedException(__('Country code is invalid: %1', $countryCode));
         }
         $regionsCache = $this->_addCountryRegionsToCache($countryCode, $regionsCache);
 

app/code/Magento/TaxImportExport/i18n/en_US.csv

@@ -12,7 +12,7 @@ Rate,Rate
 "Invalid file upload attempt","Invalid file upload attempt"
 "Invalid file upload attempt.","Invalid file upload attempt."
 "Invalid file format.","Invalid file format."
-"One of the countries has invalid code.","One of the countries has invalid code."
+"Country code is invalid: %1","Country code is invalid: %1"
 "Import Tax Rates","Import Tax Rates"
 "Export Tax Rates","Export Tax Rates"
 CSV,CSV

app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml

@@ -13,16 +13,13 @@
 <?php echo $block->getChildHtml() ?>
 
 <?php if ($block->getChildBlock('form')): ?>
-<script>
-require([
-    'jquery',
-    'mage/backend/form',
-    'mage/backend/validation'
-], function($){
-
-    $('#edit_form').form()
-        .validation({validationUrl: '<?php /* @escapeNotVerified */ echo $block->getValidationUrl() ?>'});
-
-});
+<script type="text/x-magento-init">
+    {
+        "#edit_form": {
+            "Magento_UrlRewrite/js/url-rewrite-validation" : {
+                "url": "<?= $block->escapeUrl($block->getValidationUrl()) ?>"
+            }
+        }
+    }
 </script>
 <?php endif; ?>

app/code/Magento/UrlRewrite/view/adminhtml/web/js/url-rewrite-validation.js

@@ -0,0 +1,19 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/backend/form',
+    'mage/backend/validation'
+], function ($) {
+    'use strict';
+
+    return function (data, element) {
+
+        $(element).form().validation({
+            validationUrl: data.url
+        });
+    };
+});

dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php

@@ -57,7 +57,7 @@ public function testImportFromCsvFileWithCorrectData()
     /**
      * @magentoDbIsolation enabled
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage One of the countries has invalid code.
+     * @expectedExceptionMessage Country code is invalid: ZZ
      */
     public function testImportFromCsvFileThrowsExceptionWhenCountryCodeIsInvalid()
     {

lib/web/css/source/components/_modals.less

@@ -96,6 +96,12 @@
     left: 0;
     overflow-y: auto;
 
+    &.confirm {
+        .modal-inner-wrap {
+            .lib-css(width, @modal-popup-confirm__width);
+        }
+    }
+
     &._show {
         .modal-inner-wrap {
             -webkit-transform: translateY(0);