#31 Made it possible to return rendered content of CMS entities

Author: Roman Glushko

app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php

@@ -10,6 +10,7 @@
 use Magento\Cms\Api\BlockRepositoryInterface;
 use Magento\Cms\Api\Data\BlockInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Widget\Model\Template\FilterEmulate;
 
 /**
  * Cms block data provider
@@ -21,13 +22,21 @@ class Block
      */
     private $blockRepository;
 
+    /**
+     * @var FilterEmulate
+     */
+    private $widgetFilter;
+
     /**
      * @param BlockRepositoryInterface $blockRepository
+     * @param FilterEmulate $widgetFilter
      */
     public function __construct(
-        BlockRepositoryInterface $blockRepository
+        BlockRepositoryInterface $blockRepository,
+        FilterEmulate $widgetFilter
     ) {
         $this->blockRepository = $blockRepository;
+        $this->widgetFilter = $widgetFilter;
     }
 
     /**
@@ -43,10 +52,12 @@ public function getData(string $blockIdentifier): array
             throw new NoSuchEntityException();
         }
 
+        $renderedContent = $this->widgetFilter->filter($block->getContent());
+
         $blockData = [
             BlockInterface::IDENTIFIER => $block->getIdentifier(),
             BlockInterface::TITLE => $block->getTitle(),
-            BlockInterface::CONTENT => $block->getContent(),
+            BlockInterface::CONTENT => $renderedContent,
         ];
         return $blockData;
     }

app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Page.php

@@ -16,18 +16,26 @@
  */
 class Page
 {
+    /**
+     * @var FilterEmulate
+     */
+    protected $widgetFilter;
+
     /**
      * @var PageRepositoryInterface
      */
-    private $pageRepository;
+    protected $pageRepository;
 
     /**
      * @param PageRepositoryInterface $pageRepository
+     * @param FilterEmulate $widgetFilter
      */
     public function __construct(
-        PageRepositoryInterface $pageRepository
+        PageRepositoryInterface $pageRepository,
+        FilterEmulate $widgetFilter
     ) {
         $this->pageRepository = $pageRepository;
+        $this->widgetFilter = $widgetFilter;
     }
 
     /**
@@ -43,10 +51,12 @@ public function getData(int $pageId): array
             throw new NoSuchEntityException();
         }
 
+        $renderedContent = $this->widgetFilter->filter($page->getContent());
+
         $pageData = [
             'url_key' => $page->getIdentifier(),
             PageInterface::TITLE => $page->getTitle(),
-            PageInterface::CONTENT => $page->getContent(),
+            PageInterface::CONTENT => $renderedContent,
             PageInterface::CONTENT_HEADING => $page->getContentHeading(),
             PageInterface::PAGE_LAYOUT => $page->getPageLayout(),
             PageInterface::META_TITLE => $page->getMetaTitle(),