Skip to content

Commit fc9cadd

Browse files
author
Prabhu Ram
committed
PWA-1319: [EY] Routable Interface in GraphQL
- Refactoring - Addressed review comments
1 parent 43b826a commit fc9cadd

File tree

11 files changed

+25
-34
lines changed

11 files changed

+25
-34
lines changed

‎app/code/Magento/CatalogGraphQl/composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
"magento/module-eav-graph-ql": "*",
1414
"magento/module-catalog-search": "*",
1515
"magento/framework": "*",
16-
"magento/module-graph-ql": "*",
17-
"magento/module-url-rewrite-graph-ql": "*"
16+
"magento/module-graph-ql": "*"
1817
},
1918
"suggest": {
2019
"magento/module-graph-ql-cache": "*",

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,6 @@
7777
</arguments>
7878
</type>
7979

80-
<type name="Magento\UrlRewriteGraphQl\Model\DataProvider\EntityDataProviderComposite">
81-
<arguments>
82-
<argument name="dataProviders" xsi:type="array">
83-
<item name="category" xsi:type="object">Magento\CatalogGraphQl\DataProvider\UrlRewrite\CatalogTreeDataProvider</item>
84-
<item name="product" xsi:type="object">Magento\CatalogGraphQl\DataProvider\UrlRewrite\ProductDataProvider</item>
85-
</argument>
86-
</arguments>
87-
</type>
88-
8980
<type name="Magento\CatalogGraphQl\Plugin\Search\Request\ConfigReader">
9081
<arguments>
9182
<argument name="exactMatchAttributes" xsi:type="array">

‎app/code/Magento/CatalogGraphQl/DataProvider/UrlRewrite/CatalogTreeDataProvider.php renamed to ‎app/code/Magento/CatalogUrlRewriteGraphQl/Model/DataProvider/UrlRewrite/CatalogTreeDataProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\CatalogGraphQl\DataProvider\UrlRewrite;
8+
namespace Magento\CatalogUrlRewriteGraphQl\Model\DataProvider\UrlRewrite;
99

1010
use Magento\Catalog\Model\CategoryRepository;
1111
use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CategoryTree as CategoryTreeDataProvider;

‎app/code/Magento/CatalogGraphQl/DataProvider/UrlRewrite/ProductDataProvider.php renamed to ‎app/code/Magento/CatalogUrlRewriteGraphQl/Model/DataProvider/UrlRewrite/ProductDataProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\CatalogGraphQl\DataProvider\UrlRewrite;
8+
namespace Magento\CatalogUrlRewriteGraphQl\Model\DataProvider\UrlRewrite;
99

1010
use Magento\Catalog\Model\ProductRepository;
1111
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,13 @@
3030
</argument>
3131
</arguments>
3232
</type>
33+
34+
<type name="Magento\UrlRewriteGraphQl\Model\DataProvider\EntityDataProviderComposite">
35+
<arguments>
36+
<argument name="dataProviders" xsi:type="array">
37+
<item name="category" xsi:type="object">Magento\CatalogUrlRewriteGraphQl\Model\DataProvider\UrlRewrite\CatalogTreeDataProvider</item>
38+
<item name="product" xsi:type="object">Magento\CatalogUrlRewriteGraphQl\Model\DataProvider\UrlRewrite\ProductDataProvider</item>
39+
</argument>
40+
</arguments>
41+
</type>
3342
</config>

‎app/code/Magento/CmsGraphQl/composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
"magento/framework": "*",
88
"magento/module-cms": "*",
99
"magento/module-widget": "*",
10-
"magento/module-store": "*",
11-
"magento/module-url-rewrite-graph-ql": "*"
10+
"magento/module-store": "*"
1211
},
1312
"suggest": {
1413
"magento/module-graph-ql": "*",

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

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎app/code/Magento/CmsGraphQl/Model/DataProvider/UrlRewrite/Page.php renamed to ‎app/code/Magento/CmsUrlRewriteGraphQl/Model/DataProvider/UrlRewrite/Page.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\CmsGraphQl\Model\DataProvider\UrlRewrite;
8+
namespace Magento\CmsUrlRewriteGraphQl\Model\DataProvider\UrlRewrite;
99

1010
use Magento\CmsGraphQl\Model\Resolver\DataProvider\Page as PageDataProvider;
1111
use Magento\Framework\Exception\NoSuchEntityException;

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,11 @@
2020
</argument>
2121
</arguments>
2222
</type>
23+
<type name="Magento\UrlRewriteGraphQl\Model\DataProvider\EntityDataProviderComposite">
24+
<arguments>
25+
<argument name="dataProviders" xsi:type="array">
26+
<item name="cms_page" xsi:type="object">Magento\CmsUrlRewriteGraphQl\Model\DataProvider\UrlRewrite\Page</item>
27+
</argument>
28+
</arguments>
29+
</type>
2330
</config>

‎app/code/Magento/UrlRewriteGraphQl/Model/Resolver/AbstractEntityUrl.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ public function resolve(
8888
'canonical_url' => $relativeUrl,
8989
'relative_url' => $relativeUrl,
9090
'redirectCode' => $this->redirectType,
91+
'redirect_code' => $this->redirectType,
9192
'type' => $this->sanitizeType($finalUrlRewrite->getEntityType())
9293
];
9394
if (!empty($urlParts['query'])) {
@@ -126,6 +127,7 @@ private function rewriteCustomUrls(UrlRewrite $finalUrlRewrite, int $storeId): ?
126127
'canonical_url' => $relativeUrl,
127128
'relative_url' => $relativeUrl,
128129
'redirectCode' => $finalCustomUrlRewrite->getRedirectType(),
130+
'redirect_code' => $finalCustomUrlRewrite->getRedirectType(),
129131
'type' => $this->sanitizeType($finalUrlRewrite->getEntityType())
130132
];
131133
}

0 commit comments

Comments
 (0)