MC-40811: Schedule Design Update when edit product in backend seem not set properly

Author: engcom-Kilo

app/code/Magento/Catalog/Model/Design.php

@@ -151,6 +151,7 @@ protected function _extractSettings($object)
             return $settings;
         }
         $settings->setPageLayout($object->getPageLayout());
+        $settings->setLayoutUpdates((array)$object->getCustomLayoutUpdate());
 
         $date = $object->getCustomDesignDate();
         if (array_key_exists(
@@ -165,13 +166,12 @@ protected function _extractSettings($object)
             $date['to']
         )
         ) {
-            $settings->setCustomDesign(
-                $object->getCustomDesign()
-            )->setPageLayout(
-                $object->getCustomLayout()
-            )->setLayoutUpdates(
-                (array)$object->getCustomLayoutUpdate()
-            );
+            if ($object->getCustomDesign()) {
+                $settings->setCustomDesign($object->getCustomDesign());
+            }
+            if ($object->getCustomLayout()) {
+                $settings->setPageLayout($object->getCustomLayout());
+            }
             if ($object instanceof Category) {
                 $this->categoryLayoutUpdates->extractCustomSettings($object, $settings);
             } elseif ($object instanceof Product) {

dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_custom_design.php

@@ -3,14 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-use Magento\Catalog\Model\Product;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ProductFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 
 $product = Bootstrap::getObjectManager()->create(ProductFactory::class)->create();
+$productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
 $product->setTypeId('simple')
     ->setPageLayout('3columns')
     ->setAttributeSetId(4)
@@ -20,18 +22,6 @@
     ->setPrice(10)
     ->setVisibility(Visibility::VISIBILITY_BOTH)
     ->setStatus(Status::STATUS_ENABLED)
-    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_in_stock' => 1])
-    ->save();
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_in_stock' => 1]);
 
-$customDesignProduct = Bootstrap::getObjectManager()
-    ->create(Product::class, ['data' => $product->getData()]);
-
-$customDesignProduct->setUrlKey('custom-design-simple-product')
-    ->setId(2)
-    ->setRowId(2)
-    ->setName('Custom Design Simple Product')
-    ->setSku('custom-design-simple-product')
-    ->setCustomDesign('Magento/blank')
-    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 24, 'is_in_stock' => 1])
-    ->setQty(24)
-    ->save();
+$productRepository->save($product);