🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #15765: check if order data is available to incl ec (by @torhoehn)
 - #15614: [Backport] Fixed product tier pricing pagination issue in admin (by @dmytro-ch)
 - #15365: Trim username on customer account login page (by @dankhrapiyush)
 - #15485: fix: support multiple minisearch widget instances (by @DanielRuf)


Fixed GitHub Issues:
 - #12221: Google analytics pageview being triggered twice (reported by @alexhadley) has been fixed in #15765 by @torhoehn in 2.2-develop branch
   Related commits:
     1. 24a5abd

 - #15210: Advanced pricing pagination issue (reported by @dryadav) has been fixed in #15614 by @dmytro-ch in 2.2-develop branch
   Related commits:
     1. 896ca96

 - #6058: IE11 user login email validation fails if field has leading or trailing space (reported by @dnadle) has been fixed in #15365 by @dankhrapiyush in 2.2-develop branch
   Related commits:
     1. 9ecb84b
     2. 62c1a14
     3. c81d9a6

Author: magento-engcom-team

app/code/Magento/Customer/view/frontend/templates/form/login.phtml

@@ -42,3 +42,13 @@
         </form>
     </div>
 </div>
+
+<script type="text/x-magento-init">
+    {
+        ".field.email": {
+            "Magento_Customer/js/trim-username": {
+                "formSelector": "form.form-login"
+            }
+        }
+    }
+</script>

app/code/Magento/Customer/view/frontend/web/js/trim-username.js

@@ -0,0 +1,65 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    $.widget('mage.trimUsername', {
+        options: {
+            cache: {},
+            formSelector: 'form',
+            emailSelector: 'input[type="email"]'
+        },
+
+        /**
+         * Widget initialization
+         * @private
+         */
+        _create: function () {
+            // We need to look outside the module for backward compatibility, since someone can already use the module.
+            // @todo Narrow this selector in 2.3 so it doesn't accidentally finds the the email field from the
+            // newsletter email field or any other "email" field.
+            this.options.cache.email = $(this.options.formSelector).find(this.options.emailSelector);
+            this._bind();
+        },
+
+        /**
+         * Event binding, will monitor change, keyup and paste events.
+         * @private
+         */
+        _bind: function () {
+            if (this.options.cache.email.length) {
+                this._on(this.options.cache.email, {
+                    'change': this._trimUsername,
+                    'keyup': this._trimUsername,
+                    'paste': this._trimUsername
+                });
+            }
+        },
+
+        /**
+         * Trim username
+         * @private
+         */
+        _trimUsername: function () {
+            var username = this._getUsername().trim();
+
+            this.options.cache.email.val(username);
+        },
+
+        /**
+         * Get username value
+         * @returns {*}
+         * @private
+         */
+        _getUsername: function () {
+            return this.options.cache.email.val();
+        }
+    });
+
+    return $.mage.trimUsername;
+});

app/code/Magento/GoogleAnalytics/view/frontend/web/js/google-analytics.js

@@ -53,7 +53,7 @@ define([
             }
 
             // Process orders data
-            if (config.ordersTrackingData.length) {
+            if (config.ordersTrackingData.hasOwnProperty('currency')) {
                 ga('require', 'ec', 'ec.js');
 
                 //Set currency code

app/code/Magento/Search/view/frontend/web/form-mini.js

@@ -55,7 +55,7 @@ define([
             this.autoComplete = $(this.options.destinationSelector);
             this.searchForm = $(this.options.formSelector);
             this.submitBtn = this.searchForm.find(this.options.submitBtn)[0];
-            this.searchLabel = $(this.options.searchLabel);
+            this.searchLabel = this.searchForm.find(this.options.searchLabel);
             this.isExpandable = this.options.isExpandable;
 
             _.bindAll(this, '_onKeyDown', '_onPropertyChange', '_onSubmit');

app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js

@@ -722,6 +722,8 @@ define([
          * @param {Number} page - current page
          */
         changePage: function (page) {
+            this.clear();
+
             if (page === 1 && !this.recordData().length) {
                 return false;
             }
@@ -763,15 +765,13 @@ define([
          * Change page to next
          */
         nextPage: function () {
-            this.clear();
             this.currentPage(this.currentPage() + 1);
         },
 
         /**
          * Change page to previous
          */
         previousPage: function () {
-            this.clear();
             this.currentPage(this.currentPage() - 1);
         },