PWA-1654: Staged upcoming products don't show up in categoryList query for preview

- modify interface

Author: cpartica

app/code/Magento/CatalogUrlRewriteGraphQl/Model/DataProvider/UrlRewrite/CatalogTreeDataProvider.php

@@ -52,16 +52,18 @@ public function __construct(
      * @param string $entity_type
      * @param int $id
      * @param ResolveInfo|null $info
+     * @param int|null $storeId
      * @return array
      * @throws GraphQlNoSuchEntityException
      */
     public function getData(
         string $entity_type,
         int $id,
-        ResolveInfo $info = null
+        ResolveInfo $info = null,
+        int $storeId = null
     ): array {
         $categoryId = (int)$id;
-        $categoriesTree = $this->categoryTree->getTree($info, $categoryId);
+        $categoriesTree = $this->categoryTree->getTree($info, $categoryId, $storeId);
         if (empty($categoriesTree) || ($categoriesTree->count() == 0)) {
             throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
         }

app/code/Magento/CatalogUrlRewriteGraphQl/Model/DataProvider/UrlRewrite/ProductDataProvider.php

@@ -8,6 +8,7 @@
 namespace Magento\CatalogUrlRewriteGraphQl\Model\DataProvider\UrlRewrite;
 
 use Magento\Catalog\Model\ProductRepository;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\UrlRewriteGraphQl\Model\DataProvider\EntityDataProviderInterface;
 
@@ -28,17 +29,23 @@ public function __construct(
     }
 
     /**
-     * Get product data
+     * Get catalog tree data
      *
      * @param string $entity_type
      * @param int $id
      * @param ResolveInfo|null $info
+     * @param int|null $storeId
      * @return array
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getData(string $entity_type, int $id, ResolveInfo $info = null): array
-    {
-        $product = $this->productRepository->getById($id);
+    public function getData(
+        string $entity_type,
+        int $id,
+        ResolveInfo $info = null,
+        int $storeId = null
+    ): array {
+        $product = $this->productRepository->getById($id, false, $storeId);
         $result = $product->getData();
         $result['model'] = $product;
         return $result;

app/code/Magento/CmsUrlRewriteGraphQl/Model/DataProvider/UrlRewrite/Page.php

@@ -35,11 +35,17 @@ public function __construct(
      * @param string $entity_type
      * @param int $id
      * @param ResolveInfo|null $info
+     * @param int|null $storeId
      * @return array
      * @throws NoSuchEntityException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getData(string $entity_type, int $id, ResolveInfo $info = null): array
-    {
+    public function getData(
+        string $entity_type,
+        int $id,
+        ResolveInfo $info = null,
+        int $storeId = null
+    ): array {
         $result = $this->pageDataProvider->getDataByPageId((int)$id);
         $result['type_id'] = $entity_type;
         return $result;

app/code/Magento/UrlRewriteGraphQl/Model/DataProvider/EntityDataProviderComposite.php

@@ -33,14 +33,20 @@ public function __construct(array $dataProviders = [])
      * @param string $entity_type
      * @param int $id
      * @param ResolveInfo|null $info
+     * @param int|null $storeId
      * @return array
      */
-    public function getData(string $entity_type, int $id, ResolveInfo $info = null): array
-    {
+    public function getData(
+        string $entity_type,
+        int $id,
+        ResolveInfo $info = null,
+        int $storeId = null
+    ): array {
         return $this->dataProviders[strtolower($entity_type)]->getData(
             $entity_type,
             $id,
-            $info
+            $info,
+            $storeId
         );
     }
 }

app/code/Magento/UrlRewriteGraphQl/Model/DataProvider/EntityDataProviderInterface.php

@@ -17,11 +17,13 @@ interface EntityDataProviderInterface
      * @param string $entity_type
      * @param int $id
      * @param ResolveInfo|null $info
+     * @param int|null $storeId
      * @return array
      */
     public function getData(
         string $entity_type,
         int $id,
-        ResolveInfo $info = null
+        ResolveInfo $info = null,
+        int $storeId = null
     ): array;
 }

app/code/Magento/UrlRewriteGraphQl/Model/Resolver/Route.php

@@ -56,9 +56,14 @@ public function resolve(
             $value,
             $args
         );
-
+        $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
         if ($resultArray) {
-            $result = $this->entityDataProviderComposite->getData($resultArray['type'], (int)$resultArray['id'], $info);
+            $result = $this->entityDataProviderComposite->getData(
+                $resultArray['type'],
+                (int)$resultArray['id'],
+                $info,
+                $storeId
+            );
             $result['redirect_code'] = $resultArray['redirect_code'];
             $result['relative_url'] = $resultArray['relative_url'];
             $result['type'] = $resultArray['type'];