Remove active category in the cache key

- Rollback removal of is_parent_active option as it is needed for not included in the menu categories;

Author: adifucan

app/code/Magento/Catalog/Plugin/Block/Topmenu.php

@@ -95,7 +95,10 @@ public function beforeGetHtml(
             $parentCategoryNode = $mapping[$categoryParentId];
 
             $categoryNode = new Node(
-                $this->getCategoryAsArray($category),
+                $this->getCategoryAsArray(
+                    $category,
+                    $category->getParentId() == $categoryParentId
+                ),
                 'id',
                 $parentCategoryNode->getTree(),
                 $parentCategoryNode
@@ -131,17 +134,19 @@ public function beforeGetIdentities(\Magento\Theme\Block\Html\Topmenu $subject)
     /**
      * Convert category to array
      *
-     * @param \Magento\Catalog\Model\Category $category
+     * @param Category $category
+     * @param bool $isParentActive
      * @return array
      */
-    private function getCategoryAsArray($category)
+    private function getCategoryAsArray($category, $isParentActive): array
     {
         $categoryId = $category->getId();
         return [
             'name' => $category->getName(),
             'id' => 'category-node-' . $categoryId,
             'url' => $this->catalogCategory->getCategoryUrl($category),
-            'is_category' => true
+            'is_category' => true,
+            'is_parent_active' => $isParentActive
         ];
     }
 

app/code/Magento/Theme/Block/Html/Topmenu.php

@@ -7,6 +7,7 @@
 
 use Magento\Backend\Model\Menu;
 use Magento\Framework\Data\Tree\Node;
+use Magento\Framework\Data\Tree\Node\Collection;
 use Magento\Framework\Data\Tree\NodeFactory;
 use Magento\Framework\Data\TreeFactory;
 use Magento\Framework\DataObject;
@@ -217,6 +218,7 @@ protected function _getHtml(
 
         $children = $menuTree->getChildren();
         $childLevel = $this->getChildLevel($menuTree->getLevel());
+        $this->removeChildrenWithoutActiveParent($children, $childLevel);
 
         $counter = 1;
         $childrenCount = $children->count();
@@ -371,6 +373,23 @@ public function getMenu()
         return $this->_menu;
     }
 
+    /**
+     * Remove children from collection when the parent is not active
+     *
+     * @param Collection $children
+     * @param int $childLevel
+     * @return void
+     */
+    private function removeChildrenWithoutActiveParent(Collection $children, int $childLevel): void
+    {
+        /** @var Node $child */
+        foreach ($children as $child) {
+            if ($childLevel === 0 && $child->getData('is_parent_active') === false) {
+                $children->delete($child);
+            }
+        }
+    }
+
     /**
      * Retrieve child level based on parent level
      *