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

- modify Category Tree

Author: cpartica

app/code/Magento/CatalogGraphQl/Model/Resolver/CategoriesQuery.php

@@ -85,8 +85,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__($e->getMessage()));
         }
 
-        $rootCategoryIds = $filterResult['category_ids'];
-        $filterResult['items'] = $this->fetchCategories($rootCategoryIds, $info);
+        $rootCategoryIds = $filterResult['category_ids'] ?? [];
+
+        $filterResult['items'] = $this->fetchCategories($rootCategoryIds, $info, $store->getId());
         return $filterResult;
     }
 
@@ -95,13 +96,14 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
      *
      * @param array $categoryIds
      * @param ResolveInfo $info
+     * @param int $storeId
      * @return array
      */
-    private function fetchCategories(array $categoryIds, ResolveInfo $info)
+    private function fetchCategories(array $categoryIds, ResolveInfo $info, int $storeId)
     {
         $fetchedCategories = [];
         foreach ($categoryIds as $categoryId) {
-            $categoryTree = $this->categoryTree->getTree($info, $categoryId);
+            $categoryTree = $this->categoryTree->getTree($info, $categoryId, $storeId);
             if (empty($categoryTree)) {
                 continue;
             }

app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryList.php

@@ -81,22 +81,22 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         } catch (InputException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
         }
-
-        return $this->fetchCategories($rootCategoryIds, $info);
+        return $this->fetchCategories($rootCategoryIds, $info, (int) $store->getId());
     }
 
     /**
      * Fetch category tree data
      *
      * @param array $categoryIds
      * @param ResolveInfo $info
+     * @param int $storeId
      * @return array
      */
-    private function fetchCategories(array $categoryIds, ResolveInfo $info)
+    private function fetchCategories(array $categoryIds, ResolveInfo $info, int $storeId)
     {
         $fetchedCategories = [];
         foreach ($categoryIds as $categoryId) {
-            $categoryTree = $this->categoryTree->getTree($info, $categoryId);
+            $categoryTree = $this->categoryTree->getTree($info, $categoryId, $storeId);
             if (empty($categoryTree)) {
                 continue;
             }

app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php

@@ -71,7 +71,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         if ($rootCategoryId !== Category::TREE_ROOT_ID) {
             $this->checkCategoryIsActive->execute($rootCategoryId);
         }
-        $categoriesTree = $this->categoryTree->getTree($info, $rootCategoryId);
+        $store = $context->getExtensionAttributes()->getStore();
+        $categoriesTree = $this->categoryTree->getTree($info, $rootCategoryId, (int)$store->getId());
 
         if (empty($categoriesTree) || ($categoriesTree->count() == 0)) {
             throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php

@@ -80,9 +80,11 @@ public function __construct(
      *
      * @param ResolveInfo $resolveInfo
      * @param int $rootCategoryId
+     * @param int $storeId
      * @return \Iterator
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId): \Iterator
+    public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId, int $storeId): \Iterator
     {
         $categoryQuery = $resolveInfo->fieldNodes[0];
         $collection = $this->collectionFactory->create();