Merge remote-tracking branch 'origin/MAGETWO-91712' into 2.3-develop-pr8

Author: serhii-balko

app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js

@@ -6,8 +6,10 @@
 define([
     'jquery',
     'mage/translate',
+    'underscore',
+    'Magento_Catalog/js/product/view/product-ids-resolver',
     'jquery/ui'
-], function ($, $t) {
+], function ($, $t, _, idsResolver) {
     'use strict';
 
     $.widget('mage.catalogAddToCart', {
@@ -76,17 +78,18 @@ define([
         /**
          * Handler for the form 'submit' event
          *
-         * @param {Object} form
+         * @param {jQuery} form
          */
         submitForm: function (form) {
             this.ajaxSubmit(form);
         },
 
         /**
-         * @param {String} form
+         * @param {jQuery} form
          */
         ajaxSubmit: function (form) {
             var self = this,
+                productIds = idsResolver(form),
                 formData;
 
             $(self.options.minicartSelector).trigger('contentLoading');
@@ -115,6 +118,7 @@ define([
 
                     $(document).trigger('ajax:addToCart', {
                         'sku': form.data().productSku,
+                        'productIds': productIds,
                         'form': form,
                         'response': res
                     });

app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids-resolver.js

@@ -0,0 +1,29 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'underscore',
+    'Magento_Catalog/js/product/view/product-ids'
+], function (_, productIds) {
+    'use strict';
+
+    /**
+     * Returns id's of products in form.
+     *
+     * @param {jQuery} $form
+     * @return {Array}
+     */
+    return function ($form) {
+        var idSet = productIds(),
+            product = _.findWhere($form.serializeArray(), {
+            name: 'product'
+        });
+
+        if (!_.isUndefined(product)) {
+            idSet.push(product.value);
+        }
+
+        return _.uniq(idSet);
+    };
+});

app/code/Magento/Catalog/view/frontend/web/js/product/view/product-ids.js

@@ -0,0 +1,12 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'ko'
+], function (ko) {
+    'use strict';
+
+    return ko.observableArray([]);
+});

app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

@@ -226,7 +226,7 @@ define([
             var productData = this._getProductById(Number(elem.data('cart-item')));
 
             if (!_.isUndefined(productData)) {
-                $(document).trigger('ajax:updateCartItemQty', productData['product_sku']);
+                $(document).trigger('ajax:updateCartItemQty');
             }
             this._hideItemButton(elem);
         },
@@ -253,7 +253,9 @@ define([
             var productData = this._getProductById(Number(elem.data('cart-item')));
 
             if (!_.isUndefined(productData)) {
-                $(document).trigger('ajax:removeFromCart', productData['product_sku']);
+                $(document).trigger('ajax:removeFromCart', {
+                    productIds: [productData['product_id']]
+                });
             }
         },
 

app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml

@@ -19,7 +19,9 @@
 <?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
 
 <div class="table-wrapper grouped">
-    <table class="table data grouped" id="super-product-table">
+    <table class="table data grouped"
+           id="super-product-table"
+           data-mage-init='{ "Magento_GroupedProduct/js/product-ids-resolver": {} }'>
         <caption class="table-caption"><?= /* @escapeNotVerified */ __('Grouped product items') ?></caption>
         <thead>
         <tr>

app/code/Magento/GroupedProduct/view/frontend/web/js/product-ids-resolver.js

@@ -0,0 +1,25 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'Magento_Catalog/js/product/view/product-ids'
+], function ($, productIds) {
+    'use strict';
+
+    /**
+     * Returns id's of products in form.
+     *
+     * @param {Object} config
+     * @param {HTMLElement} element
+     * @return {Array}
+     */
+    return function (config, element) {
+        $(element).find('div[data-product-id]').each(function () {
+            productIds.push($(this).data('productId').toString());
+        });
+
+        return productIds();
+    };
+});

dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/view/product-ids-resolver.test.js

@@ -0,0 +1,62 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'squire',
+    'jquery',
+    'ko',
+    'jquery/ui'
+], function (Squire, $, ko) {
+    'use strict';
+
+    var injector = new Squire(),
+        mocks = {
+            'Magento_Catalog/js/product/view/product-ids': ko.observableArray([])
+        },
+        form = $(
+            '<form>' +
+            '<input type="hidden" name="product" value="1">' +
+            '</form>'
+        ),
+        productIdResolver;
+
+    beforeAll(function (done) {
+
+        injector.mock(mocks);
+        injector.require(
+            [
+                'Magento_Catalog/js/product/view/product-ids-resolver'
+            ], function (resolver) {
+                productIdResolver = resolver;
+                done();
+            }
+        );
+    });
+
+    describe('Magento_Catalog/js/product/view/product-ids-resolver', function () {
+        var dataProvider = [
+            {
+                ids: [],
+                expected: ['1']
+            },
+            {
+                ids: ['2', '3'],
+                expected: ['2', '3', '1']
+            },
+            {
+                ids: ['3', '1', '5'],
+                expected: ['3', '1', '5']
+            }
+        ];
+
+        dataProvider.forEach(function (data) {
+            it('resolved product id\'s', function () {
+                mocks['Magento_Catalog/js/product/view/product-ids'](data.ids);
+                expect(productIdResolver(form)).toEqual(data.expected);
+            });
+        });
+    });
+});

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/sidebar.test.js

@@ -26,15 +26,18 @@ define([
                 'items': [
                     {
                         'item_id': 1,
-                        'product_sku': 'bundle'
+                        'product_sku': 'bundle',
+                        'product_id': '1'
                     },
                     {
                         'item_id': 5,
-                        'product_sku': 'simple'
+                        'product_sku': 'simple',
+                        'product_id': '5'
                     },
                     {
                         'item_id': 7,
-                        'product_sku': 'configurable'
+                        'product_sku': 'configurable',
+                        'product_id': '7'
                     }
                 ]
             },
@@ -63,7 +66,9 @@ define([
 
                 sidebar._removeItemAfter(elem);
                 expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('cart');
-                expect(jQuery('body').trigger).toHaveBeenCalledWith('ajax:removeFromCart', 'simple');
+                expect(jQuery('body').trigger).toHaveBeenCalledWith('ajax:removeFromCart', {
+                    'productIds': ['5']
+                });
             });
 
             it('Cart item doesn\'t exists', function () {
@@ -91,7 +96,7 @@ define([
 
                 sidebar._updateItemQtyAfter(elem);
                 expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('cart');
-                expect(jQuery('body').trigger).toHaveBeenCalledWith('ajax:updateCartItemQty', 'simple');
+                expect(jQuery('body').trigger).toHaveBeenCalledWith('ajax:updateCartItemQty');
                 expect(sidebar._hideItemButton).toHaveBeenCalledWith(elem);
             });