graphQl-44: added ComplexTextValue to graphQl module

Author: vitaliyboyko

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductTextAttribute.php

@@ -10,12 +10,29 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Catalog\Helper\Output as OutputHelper;
 
 /**
- * Resolve rendered content for text attributes
+ * Resolve rendered content for attributes where HTML content is allowed
  */
 class ProductTextAttribute implements ResolverInterface
 {
+    /**
+     * @var OutputHelper
+     */
+    private $outputHelper;
+
+    /**
+     * @param OutputHelper $outputHelper
+     */
+    public function __construct(
+        OutputHelper $outputHelper
+    ) {
+        $this->outputHelper = $outputHelper;
+    }
+
     /**
      * @inheritdoc
      */
@@ -26,8 +43,15 @@ public function resolve(
         array $value = null,
         array $args = null
     ): array {
-        $value['field'] = $field->getName();
+        if (!isset($value['model'])) {
+            throw new GraphQlInputException(__('"model" value should be specified'));
+        }
+
+        /* @var $product Product */
+        $product = $value['model'];
+        $fieldName = $field->getName();
+        $renderedValue = $this->outputHelper->productAttribute($product, $product->getData($fieldName), $fieldName);
 
-        return $value;
+        return ['html' => $renderedValue];
     }
 }

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductTextAttribute/HtmlContent.php

@@ -63,13 +63,6 @@
             <argument name="collectionProcessor" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\ProductCollectionProcessor</argument>
         </arguments>
     </type>
-    <type name="Magento\CatalogGraphQl\Model\Resolver\Product\ProductTextAttribute\FormatList">
-        <arguments>
-            <argument name="formats" xsi:type="array">
-                <item name="html" xsi:type="string">Magento\CatalogGraphQl\Model\Resolver\Product\ProductTextAttribute\Html</item>
-            </argument>
-        </arguments>
-    </type>
     <virtualType name="Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\ProductFilterProcessor" type="Magento\Eav\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor">
         <arguments>
             <argument name="customFilters" xsi:type="array">

app/code/Magento/CatalogGraphQl/etc/graphql/di.xml

@@ -248,8 +248,8 @@ interface ProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\
     id: Int @doc(description: "The ID number assigned to the product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\EntityIdToId")
     name: String @doc(description: "The product name. Customers use this name to identify the product.")
     sku: String @doc(description: "A number or code assigned to a product to identify the product, options, price, and manufacturer")
-    description: ProductTextAttribute @doc(description: "Detailed information about the product. The value can include simple HTML tags.") @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductTextAttribute")
-    short_description: ProductTextAttribute @doc(description: "A short description of the product. Its use depends on the theme.") @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductTextAttribute")
+    description: ComplexTextValue @doc(description: "Detailed information about the product. The value can include simple HTML tags.") @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductTextAttribute")
+    short_description: ComplexTextValue @doc(description: "A short description of the product. Its use depends on the theme.") @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductTextAttribute")
     special_price: Float @doc(description: "The discounted price of the product")
     special_from_date: String @doc(description: "The beginning date that a product has a special price")
     special_to_date: String @doc(description: "The end date that a product has a special price")
@@ -556,7 +556,3 @@ type SortFields @doc(description: "SortFields contains a default value for sort
     default: String @doc(description: "Default value of sort fields")
     options: [SortField] @doc(description: "Available sort fields")
 }
-
-type ProductTextAttribute @doc(description: "Product text attribute.") {
-    html: String @doc(description: "Attribute HTML content") @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductTextAttribute\\HtmlContent")
-}

app/code/Magento/CatalogGraphQl/etc/schema.graphqls

@@ -0,0 +1,38 @@
+<?php
+/**
+ * @author Atwix Team
+ * @copyright Copyright (c) 2018 Atwix (https://www.atwix.com/)
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Model\Resolver\ComplexTextValue;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * HTML format for complex text value.
+ *
+ * Initially, a value from parent resolver should be in HTML format, therefore, there is no any customization.
+ */
+class HtmlFormat implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ): ?string {
+        if (!isset($value['html'])) {
+            throw new GraphQlInputException(__('"html" value should be specified'));
+        }
+
+        return $value['html'];
+    }
+}

app/code/Magento/GraphQl/Model/Resolver/ComplexTextValue/HtmlFormat.php

@@ -35,3 +35,7 @@ enum SortEnum @doc(description: "This enumeration indicates whether to return re
     ASC
     DESC
 }
+
+type ComplexTextValue {
+    html: String! @doc(description: "HTML format") @resolver(class: "\\Magento\\GraphQl\\Model\\Resolver\\ComplexTextValue\\HtmlFormat")
+}