Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit dc1ceb1

Browse files
rganinrganin
committed
Merge remote-tracking branch 'hb/MAGETWO-89292-SDL' into MAGETWO-87654-Support-layered-navigation-in-one-query
2 parents efd94fc + b70e605 commit dc1ceb1

File tree

196 files changed

+6896
-2225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+6896
-2225
lines changed

‎app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Magento\BundleGraphQl\Model;
99

10-
use Magento\Framework\GraphQl\Config\Data\TypeResolverInterface;
10+
use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
1111

1212
/**
1313
* {@inheritdoc}

‎app/code/Magento/BundleGraphQl/Model/Resolver/BundleItemLinks.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
use GraphQL\Type\Definition\ResolveInfo;
1111
use Magento\BundleGraphQl\Model\Resolver\Links\Collection;
12-
use Magento\Framework\GraphQl\Config\Data\Field;
13-
use Magento\Framework\GraphQl\Resolver\ResolverInterface;
14-
use Magento\Framework\GraphQl\Resolver\Value;
15-
use Magento\Framework\GraphQl\Resolver\ValueFactory;
12+
use Magento\Framework\GraphQl\Config\Element\Field;
13+
use Magento\Framework\GraphQl\Query\Resolver\Value;
14+
use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
15+
use Magento\Framework\GraphQl\Query\ResolverInterface;
1616

1717
/**
1818
* {@inheritdoc}

‎app/code/Magento/BundleGraphQl/Model/Resolver/BundleItems.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99

1010
use GraphQL\Type\Definition\ResolveInfo;
1111
use Magento\Bundle\Model\Product\Type;
12-
use Magento\Catalog\Api\Data\ProductInterface;
13-
use Magento\Framework\GraphQl\Config\Data\Field;
14-
use Magento\Framework\GraphQl\Resolver\ResolverInterface;
1512
use Magento\BundleGraphQl\Model\Resolver\Options\Collection;
16-
use Magento\Framework\GraphQl\Resolver\Value;
17-
use Magento\Framework\GraphQl\Resolver\ValueFactory;
13+
use Magento\Catalog\Api\Data\ProductInterface;
1814
use Magento\Framework\EntityManager\MetadataPool;
15+
use Magento\Framework\GraphQl\Config\Element\Field;
16+
use Magento\Framework\GraphQl\Query\Resolver\Value;
17+
use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
18+
use Magento\Framework\GraphQl\Query\ResolverInterface;
1919

2020
/**
2121
* {@inheritdoc}

‎app/code/Magento/BundleGraphQl/Model/Resolver/Options/Label.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
namespace Magento\BundleGraphQl\Model\Resolver\Options;
99

1010
use GraphQL\Type\Definition\ResolveInfo;
11-
use Magento\Framework\GraphQl\Config\Data\Field;
12-
use Magento\Framework\GraphQl\Resolver\ResolverInterface;
13-
use Magento\Framework\GraphQl\Resolver\Value;
14-
use Magento\Framework\GraphQl\Resolver\ValueFactory;
1511
use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\Product;
12+
use Magento\Framework\GraphQl\Config\Element\Field;
13+
use Magento\Framework\GraphQl\Query\Resolver\Value;
14+
use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
15+
use Magento\Framework\GraphQl\Query\ResolverInterface;
1616

1717
/**
1818
* Class Label
@@ -55,6 +55,7 @@ public function resolve(
5555
}
5656

5757
$this->product->addProductSku($value['sku']);
58+
$this->product->addEavAttributes(['name']);
5859

5960
$result = function () use ($value) {
6061
$productData = $this->product->getProductBySku($value['sku']);

‎app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicPrice.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
1010

1111
use GraphQL\Type\Definition\ResolveInfo;
12-
use Magento\Framework\GraphQl\Config\Data\Field;
13-
use Magento\Framework\GraphQl\Resolver\ResolverInterface;
1412
use Magento\Bundle\Model\Product\Type as Bundle;
15-
use Magento\Framework\GraphQl\Resolver\Value;
16-
use Magento\Framework\GraphQl\Resolver\ValueFactory;
13+
use Magento\Framework\GraphQl\Config\Element\Field;
14+
use Magento\Framework\GraphQl\Query\Resolver\Value;
15+
use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
16+
use Magento\Framework\GraphQl\Query\ResolverInterface;
1717

1818
/**
1919
* {@inheritdoc}

‎app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicSku.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
1010

1111
use GraphQL\Type\Definition\ResolveInfo;
12-
use Magento\Framework\GraphQl\Config\Data\Field;
13-
use Magento\Framework\GraphQl\Resolver\ResolverInterface;
1412
use Magento\Bundle\Model\Product\Type as Bundle;
15-
use Magento\Framework\GraphQl\Resolver\Value;
16-
use Magento\Framework\GraphQl\Resolver\ValueFactory;
13+
use Magento\Framework\GraphQl\Config\Element\Field;
14+
use Magento\Framework\GraphQl\Query\Resolver\Value;
15+
use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
16+
use Magento\Framework\GraphQl\Query\ResolverInterface;
1717

1818
/**
1919
* {@inheritdoc}

‎app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicWeight.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
1010

1111
use GraphQL\Type\Definition\ResolveInfo;
12-
use Magento\Framework\GraphQl\Config\Data\Field;
13-
use Magento\Framework\GraphQl\Resolver\ResolverInterface;
1412
use Magento\Bundle\Model\Product\Type as Bundle;
15-
use Magento\Framework\GraphQl\Resolver\Value;
16-
use Magento\Framework\GraphQl\Resolver\ValueFactory;
13+
use Magento\Framework\GraphQl\Config\Element\Field;
14+
use Magento\Framework\GraphQl\Query\Resolver\Value;
15+
use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
16+
use Magento\Framework\GraphQl\Query\ResolverInterface;
1717

1818
/**
1919
* {@inheritdoc}

‎app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/PriceView.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
1010

1111
use GraphQL\Type\Definition\ResolveInfo;
12-
use Magento\Framework\GraphQl\Config\Data\Field;
13-
use Magento\Framework\GraphQl\Resolver\ResolverInterface;
14-
use Magento\Framework\GraphQl\Query\EnumLookup;
1512
use Magento\Bundle\Model\Product\Type as Bundle;
16-
use Magento\Framework\GraphQl\Resolver\Value;
17-
use Magento\Framework\GraphQl\Resolver\ValueFactory;
13+
use Magento\Framework\GraphQl\Config\Element\Field;
14+
use Magento\Framework\GraphQl\Query\EnumLookup;
15+
use Magento\Framework\GraphQl\Query\Resolver\Value;
16+
use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
17+
use Magento\Framework\GraphQl\Query\ResolverInterface;
1818

1919
/**
2020
* {@inheritdoc}

‎app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/ShipBundleItems.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
1010

1111
use GraphQL\Type\Definition\ResolveInfo;
12-
use Magento\Framework\GraphQl\Config\Data\Field;
13-
use Magento\Framework\GraphQl\Resolver\ResolverInterface;
14-
use Magento\Framework\GraphQl\Query\EnumLookup;
1512
use Magento\Bundle\Model\Product\Type as Bundle;
16-
use Magento\Framework\GraphQl\Resolver\Value;
17-
use Magento\Framework\GraphQl\Resolver\ValueFactory;
13+
use Magento\Framework\GraphQl\Config\Element\Field;
14+
use Magento\Framework\GraphQl\Query\EnumLookup;
15+
use Magento\Framework\GraphQl\Query\Resolver\Value;
16+
use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
17+
use Magento\Framework\GraphQl\Query\ResolverInterface;
1818

1919
/**
2020
* {@inheritdoc}
@@ -52,7 +52,7 @@ public function resolve(
5252
ResolveInfo $info
5353
): ?Value {
5454
if ($value['type_id'] === Bundle::TYPE_CODE) {
55-
$result = isset($value['price_view'])
55+
$result = isset($value['shipment_type'])
5656
? $this->enumLookup->getEnumValueFromField('ShipBundleItemsEnum', $value['shipment_type']) : null;
5757
return $this->valueFactory->create(
5858
function () use ($result) {

‎app/code/Magento/BundleGraphQl/etc/di.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
9+
<type name="Magento\Framework\GraphQl\Query\FieldTranslator">
10+
<arguments>
11+
<argument name="translationMap" xsi:type="array">
12+
<item name="ship_bundle_items" xsi:type="string">shipment_type</item>
13+
<item name="dynamic_price" xsi:type="string">price_type</item>
14+
<item name="dynamic_sku" xsi:type="string">sku_type</item>
15+
<item name="dynamic_weight" xsi:type="string">weight_type</item>
16+
</argument>
17+
</arguments>
18+
</type>
19+
</config>

0 commit comments

Comments
 (0)