🔃 [Magento Community Engineering] Community Contributions - 2.4-develop daily delivery

Accepted Community Pull Requests:
 - #28044: fixed negative  children_count after deleting categories (by @ProkopovVitaliy)
 - #27616: Load appropriate slider widget on demand to improve performance (by @krzksz)
 - #27064: Customer attribute frontend labels not using the store label values on the frontend (by @nntoan)


Fixed GitHub Issues:
 - #27969: children_count can become negative after deleting categories (reported by @wojtekn) has been fixed in #28044 by @ProkopovVitaliy in 2.4-develop branch
   Related commits:
     1. 0dfd146
     2. 0fea657
     3. fc65f5b
     4. ce3d97f
     5. e7b6e45
     6. b07a831
     7. 85ecd6e
     8. fd7663f
     9. 0242849
     10. 1ff938c
     11. caf9ae2
     12. 80e3107
     13. 5300e3e
     14. 62ee4a2

 - #28807: [Issue] Load appropriate slider widget on demand to improve performance (reported by @m2-assistant[bot]) has been fixed in #27616 by @krzksz in 2.4-develop branch
   Related commits:
     1. 2a90e76
     2. f799baa
     3. 62b9453
     4. 8bacfbe
     5. e08a0a3
     6. 0e6ab83

 - #27063: [2.3.x] Customer attribute frontend labels not using the store label values on the frontend (reported by @nntoan) has been fixed in #27064 by @nntoan in 2.4-develop branch
   Related commits:
     1. fdec82c
     2. 9a7d68d
     3. 0bf66d9
     4. 9b6e058
     5. aa148c3
     6. 4c110b7
     7. 705b5be
     8. 5749b24
     9. d4ba184
     10. cec82da
     11. 2f0dae9
     12. 88da24a
     13. e99e6e1
     14. 5bc8bba
     15. 9f20b7f
     16. b1480fb
     17. 05fbd1f
     18. ef806a5
     19. dec273f
     20. 458ce8d
     21. 8848c6a
     22. 53498e1
     23. 893641c
     24. 48411f9
     25. b4f98d6
     26. 040c23d
     27. fc9b841
     28. 6a912c2
     29. e9b4cf0

Author: magento-engcom-team

app/code/Magento/Catalog/Model/ResourceModel/Category/AggregateCount.php

@@ -8,11 +8,15 @@
 use Magento\Catalog\Model\Category;
 
 /**
+ * Aggregate count for parent category after deleting child category
+ *
  * Class AggregateCount
  */
 class AggregateCount
 {
     /**
+     * Reduces children count for parent categories
+     *
      * @param Category $category
      * @return void
      */
@@ -25,9 +29,7 @@ public function processDelete(Category $category)
          */
         $parentIds = $category->getParentIds();
         if ($parentIds) {
-            $childDecrease = $category->getChildrenCount() + 1;
-            // +1 is itself
-            $data = ['children_count' => new \Zend_Db_Expr('children_count - ' . $childDecrease)];
+            $data = ['children_count' => new \Zend_Db_Expr('children_count - 1')];
             $where = ['entity_id IN(?)' => $parentIds];
             $resourceModel->getConnection()->update($resourceModel->getEntityTable(), $data, $where);
         }

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/AggregateCountTest.php

@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Category;
+
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\ResourceModel\Category\AggregateCount;
+use Magento\Catalog\Model\ResourceModel\Category as ResourceCategory;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Aggregate count model test
+ */
+class AggregateCountTest extends TestCase
+{
+
+    /**
+     * @var AggregateCount
+     */
+    protected $aggregateCount;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManagerHelper;
+
+    /**
+     * @var Category|MockObject
+     */
+    protected $categoryMock;
+
+    /**
+     * @var  ResourceCategory|MockObject
+     */
+    protected $resourceCategoryMock;
+
+    /**
+     * @var AdapterInterface|MockObject
+     */
+    protected $connectionMock;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setUp(): void
+    {
+        $this->categoryMock = $this->createMock(Category::class);
+        $this->resourceCategoryMock = $this->createMock(ResourceCategory::class);
+        $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)
+            ->getMockForAbstractClass();
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->aggregateCount = $this->objectManagerHelper->getObject(AggregateCount::class);
+    }
+
+    /**
+     * @return void
+     */
+    public function testProcessDelete(): void
+    {
+        $parentIds = 3;
+        $table = 'catalog_category_entity';
+
+        $this->categoryMock->expects($this->once())
+            ->method('getResource')
+            ->willReturn($this->resourceCategoryMock);
+        $this->categoryMock->expects($this->once())
+            ->method('getParentIds')
+            ->willReturn($parentIds);
+        $this->resourceCategoryMock->expects($this->any())
+            ->method('getEntityTable')
+            ->willReturn($table);
+        $this->resourceCategoryMock->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+        $this->connectionMock->expects($this->once())
+            ->method('update')
+            ->with(
+                $table,
+                ['children_count' => new \Zend_Db_Expr('children_count - 1')],
+                ['entity_id IN(?)' => $parentIds]
+            );
+        $this->aggregateCount->processDelete($this->categoryMock);
+    }
+}

app/code/Magento/Customer/Block/DataProviders/AddressAttributeData.php

@@ -52,7 +52,7 @@ public function getFrontendLabel(string $attributeCode): string
     {
         try {
             $attribute =  $this->addressMetadata->getAttributeMetadata($attributeCode);
-            $frontendLabel = $attribute->getFrontendLabel();
+            $frontendLabel = $attribute->getStoreLabel() ?: $attribute->getFrontendLabel();
         } catch (NoSuchEntityException $e) {
             $frontendLabel = '';
         }

app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/range.js

@@ -7,13 +7,18 @@ define([
     'ko',
     'jquery',
     'underscore',
-    '../template/renderer',
-    'jquery-ui-modules/slider'
+    '../template/renderer'
 ], function (ko, $, _, renderer) {
     'use strict';
 
     var isTouchDevice = !_.isUndefined(document.ontouchstart),
-        sliderFn = 'slider';
+        sliderFn = 'slider',
+        sliderModule = 'jquery-ui-modules/slider';
+
+    if (isTouchDevice) {
+        sliderFn = 'touchSlider';
+        sliderModule = 'mage/touch-slider';
+    }
 
     ko.bindingHandlers.range = {
 
@@ -41,7 +46,9 @@ define([
                 }
             });
 
-            $(element)[sliderFn](config);
+            require([sliderModule], function () {
+                $(element)[sliderFn](config);
+            });
         },
 
         /**
@@ -55,149 +62,11 @@ define([
 
             config.value = ko.unwrap(config.value);
 
-            $(element)[sliderFn]('option', config);
+            require([sliderModule], function () {
+                $(element)[sliderFn]('option', config);
+            });
         }
     };
 
     renderer.addAttribute('range');
-
-    if (!isTouchDevice) {
-        return;
-    }
-
-    $.widget('mage.touchSlider', $.ui.slider, {
-
-        /**
-         * Creates instance of widget.
-         *
-         * @override
-         */
-        _create: function () {
-            _.bindAll(
-                this,
-                '_mouseDown',
-                '_mouseMove',
-                '_onTouchEnd'
-            );
-
-            return this._superApply(arguments);
-        },
-
-        /**
-         * Initializes mouse events on element.
-         * @override
-         */
-        _mouseInit: function () {
-            var result = this._superApply(arguments);
-
-            this.element
-                .off('mousedown.' + this.widgetName)
-                .on('touchstart.' + this.widgetName, this._mouseDown);
-
-            return result;
-        },
-
-        /**
-         * Elements' 'mousedown' event handler polyfill.
-         * @override
-         */
-        _mouseDown: function (event) {
-            var prevDelegate = this._mouseMoveDelegate,
-                result;
-
-            event = this._touchToMouse(event);
-            result = this._super(event);
-
-            if (prevDelegate === this._mouseMoveDelegate) {
-                return result;
-            }
-
-            $(document)
-                .off('mousemove.' + this.widgetName)
-                .off('mouseup.' + this.widgetName);
-
-            $(document)
-                .on('touchmove.' + this.widgetName, this._mouseMove)
-                .on('touchend.' + this.widgetName, this._onTouchEnd)
-                .on('tochleave.' + this.widgetName, this._onTouchEnd);
-
-            return result;
-        },
-
-        /**
-         * Documents' 'mousemove' event handler polyfill.
-         *
-         * @override
-         * @param {Event} event - Touch event object.
-         */
-        _mouseMove: function (event) {
-            event = this._touchToMouse(event);
-
-            return this._super(event);
-        },
-
-        /**
-         * Documents' 'touchend' event handler.
-         */
-        _onTouchEnd: function (event) {
-            $(document).trigger('mouseup');
-
-            return this._mouseUp(event);
-        },
-
-        /**
-         * Removes previously assigned touch handlers.
-         *
-         * @override
-         */
-        _mouseUp: function () {
-            this._removeTouchHandlers();
-
-            return this._superApply(arguments);
-        },
-
-        /**
-         * Removes previously assigned touch handlers.
-         *
-         * @override
-         */
-        _mouseDestroy: function () {
-            this._removeTouchHandlers();
-
-            return this._superApply(arguments);
-        },
-
-        /**
-         * Removes touch events from document object.
-         */
-        _removeTouchHandlers: function () {
-            $(document)
-                .off('touchmove.' + this.widgetName)
-                .off('touchend.' + this.widgetName)
-                .off('touchleave.' + this.widgetName);
-        },
-
-        /**
-         * Adds properties to the touch event to mimic mouse event.
-         *
-         * @param {Event} event - Touch event object.
-         * @returns {Event}
-         */
-        _touchToMouse: function (event) {
-            var orig = event.originalEvent,
-                touch = orig.touches[0];
-
-            return _.extend(event, {
-                which:      1,
-                pageX:      touch.pageX,
-                pageY:      touch.pageY,
-                clientX:    touch.clientX,
-                clientY:    touch.clientY,
-                screenX:    touch.screenX,
-                screenY:    touch.screenY
-            });
-        }
-    });
-
-    sliderFn = 'touchSlider';
 });

dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php

@@ -49,7 +49,7 @@ class CategoryTest extends TestCase
      */
     protected $objectManager;
 
-    /** @var CategoryRepository */
+    /** @var CategoryResource */
     private $categoryResource;
 
     /** @var CategoryRepositoryInterface */
@@ -355,6 +355,17 @@ public function testDeleteChildren(): void
         $this->assertEquals($this->_model->getId(), null);
     }
 
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoAppArea adminhtml
+     * @magentoDataFixture Magento/Catalog/_files/categories_no_products.php
+     */
+    public function testChildrenCountAfterDeleteParentCategory(): void
+    {
+        $this->categoryRepository->deleteByIdentifier(3);
+        $this->assertEquals(8, $this->categoryResource->getChildrenCount(1));
+    }
+
     /**
      * @magentoDataFixture Magento/Catalog/_files/category.php
      */

dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php

@@ -138,6 +138,22 @@ public function testFaxEnabled(): void
         $this->assertStringContainsString('title="Fax"', $block->toHtml());
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/_files/attribute_city_store_label_address.php
+     */
+    public function testCityWithStoreLabel(): void
+    {
+        /** @var \Magento\Customer\Block\Form\Register $block */
+        $block = Bootstrap::getObjectManager()->create(
+            Register::class
+        )->setTemplate('Magento_Customer::form/register.phtml')
+            ->setShowAddressFields(true);
+        $this->setAttributeDataProvider($block);
+
+        $this->assertStringNotContainsString('title="City"', $block->toHtml());
+        $this->assertStringContainsString('title="Suburb"', $block->toHtml());
+    }
+
     /**
      * @inheritdoc
      */

dev/tests/integration/testsuite/Magento/Customer/_files/attribute_city_store_label_address.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+//@codingStandardsIgnoreFile
+/** @var \Magento\Customer\Model\Attribute $model */
+$model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Attribute::class);
+/** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+$storeManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\StoreManager::class);
+$model->loadByCode('customer_address', 'city');
+$storeLabels = $model->getStoreLabels();
+$stores = $storeManager->getStores();
+/** @var \Magento\Store\Api\Data\WebsiteInterface $website */
+foreach ($stores as $store) {
+    $storeLabels[$store->getId()] = 'Suburb';
+}
+$model->setStoreLabels($storeLabels);
+$model->save();