Merge remote-tracking branch 'mainline/2.3-develop' into MC-21491

Author: cpartica

app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml

@@ -24,6 +24,10 @@
             <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
         </before>
         <after>
+            <!-- Delete the bundled product we created in the test body -->
+            <actionGroup ref="deleteProductBySku" stepKey="deleteBundleProduct">
+                <argument name="sku" value="{{BundleProduct.sku}}"/>
+            </actionGroup>
             <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>

app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php

@@ -105,7 +105,7 @@ public function execute(array $entityIds = [], $useTempTable = false)
      * @throws \Exception if metadataPool doesn't contain metadata for ProductInterface
      * @throws \DomainException
      */
-    private function getProductIdsWithParents(array $childProductIds)
+    private function getProductIdsWithParents(array $childProductIds): array
     {
         /** @var \Magento\Framework\EntityManager\EntityMetadataInterface $metadata */
         $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
@@ -123,8 +123,12 @@ private function getProductIdsWithParents(array $childProductIds)
             );
 
         $parentProductIds = $this->connection->fetchCol($select);
+        $ids = array_unique(array_merge($childProductIds, $parentProductIds));
+        foreach ($ids as $key => $id) {
+            $ids[$key] = (int) $id;
+        }
 
-        return array_unique(array_merge($childProductIds, $parentProductIds));
+        return $ids;
     }
 
     /**
@@ -175,7 +179,7 @@ protected function removeEntries()
     protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     {
         $select = parent::getNonAnchorCategoriesSelect($store);
-        return $select->where('ccp.product_id IN (?) OR relation.child_id IN (?)', $this->limitationByProducts);
+        return $select->where('ccp.product_id IN (?)', $this->limitationByProducts);
     }
 
     /**
@@ -216,28 +220,28 @@ protected function isRangingNeeded()
      * Returns a list of category ids which are assigned to product ids in the index
      *
      * @param array $productIds
-     * @return \Magento\Framework\Indexer\CacheContext
+     * @return array
      */
-    private function getCategoryIdsFromIndex(array $productIds)
+    private function getCategoryIdsFromIndex(array $productIds): array
     {
         $categoryIds = [];
         foreach ($this->storeManager->getStores() as $store) {
-            $categoryIds = array_merge(
-                $categoryIds,
-                $this->connection->fetchCol(
-                    $this->connection->select()
-                        ->from($this->getIndexTable($store->getId()), ['category_id'])
-                        ->where('product_id IN (?)', $productIds)
-                        ->distinct()
-                )
+            $storeCategories = $this->connection->fetchCol(
+                $this->connection->select()
+                    ->from($this->getIndexTable($store->getId()), ['category_id'])
+                    ->where('product_id IN (?)', $productIds)
+                    ->distinct()
             );
+            $categoryIds[] = $storeCategories;
         }
-        $parentCategories = $categoryIds;
+        $categoryIds = array_merge(...$categoryIds);
+
+        $parentCategories = [$categoryIds];
         foreach ($categoryIds as $categoryId) {
             $parentIds = explode('/', $this->getPathFromCategoryId($categoryId));
-            $parentCategories = array_merge($parentCategories, $parentIds);
+            $parentCategories[] = $parentIds;
         }
-        $categoryIds = array_unique($parentCategories);
+        $categoryIds = array_unique(array_merge(...$parentCategories));
 
         return $categoryIds;
     }

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection.xml

@@ -12,6 +12,8 @@
         <element name="filterOptions" type="text" selector=".filter-options-content .items"/>
         <element name="filterOption" type="text" selector=".filter-options-content .item"/>
         <element name="optionQty" type="text" selector=".filter-options-content .item .count"/>
+        <element name="filterOptionByLabel" type="button" selector=" div.filter-options-item div[option-label='{{optionLabel}}']" parameterized="true"/>
+        <element name="removeFilter" type="button" selector="div.filter-current .remove"/>
     </section>
     <section name="StorefrontCategorySidebarMobileSection">
         <element name="shopByButton" type="button" selector="//div[contains(@class, 'filter-title')]/strong[contains(text(), 'Shop By')]"/>

app/code/Magento/CatalogGraphQl/etc/schema.graphqls

@@ -27,7 +27,7 @@ type PriceAdjustment @doc(description: "PriceAdjustment is deprecated. Taxes wil
     description: PriceAdjustmentDescriptionEnum @deprecated(reason: "PriceAdjustment is deprecated.") @doc(description: "Indicates whether the entity described by the code attribute is included or excluded from the adjustment.")
 }
 
-enum PriceAdjustmentCodesEnum @doc(description: "PriceAdjustmentCodesEnum is deprecated. This enumeration contains values defined in modules other than the Catalog module.") {
+enum PriceAdjustmentCodesEnum @doc(description: "PriceAdjustment.code is deprecated. This enumeration contains values defined in modules other than the Catalog module.") {
 }
 
 enum PriceAdjustmentDescriptionEnum @doc(description: "PriceAdjustmentDescriptionEnum is deprecated. This enumeration states whether a price adjustment is included or excluded.") {

app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/AdminAssertDisabledQtyActionGroup.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminAssertDisabledQtyActionGroup">
+        <annotations>
+            <description>Goes to the 'Quantity' field and assert disabled attribute.</description>
+        </annotations>
+
+        <seeElement selector="{{AdminProductFormSection.productQuantity}}" stepKey="assertProductQty"/>
+        <assertElementContainsAttribute selector="{{AdminProductFormSection.productQuantity}}" attribute="disabled" expectedValue="true" stepKey="checkIfQtyIsDisabled" />
+    </actionGroup>
+</actionGroups>

app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php

@@ -1,11 +1,10 @@
 <?php
-
-declare(strict_types=1);
-
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogInventory\Ui\DataProvider\Product\Form\Modifier;
 
 use Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter;
@@ -238,7 +237,7 @@ private function prepareMeta()
             $this->meta = $this->arrayManager->merge(
                 $fieldsetPath . '/children',
                 $this->meta,
-                ['container_quantity_and_stock_status_qty' => $container]
+                ['quantity_and_stock_status_qty' => $container]
             );
         }
     }

app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php

@@ -23,7 +23,6 @@
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\ImportExport\Model\Import as ImportExport;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
@@ -252,7 +251,7 @@ public function execute(Observer $observer)
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    protected function _populateForUrlGeneration($rowData)
+    private function _populateForUrlGeneration($rowData)
     {
         $newSku = $this->import->getNewSku($rowData[ImportProduct::COL_SKU]);
         $oldSku = $this->import->getOldSku();
@@ -321,7 +320,7 @@ private function isNeedToPopulateForUrlGeneration($rowData, $newSku, $oldSku): b
      * @param array $rowData
      * @return void
      */
-    protected function setStoreToProduct(Product $product, array $rowData)
+    private function setStoreToProduct(Product $product, array $rowData)
     {
         if (!empty($rowData[ImportProduct::COL_STORE])
             && ($storeId = $this->import->getStoreIdByCode($rowData[ImportProduct::COL_STORE]))
@@ -339,7 +338,7 @@ protected function setStoreToProduct(Product $product, array $rowData)
      * @param string $storeId
      * @return $this
      */
-    protected function addProductToImport($product, $storeId)
+    private function addProductToImport($product, $storeId)
     {
         if ($product->getVisibility() == (string)Visibility::getOptionArray()[Visibility::VISIBILITY_NOT_VISIBLE]) {
             return $this;
@@ -357,7 +356,7 @@ protected function addProductToImport($product, $storeId)
      * @param Product $product
      * @return $this
      */
-    protected function populateGlobalProduct($product)
+    private function populateGlobalProduct($product)
     {
         foreach ($this->import->getProductWebsites($product->getSku()) as $websiteId) {
             foreach ($this->websitesToStoreIds[$websiteId] as $storeId) {
@@ -376,7 +375,7 @@ protected function populateGlobalProduct($product)
      * @return UrlRewrite[]
      * @throws LocalizedException
      */
-    protected function generateUrls()
+    private function generateUrls()
     {
         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
         $mergeDataProvider->merge($this->canonicalUrlRewriteGenerate());
@@ -398,7 +397,7 @@ protected function generateUrls()
      * @param int|null $storeId
      * @return bool
      */
-    protected function isGlobalScope($storeId)
+    private function isGlobalScope($storeId)
     {
         return null === $storeId || $storeId == Store::DEFAULT_STORE_ID;
     }
@@ -408,7 +407,7 @@ protected function isGlobalScope($storeId)
      *
      * @return UrlRewrite[]
      */
-    protected function canonicalUrlRewriteGenerate()
+    private function canonicalUrlRewriteGenerate()
     {
         $urls = [];
         foreach ($this->products as $productId => $productsByStores) {
@@ -433,7 +432,7 @@ protected function canonicalUrlRewriteGenerate()
      * @return UrlRewrite[]
      * @throws LocalizedException
      */
-    protected function categoriesUrlRewriteGenerate()
+    private function categoriesUrlRewriteGenerate(): array
     {
         $urls = [];
         foreach ($this->products as $productId => $productsByStores) {
@@ -444,25 +443,32 @@ protected function categoriesUrlRewriteGenerate()
                         continue;
                     }
                     $requestPath = $this->productUrlPathGenerator->getUrlPathWithSuffix($product, $storeId, $category);
-                    $urls[] = $this->urlRewriteFactory->create()
-                        ->setEntityType(ProductUrlRewriteGenerator::ENTITY_TYPE)
-                        ->setEntityId($productId)
-                        ->setRequestPath($requestPath)
-                        ->setTargetPath($this->productUrlPathGenerator->getCanonicalUrlPath($product, $category))
-                        ->setStoreId($storeId)
-                        ->setMetadata(['category_id' => $category->getId()]);
+                    $urls[] = [
+                            $this->urlRewriteFactory->create()
+                            ->setEntityType(ProductUrlRewriteGenerator::ENTITY_TYPE)
+                            ->setEntityId($productId)
+                            ->setRequestPath($requestPath)
+                            ->setTargetPath($this->productUrlPathGenerator->getCanonicalUrlPath($product, $category))
+                            ->setStoreId($storeId)
+                            ->setMetadata(['category_id' => $category->getId()])
+                    ];
+                    $parentCategoryIds = $category->getAnchorsAbove();
+                    if ($parentCategoryIds) {
+                        $urls[] = $this->getParentCategoriesUrlRewrites($parentCategoryIds, $storeId, $product);
+                    }
                 }
             }
         }
-        return $urls;
+        $result = !empty($urls) ? array_merge(...$urls) : [];
+        return $result;
     }
 
     /**
      * Generate list based on current rewrites
      *
      * @return UrlRewrite[]
      */
-    protected function currentUrlRewritesRegenerate()
+    private function currentUrlRewritesRegenerate()
     {
         $currentUrlRewrites = $this->urlFinder->findAllByData(
             [
@@ -496,7 +502,7 @@ protected function currentUrlRewritesRegenerate()
      * @param Category $category
      * @return array
      */
-    protected function generateForAutogenerated($url, $category)
+    private function generateForAutogenerated($url, $category)
     {
         $storeId = $url->getStoreId();
         $productId = $url->getEntityId();
@@ -532,7 +538,7 @@ protected function generateForAutogenerated($url, $category)
      * @param Category $category
      * @return array
      */
-    protected function generateForCustom($url, $category)
+    private function generateForCustom($url, $category)
     {
         $storeId = $url->getStoreId();
         $productId = $url->getEntityId();
@@ -566,7 +572,7 @@ protected function generateForCustom($url, $category)
      * @param UrlRewrite $url
      * @return Category|null|bool
      */
-    protected function retrieveCategoryFromMetadata($url)
+    private function retrieveCategoryFromMetadata($url)
     {
         $metadata = $url->getMetadata();
         if (isset($metadata['category_id'])) {
@@ -576,32 +582,6 @@ protected function retrieveCategoryFromMetadata($url)
         return null;
     }
 
-    /**
-     * Check, category suited for url-rewrite generation.
-     *
-     * @param Category $category
-     * @param int $storeId
-     * @return bool
-     * @throws NoSuchEntityException
-     */
-    protected function isCategoryProperForGenerating($category, $storeId)
-    {
-        if (isset($this->acceptableCategories[$storeId]) &&
-            isset($this->acceptableCategories[$storeId][$category->getId()])) {
-            return $this->acceptableCategories[$storeId][$category->getId()];
-        }
-        $acceptable = false;
-        if ($category->getParentId() != Category::TREE_ROOT_ID) {
-            list(, $rootCategoryId) = $category->getParentIds();
-            $acceptable = ($rootCategoryId == $this->storeManager->getStore($storeId)->getRootCategoryId());
-        }
-        if (!isset($this->acceptableCategories[$storeId])) {
-            $this->acceptableCategories[$storeId] = [];
-        }
-        $this->acceptableCategories[$storeId][$category->getId()] = $acceptable;
-        return $acceptable;
-    }
-
     /**
      * Get category by id considering store scope.
      *
@@ -635,4 +615,36 @@ private function isCategoryRewritesEnabled()
     {
         return (bool)$this->scopeConfig->getValue('catalog/seo/generate_category_product_rewrites');
     }
+
+    /**
+     * Generate url-rewrite for anchor parent-categories.
+     *
+     * @param array $categoryIds
+     * @param int $storeId
+     * @param Product $product
+     * @return array
+     * @throws LocalizedException
+     */
+    private function getParentCategoriesUrlRewrites(array $categoryIds, int $storeId, Product $product): array
+    {
+        $urls = [];
+        foreach ($categoryIds as $categoryId) {
+            $category = $this->getCategoryById($categoryId, $storeId);
+            if ($category->getParentId() == Category::TREE_ROOT_ID) {
+                continue;
+            }
+            $requestPath = $this->productUrlPathGenerator
+                ->getUrlPathWithSuffix($product, $storeId, $category);
+            $targetPath = $this->productUrlPathGenerator
+                ->getCanonicalUrlPath($product, $category);
+            $urls[] = $this->urlRewriteFactory->create()
+                ->setEntityType(ProductUrlRewriteGenerator::ENTITY_TYPE)
+                ->setEntityId($product->getId())
+                ->setRequestPath($requestPath)
+                ->setTargetPath($targetPath)
+                ->setStoreId($storeId)
+                ->setMetadata(['category_id' => $category->getId()]);
+        }
+        return $urls;
+    }
 }