Merge pull request #54 from sitegeist/sorting

Sort vocabularies and taxonomies alphabetically
sitegeist · Apr 5, 2022 · a5d603b · a5d603b
2 parents dad0224 + db8332f
commit a5d603b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/Classes/Controller/ModuleController.php b/Classes/Controller/ModuleController.php
@@ -117,6 +117,12 @@ public function indexAction(NodeInterface $root = null)
                 'defaultNode' => $this->getNodeInDefaultDimensions($vocabulary)
             ];
         }
+        usort($vocabularies, function (array $vocabularyA, array $vocabularyB) {
+            return strcmp(
+                $vocabularyA['node']->getProperty('title') ?: '',
+                $vocabularyB['node']->getProperty('title') ?: ''
+            );
+        });
 
         $this->view->assign('taxonomyRoot', $root);
         $this->view->assign('vocabularies', $vocabularies);
@@ -245,7 +251,14 @@ public function vocabularyAction(NodeInterface $vocabulary)
         $this->view->assign('taxonomyRoot', $root);
         $this->view->assign('vocabulary', $vocabulary);
         $this->view->assign('defaultVocabulary', $this->getNodeInDefaultDimensions($vocabulary));
-        $this->view->assign('taxonomies', $this->fetchChildTaxonomies($vocabulary));
+        $taxonomies = $this->fetchChildTaxonomies($vocabulary);
+        usort($taxonomies, function (array $taxonomyA, array $taxonomyB) {
+            return strcmp(
+                $taxonomyA['node']->getProperty('title') ?: '',
+                $taxonomyB['node']->getProperty('title') ?: ''
+            );
+        });
+        $this->view->assign('taxonomies', $taxonomies);
     }
 
     /**

diff --git a/Classes/Service/TaxonomyService.php b/Classes/Service/TaxonomyService.php
@@ -213,6 +213,12 @@ public function getTaxonomyTreeAsArray(NodeInterface $startingPoint): array
         foreach ($startingPoint->getChildNodes() as $childNode) {
             $result['children'][] = $this->getTaxonomyTreeAsArray($childNode);
         }
+        usort($result['children'], function (array $childA, array $childB) {
+            return strcmp(
+                $childA['title'] ?: '',
+                $childB['title'] ?: ''
+            );
+        });
 
         return $result;
     }