MC-40777: Cannot save product in store view scope without Magento_Catalog::edit_product_design

Author: engcom-Echo

app/code/Magento/Catalog/Model/Product/Authorization.php

@@ -12,6 +12,8 @@
 use Magento\Catalog\Model\Product as ProductModel;
 use Magento\Catalog\Model\ProductFactory;
 use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\Exception\AuthorizationException;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -32,14 +34,24 @@ class Authorization
      */
     private $productFactory;
 
+    /**
+     * @var RequestInterface
+     */
+    protected $request;
+
     /**
      * @param AuthorizationInterface $authorization
      * @param ProductFactory $factory
+     * @param RequestInterface|null $request
      */
-    public function __construct(AuthorizationInterface $authorization, ProductFactory $factory)
-    {
+    public function __construct(
+        AuthorizationInterface $authorization,
+        ProductFactory $factory,
+        ?RequestInterface $request = null
+    ) {
         $this->authorization = $authorization;
         $this->productFactory = $factory;
+        $this->request = $request ?: ObjectManager::getInstance()->get(RequestInterface::class);;
     }
 
     /**
@@ -121,6 +133,10 @@ private function hasProductChanged(ProductModel $product, ?array $oldProduct = n
             if (!array_key_exists($designAttribute, $attributes)) {
                 continue;
             }
+            $useDefaults = (array) $this->request->getPost('use_default', []);
+            if (isset($useDefaults[$designAttribute]) && $useDefaults[$designAttribute]) {
+                continue;
+            }
             $attribute = $attributes[$designAttribute];
             $oldValues = $this->fetchOldValues($attribute, $oldProduct);
             try {

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/AuthorizationTest.php

@@ -92,8 +92,8 @@ public function postRequestData(): array
                         'page_layout' => '',
                         'options_container' => 'container2',
                         'custom_layout_update' => '',
-                        'custom_design_from' => '',
-                        'custom_design_to' => '',
+                        'custom_design_from' => '2021-02-19 00:00:00',
+                        'custom_design_to' => '2021-02-09 00:00:00',
                         'custom_layout_update_file' => '',
                     ],
                     'use_default' => [