Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3350' into Tier4-Kings-PR-10-28-2024

Author: glo23503

app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 
 /**
@@ -392,8 +392,7 @@ protected function _getNodeJson($node, $level = 0)
         $item['id'] = $node->getId();
         $item['store'] = (int)$this->getStore()->getId();
         $item['path'] = $node->getData('path');
-
-        $item['cls'] = 'folder ' . ($node->getIsActive() ? 'active-category' : 'no-active-category');
+        $item['a_attr'] = ['class' => $node->getIsActive() ? 'active-category' : 'not-active-category'];
         //$item['allowDrop'] = ($level<3) ? true : false;
         $allowMove = $this->_isCategoryMoveable($node);
         $item['allowDrop'] = $allowMove;

app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less

@@ -1,8 +1,10 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2024 Adobe
+//  * All Rights Reserved.
 //  */
 
+@color-grey: #aaa;
+
 //
 //  Catalog product grid
 //  ---------------------------------------------
@@ -71,7 +73,7 @@
 
 .catalog-category-edit,
 .catalog-category-add {
-    //  TODO: refactor trees
+    //  TODO refactor trees
     .x-tree.tree-wrapper {
         overflow-x: auto;
     }
@@ -121,3 +123,13 @@
         }
     }
 }
+
+//
+//  Catalog Category Tree
+//  ---------------------------------------------
+
+.jstree-children {
+    .not-active-category {
+        color: @color-grey;
+    }
+}

dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Category/TreeBlockTest.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Block\Adminhtml\Category;
+
+use Magento\Catalog\Test\Fixture\Category as CategoryFixture;
+use Magento\Framework\View\LayoutInterface;
+use Magento\TestFramework\Fixture\AppArea;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorage;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Test for categories in the tree block.
+ */
+class TreeBlockTest extends AbstractBackendController
+{
+
+    /**
+     * @var DataFixtureStorage
+     */
+    private $fixtures;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->fixtures = $this->_objectManager->get(DataFixtureStorageManager::class)->getStorage();
+    }
+
+    /**
+     * Test disabled categories in the tree block.
+     */
+    #[
+        AppArea('adminhtml'),
+        DataFixture(CategoryFixture::class, as: 'c10'),
+        DataFixture(CategoryFixture::class, ['parent_id' => '$c10.id$', 'is_active' => false], 'c11'),
+    ]
+    public function testDisabledCategoriesHtml()
+    {
+        $category = $this->fixtures->get('c10');
+        $layout = $this->_objectManager->get(LayoutInterface::class);
+        $categoryTreeBlock = $layout->createBlock(Tree::class);
+        $categoryTreeArray = $categoryTreeBlock->getTree($category);
+        $this->assertCount(1, $categoryTreeArray);
+        $this->assertArrayHasKey('a_attr', $categoryTreeArray[0]);
+        $this->assertArrayHasKey('class', $categoryTreeArray[0]['a_attr']);
+        $this->assertStringContainsString('not-active-category', $categoryTreeArray[0]['a_attr']['class']);
+    }
+}