Merge pull request #6709 from magento-tsg/2.4-develop-pr135

zakdma · web-flow · commit 7c6b6365a3c0 · 2021-03-23T09:16:48.000+02:00
[Arrows] Fixes for 2.4 (pr135) (2.4-develop)
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
@@ -64,7 +64,10 @@ define([
                         click: function () {
                             self.onConfirmBtn();
                         }
-                    }]
+                    }],
+                    closed: function () {
+                        self.clean('window');
+                    },
                 });
             });
         },
@@ -406,6 +409,7 @@ define([
                         this.blockMsgError.innerHTML = response.message;
                         this._showWindow();
 
+                        jQuery(this.blockForm).trigger('processStop');
                         return false;
                     }
                 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
@@ -7,6 +7,7 @@
 
 namespace Magento\CatalogGraphQl\Model\Category;
 
+use GraphQL\Language\AST\Node;
 use GraphQL\Language\AST\FieldNode;
 use GraphQL\Language\AST\InlineFragmentNode;
 use GraphQL\Language\AST\NodeKind;
@@ -26,22 +27,35 @@ class DepthCalculator
      */
     public function calculate(ResolveInfo $resolveInfo, FieldNode $fieldNode) : int
     {
-        $selections = $fieldNode->selectionSet->selections ?? [];
+        return $this->calculateRecursive($resolveInfo, $fieldNode);
+    }
+
+    /**
+     * Calculate recursive the total depth of a category tree inside a GraphQL request
+     *
+     * @param ResolveInfo $resolveInfo
+     * @param Node $node
+     * @return int
+     */
+    private function calculateRecursive(ResolveInfo $resolveInfo, Node $node) : int
+    {
+        if ($node->kind === NodeKind::FRAGMENT_SPREAD) {
+            $selections = isset($resolveInfo->fragments[$node->name->value]) ?
+                $resolveInfo->fragments[$node->name->value]->selectionSet->selections : [];
+        } else {
+            $selections = $node->selectionSet->selections ?? [];
+        }
         $depth = count($selections) ? 1 : 0;
         $childrenDepth = [0];
-        foreach ($selections as $node) {
-            if (isset($node->alias) && null !== $node->alias) {
+        foreach ($selections as $subNode) {
+            if (isset($subNode->alias) && null !== $subNode->alias) {
                 continue;
             }
 
-            if ($node->kind ===  NodeKind::INLINE_FRAGMENT) {
-                $childrenDepth[] = $this->addInlineFragmentDepth($resolveInfo, $node);
-            } elseif ($node->kind === NodeKind::FRAGMENT_SPREAD && isset($resolveInfo->fragments[$node->name->value])) {
-                foreach ($resolveInfo->fragments[$node->name->value]->selectionSet->selections as $spreadNode) {
-                    $childrenDepth[] = $this->calculate($resolveInfo, $spreadNode);
-                }
+            if ($subNode->kind ===  NodeKind::INLINE_FRAGMENT) {
+                $childrenDepth[] = $this->addInlineFragmentDepth($resolveInfo, $subNode);
             } else {
-                $childrenDepth[] = $this->calculate($resolveInfo, $node);
+                $childrenDepth[] = $this->calculateRecursive($resolveInfo, $subNode);
             }
         }
 
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php b/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
@@ -25,6 +25,7 @@
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Psr\Log\LoggerInterface as PsrLogger;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -98,8 +99,11 @@ class StockItemRepository implements StockItemRepositoryInterface
     protected $productCollectionFactory;
 
     /**
-     * Constructor
-     *
+     * @var PsrLogger
+     */
+    private $psrLogger;
+
+    /**
      * @param StockConfigurationInterface $stockConfiguration
      * @param StockStateProviderInterface $stockStateProvider
      * @param StockItemResource $resource
@@ -111,7 +115,8 @@ class StockItemRepository implements StockItemRepositoryInterface
      * @param TimezoneInterface $localeDate
      * @param Processor $indexProcessor
      * @param DateTime $dateTime
-     * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory|null $collectionFactory
+     * @param CollectionFactory|null $productCollectionFactory
+     * @param PsrLogger|null $psrLogger
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -126,7 +131,8 @@ public function __construct(
         TimezoneInterface $localeDate,
         Processor $indexProcessor,
         DateTime $dateTime,
-        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory = null
+        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory = null,
+        PsrLogger $psrLogger = null
     ) {
         $this->stockConfiguration = $stockConfiguration;
         $this->stockStateProvider = $stockStateProvider;
@@ -141,6 +147,8 @@ public function __construct(
         $this->dateTime = $dateTime;
         $this->productCollectionFactory = $productCollectionFactory ?: ObjectManager::getInstance()
             ->get(CollectionFactory::class);
+        $this->psrLogger = $psrLogger ?: ObjectManager::getInstance()
+            ->get(PsrLogger::class);
     }
 
     /**
@@ -184,6 +192,7 @@ public function save(\Magento\CatalogInventory\Api\Data\StockItemInterface $stoc
 
             $this->resource->save($stockItem);
         } catch (\Exception $exception) {
+            $this->psrLogger->error($exception->getMessage());
             throw new CouldNotSaveException(__('The stock item was unable to be saved. Please try again.'), $exception);
         }
         return $stockItem;
diff --git a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
@@ -105,47 +105,46 @@ public function verifyNotification(StockItemInterface $stockItem)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQty, $origQty = 0)
     {
         $result = $this->objectFactory->create();
         $result->setHasError(false);
-
         $qty = $this->getNumber($qty);
-
-        /**
-         * Check quantity type
-         */
-        $result->setItemIsQtyDecimal($stockItem->getIsQtyDecimal());
-        if (!$stockItem->getIsQtyDecimal()) {
-            $result->setHasQtyOptionUpdate(true);
-            $qty = (int) $qty ?: 1;
-            /**
-             * Adding stock data to quote item
-             */
-            $result->setItemQty($qty);
-            $result->setOrigQty((int)$this->getNumber($origQty) ?: 1);
-        }
+        $quoteMessage = __('Please correct the quantity for some products.');
 
         if ($stockItem->getMinSaleQty() && $qty < $stockItem->getMinSaleQty()) {
             $result->setHasError(true)
                 ->setMessage(__('The fewest you may purchase is %1.', $stockItem->getMinSaleQty() * 1))
                 ->setErrorCode('qty_min')
-                ->setQuoteMessage(__('Please correct the quantity for some products.'))
+                ->setQuoteMessage($quoteMessage)
                 ->setQuoteMessageIndex('qty');
             return $result;
         }
 
         if ($stockItem->getMaxSaleQty() && $qty > $stockItem->getMaxSaleQty()) {
             $result->setHasError(true)
-                ->setMessage(__('The most you may purchase is %1.', $stockItem->getMaxSaleQty() * 1))
+                ->setMessage(__('The requested qty exceeds the maximum qty allowed in shopping cart'))
                 ->setErrorCode('qty_max')
-                ->setQuoteMessage(__('Please correct the quantity for some products.'))
+                ->setQuoteMessage($quoteMessage)
                 ->setQuoteMessageIndex('qty');
             return $result;
         }
 
         $result->addData($this->checkQtyIncrements($stockItem, $qty)->getData());
+
+        $result->setItemIsQtyDecimal($stockItem->getIsQtyDecimal());
+        if (!$stockItem->getIsQtyDecimal() && (floor($qty) !== $qty)) {
+            $result->setHasError(true)
+                ->setMessage(__('You cannot use decimal quantity for this product.'))
+                ->setErrorCode('qty_decimal')
+                ->setQuoteMessage($quoteMessage)
+                ->setQuoteMessageIndex('qty');
+
+            return $result;
+        }
+
         if ($result->getHasError()) {
             return $result;
         }
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Spi/StockStateProviderTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Spi/StockStateProviderTest.php
@@ -21,6 +21,8 @@
 use PHPUnit\Framework\TestCase;
 
 /**
+ * Unit tests for \Magento\CatalogInventory\Model\StockStateProvider class.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class StockStateProviderTest extends TestCase
@@ -115,6 +117,9 @@ class StockStateProviderTest extends TestCase
         'getProductName',
     ];
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp(): void
     {
         $this->objectManagerHelper = new ObjectManagerHelper($this);
@@ -383,7 +388,7 @@ protected function getVariations()
                     'suggestQty' => 51,
                     'getStockQty' => $stockQty,
                     'checkQtyIncrements' => false,
-                    'checkQuoteItemQty' => false,
+                    'checkQuoteItemQty' => true,
                 ],
             ],
             [
@@ -411,7 +416,7 @@ protected function getVariations()
                     'getStockQty' => $stockQty,
                     'checkQtyIncrements' => false,
                     'checkQuoteItemQty' => true,
-                ]
+                ],
             ],
             [
                 'values' => [
@@ -438,8 +443,8 @@ protected function getVariations()
                     'getStockQty' => null,
                     'checkQtyIncrements' => false,
                     'checkQuoteItemQty' => true,
-                ]
-            ]
+                ],
+            ],
         ];
     }
 
diff --git a/app/code/Magento/CatalogInventory/i18n/en_US.csv b/app/code/Magento/CatalogInventory/i18n/en_US.csv
@@ -71,3 +71,5 @@ Stock,Stock
 "Qty Uses Decimals","Qty Uses Decimals"
 "Allow Multiple Boxes for Shipping","Allow Multiple Boxes for Shipping"
 "Done","Done"
+"The requested qty exceeds the maximum qty allowed in shopping cart","The requested qty exceeds the maximum qty allowed in shopping cart"
+"You cannot use decimal quantity for this product.","You cannot use decimal quantity for this product."
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js b/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
@@ -161,9 +161,13 @@ define([
                 return valid;
             }
 
-            validator = loginForm.validate();
+            if (loginForm.is(':visible')) {
+                validator = loginForm.validate();
 
-            return validator.check(usernameSelector);
+                return validator.check(usernameSelector);
+            }
+
+            return true;
         },
 
         /**
diff --git a/app/code/Magento/Elasticsearch/Model/ResourceModel/Index.php b/app/code/Magento/Elasticsearch/Model/ResourceModel/Index.php
@@ -6,6 +6,7 @@
 namespace Magento\Elasticsearch\Model\ResourceModel;
 
 use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -137,7 +138,11 @@ public function getFullCategoryProductIndexData($storeId = null, $productIds = n
 
         foreach ($categoryPositions as $productId => $positions) {
             foreach ($positions as $categoryId => $position) {
-                $category = $this->categoryRepository->get($categoryId, $storeId);
+                try {
+                    $category = $this->categoryRepository->get($categoryId, $storeId);
+                } catch (NoSuchEntityException $e) {
+                    continue;
+                }
                 $categoryName = $category->getName();
                 $categoryData[$productId][] = [
                     'id' => $categoryId,
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
@@ -842,4 +842,49 @@ public function testFilterCategoryNamedFragment()
         $this->assertEquals($result['categoryList'][0]['uid'], base64_encode('6'));
         $this->assertEquals($result['categoryList'][0]['url_path'], 'category-2');
     }
+
+    /**
+     * Test when there is recursive category node fragment
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     */
+    public function testFilterCategoryRecursiveFragment() : void
+    {
+        $query = <<<'QUERY'
+query GetCategoryTree($filters: CategoryFilterInput!) {
+    categoryList(filters: $filters) {
+        ...recursiveCategoryNode
+    }
+}
+
+fragment recursiveCategoryNode on CategoryTree {
+  ...categoryNode
+  children {
+    ...categoryNode
+  }
+}
+
+fragment categoryNode on CategoryTree {
+  id
+}
+QUERY;
+        $variables = [
+            'filters' => [
+                'ids' => [
+                    'eq' => '2',
+                ],
+            ],
+        ];
+        $result = $this->graphQlQuery($query, $variables);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertCount(1, $result['categoryList']);
+        $this->assertCount(2, $result['categoryList'][0]);
+        $this->assertArrayHasKey('id', $result['categoryList'][0]);
+        $this->assertArrayHasKey('children', $result['categoryList'][0]);
+        $this->assertEquals($result['categoryList'][0]['id'], '2');
+        $this->assertCount(7, $result['categoryList'][0]['children']);
+        $this->assertCount(1, $result['categoryList'][0]['children'][0]);
+        $this->assertArrayHasKey('id', $result['categoryList'][0]['children'][0]);
+        $this->assertEquals($result['categoryList'][0]['children'][0]['id'], '3');
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
@@ -22,6 +22,8 @@
 use Magento\TestFramework\TestCase\AbstractBackendController;
 use Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager;
 use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Category;
 
 /**
  * Test class for Product adminhtml actions
@@ -46,6 +48,11 @@ class ProductTest extends AbstractBackendController
      */
     private $resourceModel;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * @inheritDoc
      */
@@ -62,6 +69,7 @@ protected function setUp(): void
         $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
         $this->repositoryFactory = Bootstrap::getObjectManager()->get(ProductRepositoryFactory::class);
         $this->resourceModel = Bootstrap::getObjectManager()->get(ProductResource::class);
+        $this->productRepository = $this->_objectManager->get(ProductRepositoryInterface::class);
     }
 
     /**
@@ -677,4 +685,24 @@ public function testSaveActionWithInvalidUrlKey(array $postData)
         );
         $this->assertRedirect($this->stringContains('/backend/catalog/product/new'));
     }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
+     * @magentoDbIsolation disabled
+     * @magentoAppArea adminhtml
+     */
+    public function testSaveProductWithDeletedCategory(): void
+    {
+        $category = $this->_objectManager->get(Category::class);
+        $category->load(333);
+        $category->delete();
+        $product = $this->productRepository->get('simple333');
+        $this->productRepository->save($product);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->dispatch('backend/catalog/product/save/id/' . $product->getEntityId());
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You saved the product.')]),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/UpdateTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart/UpdateTest.php
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/form/element/email.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/form/element/email.test.js

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,10 @@ define([`
`64`	`64`	`click: function () {`
`65`	`65`	`self.onConfirmBtn();`
`66`	`66`	`}`
`67`		`- }]`
	`67`	`+ }],`
	`68`	`+ closed: function () {`
	`69`	`+ self.clean('window');`
	`70`	`+ },`
`68`	`71`	`});`
`69`	`72`	`});`
`70`	`73`	`},`
`@@ -406,6 +409,7 @@ define([`
`406`	`409`	`this.blockMsgError.innerHTML = response.message;`
`407`	`410`	`this._showWindow();`
`408`	`411`
	`412`	`+ jQuery(this.blockForm).trigger('processStop');`
`409`	`413`	`return false;`
`410`	`414`	`}`
`411`	`415`	`}`