Query category for disabled catalog with products returns the products count

Author: XxXgeoXxX

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

@@ -85,6 +85,9 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId): \Iterato
     {
         $categoryQuery = $resolveInfo->fieldNodes[0];
         $collection = $this->collectionFactory->create();
+        if ($this->isRootCategoryActive($collection, $rootCategoryId) == false) {
+            throw new \Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
+        }
         $this->joinAttributesRecursively($collection, $categoryQuery);
         $depth = $this->depthCalculator->calculate($categoryQuery);
         $level = $this->levelCalculator->calculate($rootCategoryId);
@@ -144,4 +147,29 @@ private function joinAttributesRecursively(Collection $collection, FieldNode $fi
             $this->joinAttributesRecursively($collection, $node);
         }
     }
+
+    /**
+     * @param Collection $collection
+     * @param int $rootCategoryId
+     *
+     * @return bool
+     * @throws \Exception
+     */
+    private function isRootCategoryActive(Collection $collection, int $rootCategoryId) : bool
+    {
+        if ($rootCategoryId == Category::TREE_ROOT_ID) {
+            return true;
+        }
+        $collection->addAttributeToFilter(Category::KEY_IS_ACTIVE, ['eq' => 1])
+            ->getSelect()
+            ->where(
+                $collection->getSelect()
+                               ->getConnection()
+                               ->quoteIdentifier(
+                                   'e.' . $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField()
+                               ) . ' = ?',
+                    $rootCategoryId
+            );
+        return (bool) $collection->count();
+    }
 }

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

@@ -9,8 +9,6 @@
 
 use Magento\CatalogGraphQl\Model\Category\Hydrator;
 use Magento\Catalog\Api\Data\CategoryInterface;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-use Magento\Catalog\Model\Category;
 
 /**
  * Extract data from category tree
@@ -53,9 +51,6 @@ public function execute(\Iterator $iterator): array
         while ($iterator->valid()) {
             /** @var CategoryInterface $category */
             $category = $iterator->current();
-            if ($category->getIsActive() == false && $category->getId() != Category::TREE_ROOT_ID) {
-                throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
-            }
             $iterator->next();
             $pathElements = explode("/", $category->getPath());
             if (empty($tree)) {