🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #17543: Link logo in web setup wizard to back-end base URL (by @arnoudhgz)
 - #17575: Translated validation error messages (by @yogeshks)
 - #17527: Refactor JS code and added JS component file (by @yogeshks)
 - #16777: Fix Translation of error message on cart for deleted bundle option. (by @swnsma)


Fixed GitHub Issues:
 - #13948: Sidebar shortcut to admin dashboard (Magento logo on top left) has no link in web setup wizard (reported by @doctormess) has been fixed in #17543 by @arnoudhgz in 2.2-develop branch
   Related commits:
     1. d10de87

Author: magento-engcom-team

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml

@@ -21,13 +21,13 @@
     <input name="form_key" type="hidden" value="<?= $block->escapeHtml($block->getFormKey()) ?>" />
     <?= $block->getChildHtml('form') ?>
 </form>
-
-
-<script>
-require(['jquery', "mage/mage"], function(jQuery){
-
-    jQuery('#edit_form').mage('form').mage('validation', {validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>'});
-
-});
+<script type="text/x-magento-init">
+    {
+        "#edit_form": {
+            "Magento_Catalog/catalog/product/edit/attribute": {
+                "validationUrl": "<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>"
+            }
+        }
+    }
 </script>
 <?= /* @escapeNotVerified */ $block->getFormScripts() ?>

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml

@@ -11,11 +11,12 @@
 <form action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" id="attributes-edit-form" class="attributes-edit-form" enctype="multipart/form-data">
     <?= $block->getBlockHtml('formkey') ?>
 </form>
-<script>
-require(['jquery', "mage/mage"], function(jQuery){
-
-    jQuery('#attributes-edit-form').mage('form')
-        .mage('validation', {validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>'});
-
-});
+<script type="text/x-magento-init">
+    {
+        "#attributes-edit-form": {
+            "Magento_Catalog/catalog/product/edit/attribute": {
+                "validationUrl": "<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>"
+            }
+        }
+    }
 </script>

app/code/Magento/Catalog/view/adminhtml/web/catalog/product/edit/attribute.js

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

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

@@ -37,3 +37,4 @@ name,name
 "Minimal Query Length","Minimal Query Length"
 "Maximum Query Length","Maximum Query Length"
 "Rebuild Catalog product fulltext search index","Rebuild Catalog product fulltext search index"
+"Please enter a valid price range.","Please enter a valid price range."

app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml

@@ -147,8 +147,8 @@ require([
                 }
             },
             messages: {
-                'price[to]': {'greater-than-equals-to': 'Please enter a valid price range.'},
-                'price[from]': {'less-than-equals-to': 'Please enter a valid price range.'}
+                'price[to]': {'greater-than-equals-to': '<?= /* @escapeNotVerified */ __('Please enter a valid price range.') ?>'},
+                'price[from]': {'less-than-equals-to': '<?= /* @escapeNotVerified */ __('Please enter a valid price range.') ?>'}
             }
         });
 });

app/code/Magento/Multishipping/etc/frontend/di.xml

@@ -43,6 +43,6 @@
         <plugin name="multishipping_session_mapper" type="Magento\Multishipping\Model\Checkout\Type\Multishipping\Plugin" sortOrder="50" />
     </type>
     <type name="Magento\Checkout\Controller\Cart">
-        <plugin name="multishipping_clear_addresses" type="Magento\Multishipping\Model\Cart\Controller\CartPlugin" />
+        <plugin name="multishipping_clear_addresses" type="Magento\Multishipping\Model\Cart\Controller\CartPlugin" sortOrder="50" />
     </type>
 </config>

app/code/Magento/Store/etc/di.xml

@@ -65,7 +65,7 @@
     <preference for="Magento\Framework\App\Router\PathConfigInterface" type="Magento\Store\Model\PathConfig" />
     <type name="Magento\Framework\App\Action\AbstractAction">
         <plugin name="storeCheck" type="Magento\Store\App\Action\Plugin\StoreCheck" sortOrder="10"/>
-        <plugin name="designLoader" type="Magento\Framework\App\Action\Plugin\Design" sortOrder="30"/>
+        <plugin name="designLoader" type="Magento\Framework\App\Action\Plugin\Design" />
     </type>
     <type name="Magento\Framework\Url\SecurityInfo">
         <plugin name="storeUrlSecurityInfo" type="Magento\Store\Url\Plugin\SecurityInfo"/>

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_common.less

@@ -19,12 +19,6 @@
     padding-top: @main__indent-top;
 }
 
-.menu-wrapper {
-    .logo-static {
-        pointer-events: none;
-    }
-}
-
 //
 //  Header
 //  _____________________________________________

setup/pub/styles/setup.css

@@ -6,6 +6,13 @@
 
 // @codingStandardsIgnoreFile
 
+use Magento\Backend\Model\UrlInterface;
+use Magento\Framework\App\ObjectManager;
+
+$objectManager = ObjectManager::getInstance();
+/** @var Magento\Backend\Model\UrlInterface $backendUrl */
+$backendUrl = $objectManager->get(UrlInterface::class);
+
 ?>
 <?php $expressions = []; foreach ( $this->main as $item ): ?>
     <?php $expressions[] = '!$state.is(\'' . $item['id'] . '\')';
@@ -20,13 +27,13 @@
     ng-show="<?= implode( '&&', $expressions) ?>"
     >
 <nav class="admin__menu" ng-controller="mainController">
-    <span
-        class="logo logo-static"
+    <a href="<?= $backendUrl->getBaseUrl() . $backendUrl->getAreaFrontName(); ?>"
+        class="logo"
         data-edition="Community Edition">
         <img class="logo-img"
              src="./pub/images/logo.svg"
              alt="Magento Admin Panel">
-    </span>
+    </a>
     <ul id="nav" role="menubar">
         <li class="item-home level-0" ng-class="{_active: $state.current.name === 'root.home'}">
             <a href="" ui-sref="root.home">