MC-40031: [UX] Configurations are not preserved on form reload when new configurable product creation fails

Author: mastiuhin-olexandr

app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php

@@ -13,7 +13,6 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
-use Magento\Catalog\Model\Product as ProductModel;
 use Magento\CatalogUrlRewrite\Model\Product\Validator as ProductUrlRewriteValidator;
 
 /**
@@ -141,7 +140,7 @@ public function execute()
             $resource->getAttribute('news_from_date')->setMaxValue($product->getNewsToDate());
             $resource->getAttribute('custom_design_from')->setMaxValue($product->getCustomDesignTo());
 
-            $this->validateUrlKeyUniqueness($product);
+            $this->productUrlRewriteValidator->validateUrlKey($product);
             $this->productValidator->validate($product, $this->getRequest(), $response);
         } catch (\Magento\Eav\Model\Entity\Attribute\Exception $e) {
             $response->setError(true);
@@ -167,32 +166,6 @@ public function execute()
         return $this->resultJsonFactory->create()->setData($response);
     }
 
-    /**
-     * Validates Url Key uniqueness.
-     *
-     * @param ProductModel $product
-     * @throws UrlAlreadyExistsException
-     */
-    private function validateUrlKeyUniqueness(ProductModel $product): void
-    {
-        $conflictingUrlRewrites = $this->productUrlRewriteValidator->findUrlKeyConflicts($product);
-
-        if ($conflictingUrlRewrites) {
-            $data = [];
-
-            foreach ($conflictingUrlRewrites as $urlRewrite) {
-                $data[$urlRewrite->getUrlRewriteId()] = $urlRewrite->toArray();
-            }
-
-            throw new UrlAlreadyExistsException(
-                __('URL key for specified store already exists.'),
-                null,
-                0,
-                $data
-            );
-        }
-    }
-
     /**
      * @return StoreManagerInterface
      * @deprecated 101.0.0

app/code/Magento/CatalogUrlRewrite/Model/Product/Validator.php

@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
@@ -50,12 +51,12 @@ public function __construct(
     }
 
     /**
-     * Find Url Key conflicts of a product.
+     * Validate Url Key of a Product.
      *
      * @param Product $product
-     * @return array Array of conflicting Url Keys.
+     * @throws UrlAlreadyExistsException
      */
-    public function findUrlKeyConflicts(Product $product): array
+    public function validateUrlKey(Product $product): void
     {
         if (!$product->getUrlKey()) {
             $urlKey = $this->productUrlPathGenerator->getUrlKey($product);
@@ -67,7 +68,7 @@ public function findUrlKeyConflicts(Product $product): array
         $storeIdsToPathForSave = [];
         $searchData = [
             UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
-            UrlRewrite::REQUEST_PATH => []
+            UrlRewrite::REQUEST_PATH => [],
         ];
 
         foreach ($stores as $store) {
@@ -81,17 +82,25 @@ public function findUrlKeyConflicts(Product $product): array
         }
 
         $urlRewrites = $this->urlFinder->findAllByData($searchData);
-        $conflicts = [];
+        $exceptionData = [];
 
         foreach ($urlRewrites as $urlRewrite) {
             if (in_array($urlRewrite->getRequestPath(), $storeIdsToPathForSave)
                 && isset($storeIdsToPathForSave[$urlRewrite->getStoreId()])
-                && $storeIdsToPathForSave[$urlRewrite->getStoreId()] == $urlRewrite->getRequestPath()
-                && $product->getId() != $urlRewrite->getEntityId()) {
-                $conflicts[] = $urlRewrite;
+                && $storeIdsToPathForSave[$urlRewrite->getStoreId()] === $urlRewrite->getRequestPath()
+                && $product->getId() !== $urlRewrite->getEntityId()
+            ) {
+                $exceptionData[$urlRewrite->getUrlRewriteId()] = $urlRewrite->toArray();
             }
         }
 
-        return $conflicts;
+        if ($exceptionData) {
+            throw new UrlAlreadyExistsException(
+                __('URL key for specified store already exists.'),
+                null,
+                0,
+                $exceptionData
+            );
+        }
     }
 }