-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/2.3-develop' into graphQl-44-pro…
…duct-textarea-field-format
- Loading branch information
Showing
84 changed files
with
1,238 additions
and
449 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\CatalogGraphQl\Model\Resolver\Product; | ||
|
|
||
| use Magento\Catalog\Model\Product; | ||
| use Magento\Framework\Exception\LocalizedException; | ||
| use Magento\Framework\GraphQl\Config\Element\Field; | ||
| use Magento\Framework\GraphQl\Query\ResolverInterface; | ||
| use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; | ||
|
|
||
| /** | ||
| * Returns product's image data | ||
| */ | ||
| class ProductImage implements ResolverInterface | ||
| { | ||
| /** | ||
| * @inheritdoc | ||
| */ | ||
| public function resolve( | ||
| Field $field, | ||
| $context, | ||
| ResolveInfo $info, | ||
| array $value = null, | ||
| array $args = null | ||
| ): array { | ||
| if (!isset($value['model'])) { | ||
| throw new LocalizedException(__('"model" value should be specified')); | ||
| } | ||
|
|
||
| /** @var Product $product */ | ||
| $product = $value['model']; | ||
| $imageType = $field->getName(); | ||
|
|
||
| return [ | ||
| 'model' => $product, | ||
| 'image_type' => $imageType, | ||
| ]; | ||
| } | ||
| } |
96 changes: 96 additions & 0 deletions
96
app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage/Label.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\CatalogGraphQl\Model\Resolver\Product\ProductImage; | ||
|
|
||
| use Magento\Catalog\Model\Product; | ||
| use Magento\Catalog\Model\ResourceModel\Product as ProductResourceModel; | ||
| use Magento\Framework\Exception\LocalizedException; | ||
| use Magento\Framework\GraphQl\Config\Element\Field; | ||
| use Magento\Framework\GraphQl\Query\ResolverInterface; | ||
| use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; | ||
| use Magento\Store\Model\StoreManagerInterface; | ||
|
|
||
| /** | ||
| * Returns product's image label | ||
| */ | ||
| class Label implements ResolverInterface | ||
| { | ||
| /** | ||
| * @var ProductResourceModel | ||
| */ | ||
| private $productResource; | ||
|
|
||
| /** | ||
| * @var StoreManagerInterface | ||
| */ | ||
| private $storeManager; | ||
|
|
||
| /** | ||
| * @param ProductResourceModel $productResource | ||
| * @param StoreManagerInterface $storeManager | ||
| */ | ||
| public function __construct( | ||
| ProductResourceModel $productResource, | ||
| StoreManagerInterface $storeManager | ||
| ) { | ||
| $this->productResource = $productResource; | ||
| $this->storeManager = $storeManager; | ||
| } | ||
|
|
||
| /** | ||
| * @inheritdoc | ||
| */ | ||
| public function resolve( | ||
| Field $field, | ||
| $context, | ||
| ResolveInfo $info, | ||
| array $value = null, | ||
| array $args = null | ||
| ) { | ||
| if (!isset($value['image_type'])) { | ||
| throw new LocalizedException(__('"image_type" value should be specified')); | ||
| } | ||
|
|
||
| if (!isset($value['model'])) { | ||
| throw new LocalizedException(__('"model" value should be specified')); | ||
| } | ||
|
|
||
| /** @var Product $product */ | ||
| $product = $value['model']; | ||
| $imageType = $value['image_type']; | ||
| $imagePath = $product->getData($imageType); | ||
| $productId = (int)$product->getEntityId(); | ||
|
|
||
| // null if image is not set | ||
| if (null === $imagePath) { | ||
| return $this->getAttributeValue($productId, 'name'); | ||
| } | ||
|
|
||
| $imageLabel = $this->getAttributeValue($productId, $imageType . '_label'); | ||
| if (null === $imageLabel) { | ||
| $imageLabel = $this->getAttributeValue($productId, 'name'); | ||
| } | ||
|
|
||
| return $imageLabel; | ||
| } | ||
|
|
||
| /** | ||
| * Get attribute value | ||
| * | ||
| * @param int $productId | ||
| * @param string $attributeCode | ||
| * @return null|string Null if attribute value is not exists | ||
| */ | ||
| private function getAttributeValue(int $productId, string $attributeCode): ?string | ||
| { | ||
| $storeId = $this->storeManager->getStore()->getId(); | ||
|
|
||
| $value = $this->productResource->getAttributeRawValue($productId, $attributeCode, $storeId); | ||
| return is_array($value) && empty($value) ? null : $value; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.