Merge branch '2.4-develop' into AC-2259-update-phpcs-fixer

Author: andrewbess

app/code/Magento/AsynchronousOperations/Model/BulkManagement.php

@@ -104,14 +104,18 @@ public function __construct(
      */
     public function scheduleBulk($bulkUuid, array $operations, $description, $userId = null)
     {
-        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
-        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
-        // save bulk summary and related operations
-        $connection->beginTransaction();
         $userType = $this->userContext->getUserType();
         if ($userType === null) {
             $userType = UserContextInterface::USER_TYPE_ADMIN;
         }
+        if ($userId === null && $userType === UserContextInterface::USER_TYPE_ADMIN) {
+            $userId = $this->userContext->getUserId();
+        }
+
+        $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
+        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
+        // save bulk summary and related operations
+        $connection->beginTransaction();
         try {
             /** @var BulkSummaryInterface $bulkSummary */
             $bulkSummary = $this->bulkSummaryFactory->create();

app/code/Magento/Backend/view/adminhtml/web/js/dashboard/chart.js

@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/*global define*/
 /*global FORM_KEY*/
 define([
     'jquery',

app/code/Magento/Backend/view/adminhtml/web/js/dashboard/totals.js

@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/*global define*/
 /*global FORM_KEY*/
 define([
     'jquery',

app/code/Magento/Bundle/view/adminhtml/web/js/bundle-product.js

@@ -5,7 +5,6 @@
 
 /*global FORM_KEY*/
 /*global bSelection*/
-/*global $H*/
 /**
  * @api
  */
@@ -186,7 +185,9 @@ define([
                                 });
                                 bSelection.gridRemoval.each(function (pair) {
                                     $optionBox.find('.col-sku').filter(function () {
-                                        return $(this).text().trim() === pair.key; // find row by SKU
+                                        let text = $(this).text();
+
+                                        return text.trim() === pair.key; // find row by SKU
                                     }).closest('tr').find('button.delete').trigger('click');
                                 });
                                 widget.refreshSortableElements();

app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js

@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/*global alert*/
 define([
     'jquery',
     'ko',

app/code/Magento/Catalog/view/adminhtml/web/catalog/base-image-uploader.js

@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/*global alert:true*/
 define([
     'jquery',
     'mage/template',

app/code/Magento/Catalog/view/adminhtml/web/catalog/category/assign-products.js

@@ -3,8 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/* global $, $H */
-
 define([
     'mage/adminhtml/grid'
 ], function () {

app/code/Magento/Catalog/view/base/web/js/price-utils.js

@@ -27,7 +27,7 @@ define([
      * @return {String}
      */
     function stringPad(string, times) {
-        return (new Array(times + 1)).join(string);
+        return new Array(times + 1).join(string);
     }
 
     /**

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Category.php

@@ -7,6 +7,7 @@
 
 namespace Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\Builder;
 
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
 use Magento\CatalogGraphQl\DataProvider\CategoryAttributesMapper;
 use Magento\CatalogGraphQl\DataProvider\Category\Query\CategoryAttributeQuery;
 use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\LayerBuilderInterface;
@@ -19,7 +20,9 @@
 use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\Builder\Aggregations;
 
 /**
- * @inheritdoc
+ * Category layer builder
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Category implements LayerBuilderInterface
 {
@@ -63,6 +66,11 @@ class Category implements LayerBuilderInterface
      */
     private $layerFormatter;
 
+    /**
+     * @var CollectionFactory
+     */
+    private $categoryCollectionFactory;
+
     /**
      * @var Aggregations\Category\IncludeDirectChildrenOnly
      */
@@ -75,21 +83,24 @@ class Category implements LayerBuilderInterface
      * @param ResourceConnection $resourceConnection
      * @param LayerFormatter $layerFormatter
      * @param Aggregations\Category\IncludeDirectChildrenOnly $includeDirectChildrenOnly
+     * @param CollectionFactory $categoryCollectionFactory
      */
     public function __construct(
         CategoryAttributeQuery $categoryAttributeQuery,
         CategoryAttributesMapper $attributesMapper,
         RootCategoryProvider $rootCategoryProvider,
         ResourceConnection $resourceConnection,
         LayerFormatter $layerFormatter,
-        Aggregations\Category\IncludeDirectChildrenOnly $includeDirectChildrenOnly
+        Aggregations\Category\IncludeDirectChildrenOnly $includeDirectChildrenOnly,
+        CollectionFactory $categoryCollectionFactory
     ) {
         $this->categoryAttributeQuery = $categoryAttributeQuery;
         $this->attributesMapper = $attributesMapper;
         $this->resourceConnection = $resourceConnection;
         $this->rootCategoryProvider = $rootCategoryProvider;
         $this->layerFormatter = $layerFormatter;
         $this->includeDirectChildrenOnly = $includeDirectChildrenOnly;
+        $this->categoryCollectionFactory = $categoryCollectionFactory;
     }
 
     /**
@@ -112,6 +123,11 @@ function (AggregationValueInterface $value) {
             $bucket->getValues()
         );
 
+        if ($storeId) {
+            $storeFilteredCategoryIds = $this->getStoreCategoryIds($storeId);
+            $categoryIds = \array_intersect($categoryIds, $storeFilteredCategoryIds);
+        }
+
         $categoryIds = \array_diff($categoryIds, [$this->rootCategoryProvider->getRootCategory($storeId)]);
         $categoryLabels = \array_column(
             $this->attributesMapper->getAttributesValues(
@@ -158,4 +174,25 @@ private function isBucketEmpty(?BucketInterface $bucket): bool
     {
         return null === $bucket || !$bucket->getValues();
     }
+
+    /**
+     * List of store categories
+     *
+     * @param int $storeId
+     * @return array
+     */
+    private function getStoreCategoryIds(int $storeId): array
+    {
+        $storeRootCategoryId = $this->rootCategoryProvider->getRootCategory($storeId);
+        $collection = $this->categoryCollectionFactory->create();
+        $select = $collection->getSelect();
+        $connection = $collection->getConnection();
+        $select->where(
+            $connection->quoteInto(
+                'e.path LIKE ? OR e.entity_id=' . $connection->quote($storeRootCategoryId, 'int'),
+                '%/' . $storeRootCategoryId . '/%'
+            )
+        );
+        return $collection->getAllIds();
+    }
 }

app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php

@@ -65,11 +65,12 @@ public function __construct(
      *
      * @param array $productIds
      * @param int $visibility
+     * @param int $storeId
      * @throws UrlAlreadyExistsException
      */
-    public function execute(array $productIds, int $visibility): void
+    public function execute(array $productIds, int $visibility, int $storeId): void
     {
-        $products = $this->getProductsByIds($productIds);
+        $products = $this->getProductsByIds($productIds, $storeId);
 
         /** @var Product $product */
         foreach ($products as $product) {
@@ -110,11 +111,13 @@ public function execute(array $productIds, int $visibility): void
      * Get Product Models by Id's
      *
      * @param array $productIds
+     * @param int $storeId
      * @return array
      */
-    private function getProductsByIds(array $productIds): array
+    private function getProductsByIds(array $productIds, int $storeId): array
     {
         $productCollection = $this->productCollectionFactory->create();
+        $productCollection->setStoreId($storeId);
         $productCollection->addAttributeToSelect(ProductInterface::VISIBILITY);
         $productCollection->addAttributeToSelect('url_key');
         $productCollection->addFieldToFilter(