Merge remote-tracking branch 'local/ACP2E-2392' into PR_L3_March_24

Author: o-dubovyk

app/code/Magento/Catalog/Block/Widget/RecentlyViewed.php

@@ -13,4 +13,5 @@
  */
 class RecentlyViewed extends Wrapper implements \Magento\Widget\Block\BlockInterface
 {
+    protected const RENDER_TYPE = 'html';
 }

app/code/Magento/Ui/Block/Wrapper.php

@@ -14,6 +14,8 @@
  */
 class Wrapper extends \Magento\Framework\View\Element\Template
 {
+    protected const RENDER_TYPE = '';
+
     /**
      * @var UiComponentGenerator
      */
@@ -91,6 +93,6 @@ public function renderApp($data = [])
             ->generateUiComponent($this->getData('uiComponent'), $this->getLayout());
         $this->injectDataInDataSource($uiComponent, $this->getData());
         $this->addDataToChildComponents($uiComponent, $data);
-        return (string) $uiComponent->render();
+        return (string) $uiComponent->render(static::RENDER_TYPE);
     }
 }

app/code/Magento/Ui/Component/Listing.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Ui\Component;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Element\UiComponent\ContentType\ContentTypeFactory;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Ui\Component\Listing\Columns;
 
 /**
@@ -13,13 +16,34 @@
  */
 class Listing extends AbstractComponent
 {
-    const NAME = 'listing';
+    public const NAME = 'listing';
 
     /**
      * @var array
      */
     protected $columns = [];
 
+    /**
+     * @var ContentTypeFactory
+     */
+    private ContentTypeFactory $contentTypeFactory;
+
+    /**
+     * @param ContextInterface $context
+     * @param array $components
+     * @param array $data
+     * @param ContentTypeFactory|null $contentTypeFactory
+     */
+    public function __construct(
+        ContextInterface $context,
+        array $components = [],
+        array $data = [],
+        ?ContentTypeFactory $contentTypeFactory = null
+    ) {
+        $this->contentTypeFactory = $contentTypeFactory ?: ObjectManager::getInstance()->get(ContentTypeFactory::class);
+        parent::__construct($context, $components, $data);
+    }
+
     /**
      * Get component name
      *
@@ -31,10 +55,25 @@ public function getComponentName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDataSourceData()
     {
         return ['data' => $this->getContext()->getDataProvider()->getData()];
     }
+
+    /**
+     * Render content depending on specified type
+     *
+     * @param string $contentType
+     * @return string
+     */
+    public function render(string $contentType = '')
+    {
+        if ($contentType) {
+            return $this->contentTypeFactory->get($contentType)->render($this, $this->getTemplate());
+        }
+
+        return parent::render();
+    }
 }

app/code/Magento/Ui/Test/Unit/Component/ListingTest.php

@@ -8,6 +8,9 @@
 namespace Magento\Ui\Test\Unit\Component;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Element\UiComponent\ContentType\AbstractContentType;
+use Magento\Framework\View\Element\UiComponent\ContentType\ContentTypeFactory;
+use Magento\Framework\View\Element\UiComponent\ContentType\Html;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponent\Processor;
 use Magento\Ui\Component\Listing;
@@ -26,6 +29,11 @@ class ListingTest extends TestCase
      */
     protected $objectManager;
 
+    /**
+     * @var ContentTypeFactory|MockObject
+     */
+    private ContentTypeFactory $contentTypeFactory;
+
     /**
      * @inheritdoc
      */
@@ -39,6 +47,8 @@ protected function setUp(): void
             '',
             false
         );
+
+        $this->contentTypeFactory = $this->createMock(ContentTypeFactory::class);
     }
 
     /**
@@ -103,4 +113,48 @@ public function testPrepare(): void
 
         $listing->prepare();
     }
+
+    /**
+     * @return void
+     */
+    public function testRenderSpecificContentType(): void
+    {
+        $html = 'html output';
+        $renderer = $this->createMock(Html::class);
+        $renderer->expects($this->once())->method('render')->willReturn($html);
+        $this->contentTypeFactory->expects($this->once())
+            ->method('get')
+            ->with('html')
+            ->willReturn($renderer);
+
+        /** @var Listing $listing */
+        $listing = $this->objectManager->getObject(
+            Listing::class,
+            [
+                'context' => $this->contextMock,
+                'contentTypeFactory' => $this->contentTypeFactory
+            ]
+        );
+        $this->assertSame($html, $listing->render('html'));
+    }
+
+    /**
+     * @return void
+     */
+    public function testRenderParent()
+    {
+        $html = 'html output';
+        $renderer = $this->createMock(AbstractContentType::class);
+        $renderer->expects($this->once())->method('render')->willReturn($html);
+        $this->contextMock->expects($this->once())->method('getRenderEngine')->willReturn($renderer);
+
+        /** @var Listing $listing */
+        $listing = $this->objectManager->getObject(
+            Listing::class,
+            [
+                'context' => $this->contextMock
+            ]
+        );
+        $this->assertSame($html, $listing->render());
+    }
 }