Merge pull request #6008 from magento-tsg/2.4-develop-pr75

zakdma · web-flow · commit cc6286a3b295 · 2020-08-13T16:00:10.000+03:00
[TSG] Fixes for 2.4 (pr75) (2.4-develop)
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
@@ -18,19 +18,24 @@
             <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4931106"/>
             <group value="product"/>
         </annotations>
+
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <createData entity="simpleProductWithShortNameAndSku" stepKey="createSimpleProduct"/>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
         </before>
+
         <after>
-            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
-        <amOnPage url="{{AdminProductIndexPage.url}}?filters[name]=$$createSimpleProduct.name$$" stepKey="navigateToProductGridWithFilters"/>
+
+        <amOnPage url="{{AdminProductIndexPage.url}}?filters[name]=$createSimpleProduct.name$" stepKey="navigateToProductGridWithFilters"/>
         <waitForPageLoad stepKey="waitForProductGrid"/>
-        <see selector="{{AdminProductGridSection.productGridNameProduct($$createSimpleProduct.name$$)}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProduct"/>
+        <see selector="{{AdminProductGridSection.productGridNameProduct($createSimpleProduct.name$)}}" userInput="$createSimpleProduct.name$" stepKey="seeProduct"/>
+        <waitForElementVisible selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="waitForEnabledFilters"/>
         <seeElement selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="seeEnabledFilters"/>
-        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="Name: $$createSimpleProduct.name$$" stepKey="seeProductNameFilter"/>
+        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="Name: $createSimpleProduct.name$" stepKey="seeProductNameFilter"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php b/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
@@ -96,6 +96,8 @@ protected function _getChildrenElementsHtml(AbstractElement $element)
                     . '<td colspan="4">' . $field->toHtml() . '</td></tr>';
             } else {
                 $elements .= $field->toHtml();
+                $styleTag = $this->addVisibilityTag($field);
+                $elements .= $styleTag;
             }
         }
 
@@ -168,11 +170,13 @@ protected function _getFrontendClass($element)
      */
     protected function _getHeaderTitleHtml($element)
     {
+        $styleTag = $this->addVisibilityTag($element);
         return '<a id="' .
             $element->getHtmlId() .
             '-head" href="#' .
             $element->getHtmlId() .
             '-link">' . $element->getLegend() . '</a>' .
+            $styleTag .
             /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
                 'onclick',
                 'event.preventDefault();' .
@@ -270,10 +274,70 @@ protected function _isCollapseState($element)
             return true;
         }
 
+        if ($this->isCollapseStateByDependentField($element)) {
+            return false;
+        }
+
         $extra = $this->_authSession->getUser()->getExtra();
+
         if (isset($extra['configState'][$element->getId()])) {
             return $extra['configState'][$element->getId()];
         }
         return $this->isCollapsedDefault;
     }
+
+    /**
+     * Check if element should be collapsed by dependent field value.
+     *
+     * @param AbstractElement $element
+     * @return bool
+     */
+    private function isCollapseStateByDependentField(AbstractElement $element): bool
+    {
+        if (!empty($element->getGroup()['depends']['fields'])) {
+            foreach ($element->getGroup()['depends']['fields'] as $dependFieldData) {
+                if (is_array($dependFieldData) && isset($dependFieldData['value'], $dependFieldData['id'])) {
+                    $fieldSetForm = $this->getForm();
+                    $dependentFieldConfigValue = $this->_scopeConfig->getValue(
+                        $dependFieldData['id'],
+                        $fieldSetForm->getScope(),
+                        $fieldSetForm->getScopeCode()
+                    );
+
+                    if ($dependFieldData['value'] !== $dependentFieldConfigValue) {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * If element or it's parent depends on other element we hide it during page load.
+     *
+     * @param AbstractElement $field
+     * @return string
+     */
+    private function addVisibilityTag(AbstractElement $field): string
+    {
+        $elementId = '';
+        $styleTag = '';
+
+        if (!empty($field->getFieldConfig()['depends']['fields'])) {
+            $elementId = '#row_' . $field->getHtmlId();
+        } elseif (!empty($field->getGroup()['depends']['fields'])) {
+            $elementId = '#' . $field->getHtmlId() . '-head';
+        }
+
+        if (!empty($elementId)) {
+            $styleTag .= $this->secureRenderer->renderStyleAsTag(
+                'display: none;',
+                $elementId
+            );
+        }
+
+        return $styleTag;
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
@@ -4,29 +4,36 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Test class for \Magento\Cms\Controller\Page.
- */
 namespace Magento\Cms\Controller;
 
 use Magento\Cms\Api\GetPageByIdentifierInterface;
+use Magento\Cms\Model\Page\CustomLayoutManagerInterface;
 use Magento\Framework\View\LayoutInterface;
-use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Cms\Model\CustomLayoutManager;
+use Magento\TestFramework\TestCase\AbstractController;
 
-class PageTest extends \Magento\TestFramework\TestCase\AbstractController
+/**
+ * Test for \Magento\Cms\Controller\Page\View class.
+ */
+class PageTest extends AbstractController
 {
+    /**
+     * @var GetPageByIdentifierInterface
+     */
+    private $pageRetriever;
+
     /**
      * @inheritDoc
      */
     protected function setUp(): void
     {
-        Bootstrap::getObjectManager()->configure([
+        parent::setUp();
+        $this->_objectManager->configure([
             'preferences' => [
-                \Magento\Cms\Model\Page\CustomLayoutManagerInterface::class =>
-                    \Magento\TestFramework\Cms\Model\CustomLayoutManager::class
+                CustomLayoutManagerInterface::class => CustomLayoutManager::class,
             ]
         ]);
-        parent::setUp();
+        $this->pageRetriever = $this->_objectManager->get(GetPageByIdentifierInterface::class);
     }
 
     public function testViewAction()
@@ -51,9 +58,7 @@ public function testViewRedirectWithTrailingSlash()
     public function testAddBreadcrumbs()
     {
         $this->dispatch('/enable-cookies');
-        $layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\View\LayoutInterface::class
-        );
+        $layout = $this->_objectManager->get(LayoutInterface::class);
         $breadcrumbsBlock = $layout->getBlock('breadcrumbs');
         $this->assertStringContainsString($breadcrumbsBlock->toHtml(), $this->getResponse()->getBody());
     }
@@ -90,12 +95,10 @@ public static function cmsPageWithSystemRouteFixture()
      */
     public function testCustomHandles(): void
     {
-        /** @var GetPageByIdentifierInterface $pageFinder */
-        $pageFinder = Bootstrap::getObjectManager()->get(GetPageByIdentifierInterface::class);
-        $page = $pageFinder->execute('test_custom_layout_page_3', 0);
-        $this->dispatch('/cms/page/view/page_id/' .$page->getId());
+        $page = $this->pageRetriever->execute('test_custom_layout_page_3', 0);
+        $this->dispatch('/cms/page/view/page_id/' . $page->getId());
         /** @var LayoutInterface $layout */
-        $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
+        $layout = $this->_objectManager->get(LayoutInterface::class);
         $handles = $layout->getUpdate()->getHandles();
         $this->assertContains('cms_page_view_selectable_test_custom_layout_page_3_test_selected', $handles);
     }
@@ -111,8 +114,37 @@ public function testHomePageCustomHandles(): void
     {
         $this->dispatch('/');
         /** @var LayoutInterface $layout */
-        $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
+        $layout = $this->_objectManager->get(LayoutInterface::class);
         $handles = $layout->getUpdate()->getHandles();
         $this->assertContains('cms_page_view_selectable_home_page_custom_layout', $handles);
     }
+
+    /**
+     * Tests page renders even with unavailable custom page layout.
+     *
+     * @magentoDataFixture Magento/Cms/Fixtures/page_list.php
+     * @dataProvider pageLayoutDataProvider
+     * @param string $pageIdentifier
+     * @return void
+     */
+    public function testPageWithCustomLayout(string $pageIdentifier): void
+    {
+        $page = $this->pageRetriever->execute($pageIdentifier, 0);
+        $this->dispatch('/cms/page/view/page_id/' . $page->getId());
+        $this->assertStringContainsString(
+            '<main id="maincontent" class="page-main">',
+            $this->getResponse()->getBody()
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function pageLayoutDataProvider(): array
+    {
+        return [
+            'Page with 1column layout' => ['page-with-1column-layout'],
+            'Page with unavailable layout' => ['page-with-unavailable-layout']
+        ];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list.php b/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list.php
@@ -14,15 +14,27 @@
 $data = [
     [
         'title' => 'simplePage',
-        'is_active' => 1
+        'is_active' => 1,
     ],
     [
         'title' => 'simplePage01',
-        'is_active' => 1
+        'is_active' => 1,
     ],
     [
         'title' => '01simplePage',
-        'is_active' => 1
+        'is_active' => 1,
+    ],
+    [
+        'title' => 'Page with 1column layout',
+        'is_active' => 1,
+        'content' => '<h1>Test Page Content</h1>',
+        'page_layout' => '1column',
+    ],
+    [
+        'title' => 'Page with unavailable layout',
+        'content' => '<h1>Test Page Content</h1>',
+        'is_active' => 1,
+        'page_layout' => 'unavailable-layout',
     ],
 ];
 
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list_rollback.php b/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list_rollback.php
@@ -16,7 +16,18 @@
 
 /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
 $searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
-$searchCriteria = $searchCriteriaBuilder->addFilter('title', ['simplePage', 'simplePage01', '01simplePage'], 'in')
+$searchCriteria = $searchCriteriaBuilder
+    ->addFilter(
+        'title',
+        [
+            'simplePage',
+            'simplePage01',
+            '01simplePage',
+            'Page with 1column layout',
+            'Page with unavailable layout',
+        ],
+        'in'
+    )
     ->create();
 $result = $pageRepository->getList($searchCriteria);
 
diff --git a/lib/internal/Magento/Framework/View/Page/Builder.php b/lib/internal/Magento/Framework/View/Page/Builder.php
@@ -6,11 +6,13 @@
 namespace Magento\Framework\View\Page;
 
 use Magento\Framework\App;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Event;
 use Magento\Framework\View;
+use Magento\Framework\View\Model\PageLayout\Config\BuilderInterface;
 
 /**
- * Class Builder
+ * Page Layout Builder
  */
 class Builder extends View\Layout\Builder
 {
@@ -24,23 +26,31 @@ class Builder extends View\Layout\Builder
      */
     protected $pageLayoutReader;
 
+    /**
+     * @var BuilderInterface|mixed
+     */
+    private $pageLayoutBuilder;
+
     /**
      * @param View\LayoutInterface $layout
      * @param App\Request\Http $request
      * @param Event\ManagerInterface $eventManager
      * @param Config $pageConfig
      * @param Layout\Reader $pageLayoutReader
+     * @param BuilderInterface|null $pageLayoutBuilder
      */
     public function __construct(
         View\LayoutInterface $layout,
         App\Request\Http $request,
         Event\ManagerInterface $eventManager,
         Config $pageConfig,
-        Layout\Reader $pageLayoutReader
+        Layout\Reader $pageLayoutReader,
+        ?BuilderInterface $pageLayoutBuilder = null
     ) {
         parent::__construct($layout, $request, $eventManager);
         $this->pageConfig = $pageConfig;
         $this->pageLayoutReader = $pageLayoutReader;
+        $this->pageLayoutBuilder = $pageLayoutBuilder ?? ObjectManager::getInstance()->get(BuilderInterface::class);
         $this->pageConfig->setBuilder($this);
     }
 
@@ -57,6 +67,7 @@ protected function generateLayoutBlocks()
 
     /**
      * Read page layout and write structure to ReadContext
+     *
      * @return void
      */
     protected function readPageLayout()
@@ -69,10 +80,16 @@ protected function readPageLayout()
     }
 
     /**
+     * Get current page layout or fallback to default
+     *
      * @return string
      */
     protected function getPageLayout()
     {
-        return $this->pageConfig->getPageLayout() ?: $this->layout->getUpdate()->getPageLayout();
+        $pageLayout = $this->pageConfig->getPageLayout();
+
+        return ($pageLayout && $this->pageLayoutBuilder->getPageLayoutsConfig()->hasPageLayout($pageLayout))
+            ? $pageLayout
+            : $this->layout->getUpdate()->getPageLayout();
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/BuilderTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/BuilderTest.php
@@ -8,9 +8,11 @@
 namespace Magento\Framework\View\Test\Unit\Page;
 
 use Magento\Framework\View\Layout\Reader\Context;
+use Magento\Framework\View\Model\PageLayout\Config\BuilderInterface;
 use Magento\Framework\View\Page\Builder;
 use Magento\Framework\View\Page\Config;
 use Magento\Framework\View\Page\Layout\Reader;
+use Magento\Framework\View\PageLayout\Config as PageLayoutConfig;
 use PHPUnit\Framework\MockObject\MockObject;
 
 /**
@@ -22,7 +24,7 @@ class BuilderTest extends \Magento\Framework\View\Test\Unit\Layout\BuilderTest
 
     /**
      * @param array $arguments
-     * @return \Magento\Framework\View\Page\Builder
+     * @return \Magento\Framework\View\Layout\Builder
      */
     protected function getBuilder($arguments)
     {
@@ -39,6 +41,15 @@ protected function getBuilder($arguments)
 
         $arguments['pageLayoutReader'] = $this->createMock(Reader::class);
         $arguments['pageLayoutReader']->expects($this->once())->method('read')->with($readerContext, 'test_layout');
+        $pageLayoutConfig = $this->createMock(PageLayoutConfig::class);
+        $arguments['pageLayoutBuilder'] = $this->getMockForAbstractClass(BuilderInterface::class);
+        $arguments['pageLayoutBuilder']->expects($this->once())
+            ->method('getPageLayoutsConfig')
+            ->willReturn($pageLayoutConfig);
+        $pageLayoutConfig->expects($this->once())
+            ->method('hasPageLayout')
+            ->with('test_layout')
+            ->willReturn(true);
 
         return parent::getBuilder($arguments);
     }
