Merge branch 'AC-12807' into cia-2.4.8-beta2-develop-bugfix-12302024

Author: pawan-adobe-security

app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php

@@ -1,7 +1,17 @@
 <?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+/************************************************************************
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ***********************************************************************
  */
 declare(strict_types=1);
 
@@ -18,6 +28,7 @@
 use Magento\Ui\Component\Container;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Cms\Api\Data\PageInterface;
 
 class DataProviderTest extends TestCase
 {
@@ -66,6 +77,17 @@ class DataProviderTest extends TestCase
      */
     private $requestFieldName = 'id';
 
+    /**
+     * @var array
+     */
+    private array $pageLayoutColumns = [
+        PageInterface::PAGE_LAYOUT,
+        PageInterface::CUSTOM_THEME,
+        PageInterface::CUSTOM_THEME_FROM,
+        PageInterface::CUSTOM_THEME_TO,
+        PageInterface::CUSTOM_ROOT_TEMPLATE
+    ];
+
     protected function setUp(): void
     {
         $this->authorizationMock = $this->getMockBuilder(Authorization::class)
@@ -111,10 +133,15 @@ protected function setUp(): void
      */
     public function testPrepareMetadata()
     {
-        $this->authorizationMock->expects($this->once())
+        $this->authorizationMock->expects($this->exactly(2))
             ->method('isAllowed')
-            ->with('Magento_Cms::save')
-            ->willReturn(false);
+            ->willReturnMap(
+                [
+                    ['Magento_Cms::save', null, false],
+                    ['Magento_Cms::save_design', null, false],
+
+                ]
+            );
 
         $metadata = [
             'cms_page_columns' => [
@@ -131,6 +158,21 @@ public function testPrepareMetadata()
             ]
         ];
 
+        foreach ($this->pageLayoutColumns as $column) {
+            $metadata['cms_page_columns']['children'][$column] = [
+                'arguments' => [
+                    'data' => [
+                        'config' => [
+                            'editor' => [
+                                'editorType' => false
+                            ],
+                            'componentType' => Container::NAME
+                        ]
+                    ]
+                ]
+            ];
+        }
+
         $this->assertEquals(
             $metadata,
             $this->dataProvider->prepareMetadata()

app/code/Magento/Cms/Ui/Component/DataProvider.php

@@ -5,13 +5,15 @@
  */
 namespace Magento\Cms\Ui\Component;
 
+use Magento\Cms\Api\Data\PageInterface;
 use Magento\Framework\Api\Filter;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\SearchCriteriaBuilder;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\Reporting;
+use Magento\Ui\Component\Container;
 
 /**
  * DataProvider for cms ui.
@@ -28,6 +30,17 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
      */
     private $additionalFilterPool;
 
+    /**
+     * @var array
+     */
+    private array $pageLayoutColumns = [
+        PageInterface::PAGE_LAYOUT,
+        PageInterface::CUSTOM_THEME,
+        PageInterface::CUSTOM_THEME_FROM,
+        PageInterface::CUSTOM_THEME_TO,
+        PageInterface::CUSTOM_ROOT_TEMPLATE
+    ];
+
     /**
      * @param string $name
      * @param string $primaryFieldName
@@ -73,6 +86,8 @@ public function __construct(
      * Get authorization info.
      *
      * @deprecated 101.0.7
+     * @see nothing
+     *
      * @return AuthorizationInterface|mixed
      */
     private function getAuthorizationInstance()
@@ -101,21 +116,42 @@ public function prepareMetadata()
                                 'editorConfig' => [
                                     'enabled' => false
                                 ],
-                                'componentType' => \Magento\Ui\Component\Container::NAME
+                                'componentType' => Container::NAME
                             ]
                         ]
                     ]
                 ]
             ];
         }
 
+        if (!$this->getAuthorizationInstance()->isAllowed('Magento_Cms::save_design')) {
+
+            foreach ($this->pageLayoutColumns as $column) {
+                $metadata['cms_page_columns']['children'][$column] = [
+                    'arguments' => [
+                        'data' => [
+                            'config' => [
+                                'editor' => [
+                                    'editorType' => false
+                                ],
+                                'componentType' => Container::NAME
+                            ]
+                        ]
+                    ]
+                ];
+            }
+        }
+
         return $metadata;
     }
 
     /**
-     * @inheritdoc
+     * Add Filter
+     *
+     * @param Filter $filter
+     * @return void
      */
-    public function addFilter(Filter $filter)
+    public function addFilter(Filter $filter): void
     {
         if (!empty($this->additionalFilterPool[$filter->getField()])) {
             $this->additionalFilterPool[$filter->getField()]->addFilter($this->searchCriteriaBuilder, $filter);

dev/tests/integration/testsuite/Magento/Cms/Ui/Component/DataProviderTest.php

@@ -10,6 +10,7 @@
 use Magento\Cms\Api\Data\BlockInterface;
 use Magento\Cms\Api\Data\PageInterface;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponentInterface;
@@ -93,6 +94,7 @@ private function prepareChildComponents(UiComponentInterface $component): void
      *
      * @param string $namespace
      * @return array
+     * @throws LocalizedException
      */
     private function getComponentProvidedData(string $namespace): array
     {