Skip to content
This repository was archived by the owner on Dec 19, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
$categories[$item->getId()] = $this->customAttributesFlattener
->flatten($categories[$item->getId()]);
$categories[$item->getId()]['product_count'] = $item->getProductCount();
$categories[$item->getId()]['model'] = $item;
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\CatalogGraphQl\Model\Resolver\Category;

use Magento\Catalog\Model\Category;
use Magento\Framework\GraphQl\Config\Element\Field;
use Magento\Framework\GraphQl\Query\Resolver\Value;
use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
use Magento\Framework\GraphQl\Query\ResolverInterface;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
use Magento\Catalog\Helper\Output as OutputHelper;

/**
* Resolve rendered content for category attributes where HTML content is allowed
*/
class CategoryHtmlAttribute implements ResolverInterface
{
/**
* @var ValueFactory
*/
private $valueFactory;

/**
* @var OutputHelper
*/
private $outputHelper;

/**
* @param ValueFactory $valueFactory
* @param OutputHelper $outputHelper
*/
public function __construct(
ValueFactory $valueFactory,
OutputHelper $outputHelper
) {
$this->valueFactory = $valueFactory;
$this->outputHelper = $outputHelper;
}

/**
* {@inheritdoc}
*/
public function resolve(
Field $field,
$context,
ResolveInfo $info,
array $value = null,
array $args = null
): Value {
if (!isset($value['model'])) {
$result = function () {
return null;
};
return $this->valueFactory->create($result);
}

/* @var $category Category */
$category = $value['model'];
$fieldName = $field->getName();
$renderedValue = $this->outputHelper->categoryAttribute($category, $category->getData($fieldName), $fieldName);

$result = function () use ($renderedValue) {
return $renderedValue;
};

return $this->valueFactory->create($result);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ private function processTree(\Iterator $iterator) : array
$iterator->next();
$nextCategory = $iterator->current();
$tree[$category->getId()] = $this->hydrator->hydrateCategory($category);
$tree[$category->getId()]['model'] = $category;
if ($nextCategory && (int) $nextCategory->getLevel() !== (int) $category->getLevel()) {
$tree[$category->getId()]['children'] = $this->processTree($iterator);
}
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/CatalogGraphQl/etc/schema.graphqls
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ interface CustomizableProductInterface @typeResolver(class: "Magento\\CatalogGra

interface CategoryInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\CategoryInterfaceTypeResolver") @doc(description: "CategoryInterface contains the full set of attributes that can be returned in a category search") {
id: Int @doc(description: "An ID that uniquely identifies the category")
description: String @doc(description: "An optional description of the category")
description: String @doc(description: "An optional description of the category") @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoryHtmlAttribute")
name: String @doc(description: "The display name of the category")
path: String @doc(description: "Category Path")
path_in_store: String @doc(description: "Category path in store")
Expand Down Expand Up @@ -548,6 +548,6 @@ type SortField {
}

type SortFields @doc(description: "SortFields contains a default value for sort fields and all available sort fields") {
default: String @doc(description: "Default value of sort fields")
default: String @doc(description: "Default value of sort fields")
options: [SortField] @doc(description: "Available sort fields")
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\GraphQl\Catalog;

use Magento\Catalog\Api\CategoryRepositoryInterface;
use Magento\Catalog\Api\Data\CategoryInterface;
use Magento\Store\Model\StoreManagerInterface;
use Magento\TestFramework\ObjectManager;
use Magento\TestFramework\TestCase\GraphQlAbstract;

/**
* Test for checking that category description directives are rendered correctly
*/
class CategoryWithDescriptionDirectivesTest extends GraphQlAbstract
{
/**
* @var \Magento\TestFramework\ObjectManager
*/
private $objectManager;

protected function setUp()
{
$this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
}

/**
* @magentoApiDataFixture Magento/Catalog/_files/category.php
*/
public function testHtmlDirectivesRendered()
{
$categoryId = 333;
$mediaFilePath = '/path/to/mediafile';
/** @var StoreManagerInterface $storeManager */
$storeManager = ObjectManager::getInstance()->get(StoreManagerInterface::class);
$storeBaseUrl = $storeManager->getStore()->getBaseUrl();

/* Remove index.php from base URL */
$storeBaseUrlParts = explode('/index.php', $storeBaseUrl);
$storeBaseUrl = $storeBaseUrlParts[0];

/** @var CategoryRepositoryInterface $categoryRepository */
$categoryRepository = ObjectManager::getInstance()->get(CategoryRepositoryInterface::class);
/** @var CategoryInterface $category */
$category = $categoryRepository->get($categoryId);
$category->setDescription('Test: {{media url="' . $mediaFilePath . '"}}');
$categoryRepository->save($category);

$query = <<<QUERY
{
category(id: {$categoryId}) {
description
}
}
QUERY;
$response = $this->graphQlQuery($query);

self::assertNotContains('media url', $response['category']['description']);
self::assertContains($storeBaseUrl, $response['category']['description']);
}
}