MC-21542: Category query does not handle disabled children properly

- image expects model
- skip inactive categories

Author: cpartica

app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Image.php

@@ -41,7 +41,7 @@ public function resolve(
         array $args = null
     ) {
         if (!isset($value['model'])) {
-            throw new LocalizedException(__('"model" value should be specified'));
+            return null;
         }
         /** @var \Magento\Catalog\Model\Category $category */
         $category = $value['model'];

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

@@ -52,16 +52,18 @@ public function execute(\Iterator $iterator): array
             /** @var CategoryInterface $category */
             $category = $iterator->current();
             $iterator->next();
-            $pathElements = explode("/", $category->getPath());
-            if (empty($tree)) {
-                $this->startCategoryFetchLevel = count($pathElements) - 1;
+            if ($category->getIsActive()) {
+                $pathElements = explode("/", $category->getPath());
+                if (empty($tree)) {
+                    $this->startCategoryFetchLevel = count($pathElements) - 1;
+                }
+                $this->iteratingCategory = $category;
+                $currentLevelTree = $this->explodePathToArray($pathElements, $this->startCategoryFetchLevel);
+                if (empty($tree)) {
+                    $tree = $currentLevelTree;
+                }
+                $tree = $this->mergeCategoriesTrees($currentLevelTree, $tree);
             }
-            $this->iteratingCategory = $category;
-            $currentLevelTree = $this->explodePathToArray($pathElements, $this->startCategoryFetchLevel);
-            if (empty($tree)) {
-                $tree = $currentLevelTree;
-            }
-            $tree = $this->mergeCategoriesTrees($currentLevelTree, $tree);
         }
         return $tree;
     }