🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #18917: Fixed-Global-search icon misaligned (by @speedy008)
 - #18591: [Backport] Fix SKU limit in import new products (by @ravi-chandra3197)
 - #18862: [Backport] Adding trimming sku value function to sku backend model. (by @gelanivishal)
 - #18865: fixed issue #18458 : Alert widget gets close when click anywhere on screen #18576 (by @Shubham-Webkul)
 - #18886: [Backport] fixed Translation issue send-friend in send.phtml (by @rahulwebkul)


Fixed GitHub Issues:
 - #18913: Global-search icon misaligned  (reported by @speedy008) has been fixed in #18917 by @speedy008 in 2.2-develop branch
   Related commits:
     1. 3cbc255

 - #17865: import new products via csv: products are created with empty value when strings are too long (reported by @LouNik1984) has been fixed in #18591 by @ravi-chandra3197 in 2.2-develop branch
   Related commits:
     1. e59dee0
     2. a10f074
     3. ad68105

 - #12300: SKU values are not trimmed with the space. (reported by @ShaileshChauhan92) has been fixed in #18862 by @gelanivishal in 2.2-develop branch
   Related commits:
     1. 109a27e

 - #16572: Trim whitespace on SKU when saving product (reported by @Zyles) has been fixed in #18862 by @gelanivishal in 2.2-develop branch
   Related commits:
     1. 109a27e

 - #18458: Magento version 2.2.6 Alert widget gets close when click anywhere on screen (reported by @asgarh) has been fixed in #18865 by @Shubham-Webkul in 2.2-develop branch
   Related commits:
     1. f59bc17
     2. 06b243f
     3. c3bc361
     4. 26a9520
     5. 87167e7
     6. c6586ab
     7. d40a26c
     8. 84c7391
     9. e1483f6
     10. 3b2e4e4
     11. 7dc2d1b

 - #18779: Translation issue send-friend in sendphtml (reported by @Franzld) has been fixed in #18886 by @rahulwebkul in 2.2-develop branch
   Related commits:
     1. 443e681

Author: magento-engcom-team

app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php

@@ -97,6 +97,7 @@ protected function _generateUniqueSku($object)
     public function beforeSave($object)
     {
         $this->_generateUniqueSku($object);
+        $this->trimValue($object);
         return parent::beforeSave($object);
     }
 
@@ -127,4 +128,17 @@ protected function _getLastSimilarAttributeValueIncrement($attribute, $object)
         $data = $connection->fetchOne($select, $bind);
         return abs((int)str_replace($value, '', $data));
     }
+
+    /**
+     * @param Product $object
+     * @return void
+     */
+    private function trimValue($object)
+    {
+        $attrCode = $this->getAttribute()->getAttributeCode();
+        $value = $object->getData($attrCode);
+        if ($value) {
+            $object->setData($attrCode, trim($value));
+        }
+    }
 }

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php

@@ -373,7 +373,8 @@ protected function customizeNameListeners(array $meta)
             $skuPath . static::META_CONFIG_PATH,
             $meta,
             [
-                'autoImportIfEmpty' => true
+                'autoImportIfEmpty' => true,
+                'validation' => ['no-marginal-whitespace' => true]
             ]
         );
 

app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php

@@ -7,6 +7,7 @@
 
 use Magento\CatalogImportExport\Model\Import\Product;
 use Magento\Framework\Validator\AbstractValidator;
+use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
 
 /**
  * Class Validator
@@ -69,6 +70,8 @@ protected function textValidation($attrCode, $type)
         $val = $this->string->cleanString($this->_rowData[$attrCode]);
         if ($type == 'text') {
             $valid = $this->string->strlen($val) < Product::DB_MAX_TEXT_LENGTH;
+        } else if ($attrCode == Product::COL_SKU) {
+            $valid = $this->string->strlen($val) <= SKU::SKU_MAX_LENGTH;
         } else {
             $valid = $this->string->strlen($val) < Product::DB_MAX_VARCHAR_LENGTH;
         }

app/code/Magento/SendFriend/view/frontend/templates/send.phtml

@@ -17,21 +17,21 @@
         <div class="secondary">
             <button type="button" id="btn-remove<%- data._index_ %>" class="action remove"
                title="<?= $block->escapeHtmlAttr(__('Remove Recipent')) ?>">
-               <span><?= $block->escapeJs($block->escapeHtml(__('Remove'))) ?></span>
+               <span><?= $block->escapeHtml(__('Remove')) ?></span>
             </button>
         </div>
     </div>
     <fieldset class="fieldset">
         <div class="field name required">
-            <label for="recipients-name<%- data._index_ %>" class="label"><span><?= $block->escapeJs($block->escapeHtml(__('Name'))) ?></span></label>
+            <label for="recipients-name<%- data._index_ %>" class="label"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
             <div class="control">
                 <input name="recipients[name][<%- data._index_ %>]" type="text" title="<?= $block->escapeHtmlAttr(__('Name')) ?>" class="input-text"
                        id="recipients-name<%- data._index_ %>" data-validate="{required:true}"/>
             </div>
         </div>
 
         <div class="field email required">
-            <label for="recipients-email<%- data._index_ %>" class="label"><span><?= $block->escapeJs($block->escapeHtml(__('Email'))) ?></span></label>
+            <label for="recipients-email<%- data._index_ %>" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
                 <input name="recipients[email][<%- data._index_ %>]" title="<?= $block->escapeHtmlAttr(__('Email')) ?>"
                        id="recipients-email<%- data._index_ %>" type="email" class="input-text"

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

@@ -58,6 +58,7 @@ Keyword,Keyword
 "Letters, numbers, spaces or underscores only please","Letters, numbers, spaces or underscores only please"
 "Letters only please","Letters only please"
 "No white space please","No white space please"
+"No marginal white space please","No marginal white space please"
 "Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx","Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx"
 "A positive or negative non-decimal number please","A positive or negative non-decimal number please"
 "The specified vehicle identification number (VIN) is invalid.","The specified vehicle identification number (VIN) is invalid."

app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js

@@ -115,6 +115,12 @@ define([
             },
             $.mage.__('No white space please')
         ],
+        'no-marginal-whitespace': [
+            function (value) {
+                return !/^\s+|\s+$/i.test(value);
+            },
+            $.mage.__('No marginal white space please')
+        ],
         'zip-range': [
             function (value) {
                 return utils.isEmpty(value) || /^90[2-5]-\d{2}-\d{4}$/.test(value);

app/code/Magento/Ui/view/base/web/js/modal/modal-component.js

@@ -93,7 +93,7 @@ define([
          * @returns {Object} Chainable.
          */
         initModalEvents: function () {
-            this.options.keyEventHandlers.escapeKey = this.options.outerClickHandler = this[this.onCancel].bind(this);
+            this.options.keyEventHandlers.escapeKey = this[this.onCancel].bind(this);
 
             return this;
         },

app/code/Magento/Ui/view/base/web/js/modal/modal.js

@@ -424,8 +424,7 @@ define([
          * Creates overlay, append it to wrapper, set previous click event on overlay.
          */
         _createOverlay: function () {
-            var events,
-                outerClickHandler = this.options.outerClickHandler || this.closeModal;
+            var events;
 
             this.overlay = $('.' + this.options.overlayClass);
 
@@ -437,7 +436,6 @@ define([
             }
             events = $._data(this.overlay.get(0), 'events');
             events ? this.prevOverlayHandler = events.click[0].handler : false;
-            this.options.clickableOverlay ? this.overlay.unbind().on('click', outerClickHandler) : false;
         },
 
         /**

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less

@@ -151,7 +151,7 @@
     background-color: transparent;
     border: 1px solid transparent;
     font-size: @search-global-input__font-size;
-    height: @search-global-input__height;
+    height: @search-global-input__height + .2;
     padding: @search-global-input__padding-top @search-global-input__padding-side @search-global-input__padding-bottom;
     position: absolute;
     right: 0;

lib/web/i18n/en_US.csv

@@ -27,6 +27,7 @@ Submit,Submit
 "Letters, numbers, spaces or underscores only please","Letters, numbers, spaces or underscores only please"
 "Letters only please","Letters only please"
 "No white space please","No white space please"
+"No marginal white space please","No marginal white space please"
 "Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx","Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx"
 "A positive or negative non-decimal number please","A positive or negative non-decimal number please"
 "The specified vehicle identification number (VIN) is invalid.","The specified vehicle identification number (VIN) is invalid."