[TASK] Adaptions for the new category handling

Classes/SGalinski/TypoScriptReferenceFrontend/Controller/TsrefController.php

@@ -155,6 +155,7 @@ class TsrefController extends \TYPO3\Flow\Mvc\Controller\ActionController {
 
 			$categories = $this->tsrefRestService->getCategories();
 			$selectBoxCategories = Conversion::categoriesToAssociativeNameArray($categories);
+			sort($selectBoxCategories);
 
 			$this->view->assign('typo3Groups', $this->tsrefRestService->getAllTypo3Groups());
 			$this->view->assign('theType', $theType);
@@ -340,7 +341,9 @@ class TsrefController extends \TYPO3\Flow\Mvc\Controller\ActionController {
 				TRUE, $typo3VersionFilter, $this->session->getData('typoScriptGroup')
 			);
 			$typo3Versions = $this->tsrefRestService->getTypo3Versions();
-			$groupedTypes = Conversion::groupTypesForSidebar($types);
+            $categories = $this->tsrefRestService->getCategories();
+            $categories = Conversion::categoriesToAssociativeNameArray($categories);
+			$groupedTypes = Conversion::groupTypesForSidebar($types, $categories);
 
 			$this->view->assign('menuTypes', $groupedTypes);
 			$this->view->assign('selectedTypeUrlName', $selectedTypeUrlName);

Classes/SGalinski/TypoScriptReferenceFrontend/Utilities/Conversion.php

@@ -21,14 +21,15 @@ class Conversion {
 	 * The function groups types by categories with form: [category => [{type}, {type}, ...], category => [], ...]
 	 *
 	 * @param array $types
+	 * @param array $categories
 	 * @return array
 	 */
-	public static function groupTypesForSidebar(array $types) {
+	public static function groupTypesForSidebar(array $types, array $categories) {
 		$categorisedTypes = [];
 		$unCategorised = [];
 		foreach ($types as $type) {
-			if (isset($type->category)) {
-				$categorisedTypes[$type->category][] = $type;
+			if (isset($type->category) && isset($categories[$type->category])) {
+				$categorisedTypes[$categories[$type->category]][] = $type;
 			} else {
 				$unCategorised[] = $type;
 			}
@@ -48,7 +49,7 @@ class Conversion {
 	public static function categoriesToAssociativeNameArray(array $categories) {
 		$categoryNames = [];
 		foreach ($categories as $category) {
-			$categoryNames[$category->name] = $category->name;
+			$categoryNames[$category->id] = $category->name;
 		}
 		return $categoryNames;
 	}