MAGETWO-72112: [Github] Child categories included in menu when parent category is disabled or hidden #10664

- address code review comments

Author: Joan He

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

@@ -93,12 +93,15 @@ public function beforeGetHtml(
             $parentCategoryNode = $mapping[$categoryParentId];
 
             $categoryNode = new Node(
-                $this->getCategoryAsArray($category, $currentCategory),
+                $this->getCategoryAsArray(
+                    $category,
+                    $currentCategory,
+                    $category->getParentId() == $categoryParentId
+                ),
                 'id',
                 $parentCategoryNode->getTree(),
                 $parentCategoryNode
             );
-            $categoryNode->setData('is_parent_active', $category->getParentId() == $categoryParentId);
             $parentCategoryNode->addChild($categoryNode);
 
             $mapping[$category->getId()] = $categoryNode; //add node in stack
@@ -148,16 +151,18 @@ private function getCurrentCategory()
      *
      * @param \Magento\Catalog\Model\Category $category
      * @param \Magento\Catalog\Model\Category $currentCategory
+     * @param bool $isParentActive
      * @return array
      */
-    private function getCategoryAsArray($category, $currentCategory)
+    private function getCategoryAsArray($category, $currentCategory, $isParentActive)
     {
         return [
             'name' => $category->getName(),
             'id' => 'category-node-' . $category->getId(),
             'url' => $this->catalogCategory->getCategoryUrl($category),
             'has_active' => in_array((string)$category->getId(), explode('/', $currentCategory->getPath()), true),
-            'is_active' => $category->getId() == $currentCategory->getId()
+            'is_active' => $category->getId() == $currentCategory->getId(),
+            'is_parent_active' => $isParentActive
         ];
     }
 

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/SubcategoryNotIncludeInNavigationMenuTest.php

@@ -37,21 +37,21 @@ class SubcategoryNotIncludeInNavigationMenuTest extends Injectable
      *
      * @var CatalogCategoryIndex
      */
-    protected $catalogCategoryIndex;
+    private $catalogCategoryIndex;
 
     /**
      * Catalog category edit page.
      *
      * @var CatalogCategoryEdit
      */
-    protected $catalogCategoryEdit;
+    private $catalogCategoryEdit;
 
     /**
      * Fixture Factory.
      *
      * @var FixtureFactory
      */
-    protected $fixtureFactory;
+    private $fixtureFactory;
 
     /**
      * Inject pages.