Replaced ExtJS with Maho Tree (MahoCommerce#81)

justinbeaty · Jan 4, 2025 · 8d8144f · 8d8144f
1 parent a8cf65e
commit 8d8144f
Show file tree

Hide file tree

Showing 117 changed files with 4,505 additions and 4,904 deletions.
diff --git a/.github/codeql-config.yml b/.github/codeql-config.yml
@@ -3,5 +3,4 @@ paths-ignore:
   - 'js/prototype/prototype.js'
   - 'js/mage/adminhtml/wysiwyg/tiny_mce/setup.js'
   - 'js/validation.js'
-  - 'js/extjs/ext-tree.js'
   - '**/*.test.js'
diff --git a/.phpstan.baseline.neon b/.phpstan.baseline.neon
@@ -4350,12 +4350,6 @@ parameters:
 			count: 4
 			path: app/design/adminhtml/default/default/template/api/roles.phtml
 
-		-
-			message: '#^Variable \$this might not be defined\.$#'
-			identifier: variable.undefined
-			count: 9
-			path: app/design/adminhtml/default/default/template/api/rolesedit.phtml
-
 		-
 			message: '#^Variable \$this might not be defined\.$#'
 			identifier: variable.undefined
@@ -4404,12 +4398,6 @@ parameters:
 			count: 4
 			path: app/design/adminhtml/default/default/template/api/users.phtml
 
-		-
-			message: '#^Variable \$this might not be defined\.$#'
-			identifier: variable.undefined
-			count: 11
-			path: app/design/adminhtml/default/default/template/api2/attribute/resource.phtml
-
 		-
 			message: '#^Variable \$this might not be defined\.$#'
 			identifier: variable.undefined
@@ -4488,18 +4476,6 @@ parameters:
 			count: 5
 			path: app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml
 
-		-
-			message: '#^Variable \$this might not be defined\.$#'
-			identifier: variable.undefined
-			count: 12
-			path: app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml
-
-		-
-			message: '#^Variable \$this might not be defined\.$#'
-			identifier: variable.undefined
-			count: 19
-			path: app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml
-
 		-
 			message: '#^Variable \$this might not be defined\.$#'
 			identifier: variable.undefined
@@ -4962,12 +4938,6 @@ parameters:
 			count: 1
 			path: app/design/adminhtml/default/default/template/resetforgottenpassword.phtml
 
-		-
-			message: '#^Variable \$this might not be defined\.$#'
-			identifier: variable.undefined
-			count: 5
-			path: app/design/adminhtml/default/default/template/review/add.phtml
-
 		-
 			message: '#^Variable \$this might not be defined\.$#'
 			identifier: variable.undefined

diff --git a/app/code/core/Mage/Admin/Model/Session.php b/app/code/core/Mage/Admin/Model/Session.php
@@ -7,7 +7,7 @@
  * @package    Mage_Admin
  * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://magento.com)
  * @copyright  Copyright (c) 2018-2024 The OpenMage Contributors (https://openmage.org)
- * @copyright  Copyright (c) 2024 Maho (https://mahocommerce.com)
+ * @copyright  Copyright (c) 2024-2025 Maho (https://mahocommerce.com)
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
@@ -23,17 +23,9 @@
  * @method $this setActiveTabId(int $value)
  * @method $this unsActiveTabId()
  * @method $this setAttributeData(array|false $data)
- * @method string getDeletedPath()
- * @method $this setDeletedPath(string $value)
  * @method bool getIndirectLogin()
  * @method $this setIndirectLogin(bool $value)
  * @method $this setIsFirstVisit(bool $value)
- * @method bool getIsTreeWasExpanded()
- * @method $this setIsTreeWasExpanded(bool $value)
- * @method int getLastEditedCategory()
- * @method $this setLastEditedCategory(int $value)
- * @method string getLastViewedStore()
- * @method $this setLastViewedStore(string $value)
  * @method bool getUserPasswordChanged()
  * @method $this setUserPasswordChanged(bool $value)
  * @method bool hasSyncProcessStopWatch()

diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php
@@ -7,6 +7,7 @@
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://magento.com)
  * @copyright  Copyright (c) 2022-2024 The OpenMage Contributors (https://openmage.org)
+ * @copyright  Copyright (c) 2024-2025 Maho (https://mahocommerce.com)
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
@@ -99,7 +100,9 @@ protected function _getNodeJson($node, $level = 0)
                     }
                 }
             }
-            if (!empty($item['children'])) {
+            if (empty($item['children'])) {
+                unset($item['children']);
+            } else {
                 usort($item['children'], [$this, '_sortTree']);
             }
         }