Merge remote-tracking branch 'tango/MC-18348' into PR_2019_08_20

Author: vkolesny

app/code/Magento/Catalog/Model/Plugin/SetPageLayoutDefaultValue.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Plugin for \Magento\Catalog\Model\Category\DataProvider
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Plugin;
+
+use Magento\Catalog\Model\Category\DataProvider;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/**
+ * Sets the default value for Category Design Layout if provided
+ */
+class SetPageLayoutDefaultValue
+{
+    private $defaultValue;
+
+    /**
+     * @param string $defaultValue
+     */
+    public function __construct(string $defaultValue = "")
+    {
+        $this->defaultValue = $defaultValue;
+    }
+
+    /**
+     * Sets the default value for Category Design Layout in data provider if provided
+     *
+     * @param DataProvider $subject
+     * @param array $result
+     * @return array
+     *
+     * @throws NoSuchEntityException
+     */
+    public function afterGetDefaultMetaData(DataProvider $subject, array $result): array
+    {
+        $currentCategory = $subject->getCurrentCategory();
+
+        if ($currentCategory && !$currentCategory->getId() && array_key_exists('page_layout', $result)) {
+            $result['page_layout']['default'] = $this->defaultValue ?: null;
+        }
+
+        return $result;
+    }
+}

app/code/Magento/Catalog/etc/di.xml

@@ -76,6 +76,9 @@
     <type name="Magento\Customer\Model\ResourceModel\Visitor">
         <plugin name="catalogLog" type="Magento\Catalog\Model\Plugin\Log" />
     </type>
+    <type name="Magento\Catalog\Model\Category\DataProvider">
+        <plugin name="set_page_layout_default_value" type="Magento\Catalog\Model\Plugin\SetPageLayoutDefaultValue" />
+    </type>
     <type name="Magento\Theme\Block\Html\Topmenu">
         <plugin name="catalogTopmenu" type="Magento\Catalog\Plugin\Block\Topmenu" />
     </type>

app/code/Magento/Ui/Component/Form/Field/DefaultValue.php

@@ -7,11 +7,13 @@
 
 namespace Magento\Ui\Component\Form\Field;
 
-use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
 
-/** Field class has dynamic default value based on  System Configuration path  */
+/**
+ * Field class has dynamic default value based on  System Configuration path
+ */
 class DefaultValue extends \Magento\Ui\Component\Form\Field
 {
     /**
@@ -55,16 +57,18 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function prepare()
     {
         parent::prepare();
         $store = $this->storeManager->getStore();
-        $this->_data['config']['default'] = $this->scopeConfig->getValue(
-            $this->path,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-            $store
-        );
+        if (empty($this->_data['config']['default'])) {
+            $this->_data['config']['default'] = $this->scopeConfig->getValue(
+                $this->path,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                $store
+            );
+        }
     }
 }