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

@@ -14,6 +14,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
 use Magento\CatalogUrlRewrite\Model\Product\Validator as ProductUrlRewriteValidator;
+use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
 
 /**
  * Product validate
@@ -59,6 +60,11 @@ class Validate extends Product implements HttpPostActionInterface, HttpGetAction
      */
     private $storeManager;
 
+    /**
+     * @var ProductUrlPathGenerator
+     */
+    private $productUrlPathGenerator;
+
     /**
      * @var ProductUrlRewriteValidator
      */
@@ -73,6 +79,7 @@ class Validate extends Product implements HttpPostActionInterface, HttpGetAction
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param ProductUrlRewriteValidator $productUrlRewriteValidator
+     * @param ProductUrlPathGenerator $productUrlPathGenerator
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -82,7 +89,8 @@ public function __construct(
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         \Magento\Catalog\Model\ProductFactory $productFactory,
-        ProductUrlRewriteValidator $productUrlRewriteValidator
+        ProductUrlRewriteValidator $productUrlRewriteValidator,
+        ProductUrlPathGenerator $productUrlPathGenerator
     ) {
         $this->_dateFilter = $dateFilter;
         $this->productValidator = $productValidator;
@@ -91,6 +99,7 @@ public function __construct(
         $this->layoutFactory = $layoutFactory;
         $this->productFactory = $productFactory;
         $this->productUrlRewriteValidator = $productUrlRewriteValidator;
+        $this->productUrlPathGenerator = $productUrlPathGenerator;
     }
 
     /**
@@ -140,7 +149,11 @@ public function execute()
             $resource->getAttribute('news_from_date')->setMaxValue($product->getNewsToDate());
             $resource->getAttribute('custom_design_from')->setMaxValue($product->getCustomDesignTo());
 
-            $this->productUrlRewriteValidator->validateUrlKey($product);
+            if (!$product->getUrlKey()) {
+                $urlKey = $this->productUrlPathGenerator->getUrlKey($product);
+                $product->setUrlKey($urlKey);
+            }
+            $this->productUrlRewriteValidator->validateUrlKeyConflicts($product);
             $this->productValidator->validate($product, $this->getRequest(), $response);
         } catch (\Magento\Eav\Model\Entity\Attribute\Exception $e) {
             $response->setError(true);

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

@@ -51,18 +51,13 @@ public function __construct(
     }
 
     /**
-     * Validate Url Key of a Product.
+     * Validate Url Key of a Product has no conflicts.
      *
      * @param Product $product
      * @throws UrlAlreadyExistsException
      */
-    public function validateUrlKey(Product $product): void
+    public function validateUrlKeyConflicts(Product $product): void
     {
-        if (!$product->getUrlKey()) {
-            $urlKey = $this->productUrlPathGenerator->getUrlKey($product);
-            $product->setUrlKey($urlKey);
-        }
-
         $stores = $this->storeManager->getStores();
 
         $storeIdsToPathForSave = [];