Sort categories list by translation in the categories and groups pages (

#8635)
geonetwork · Jan 31, 2025 · 8de1d0e · 8de1d0e
1 parent 287d894
commit 8de1d0e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/web-ui/src/main/resources/catalog/js/admin/CategoriesController.js b/web-ui/src/main/resources/catalog/js/admin/CategoriesController.js
@@ -37,7 +37,16 @@
     "$rootScope",
     "$translate",
     "$timeout",
-    function ($scope, $routeParams, $http, $rootScope, $translate, $timeout) {
+    "gnUtilityService",
+    function (
+      $scope,
+      $routeParams,
+      $http,
+      $rootScope,
+      $translate,
+      $timeout,
+      gnUtilityService
+    ) {
       $scope.categories = null;
       $scope.categorySelected = { id: $routeParams.categoryId };
 
@@ -135,7 +144,11 @@
 
       function loadCategories() {
         $http.get("../api/tags").then(function (response) {
-          $scope.categories = response.data;
+          $scope.categories = gnUtilityService.sortByTranslation(
+            response.data,
+            $scope.lang,
+            "name"
+          );
         });
       }
       loadCategories();

diff --git a/web-ui/src/main/resources/catalog/js/admin/UserGroupController.js b/web-ui/src/main/resources/catalog/js/admin/UserGroupController.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2016 Food and Agriculture Organization of the
+ * Copyright (C) 2001-2024 Food and Agriculture Organization of the
  * United Nations (FAO-UN), United Nations World Food Programme (WFP)
  * and United Nations Environment Programme (UNEP)
  *
@@ -48,6 +48,7 @@
     "$timeout",
     "gnConfig",
     "gnConfigService",
+    "gnUtilityService",
     function (
       $scope,
       $routeParams,
@@ -56,7 +57,8 @@
       $translate,
       $timeout,
       gnConfig,
-      gnConfigService
+      gnConfigService,
+      gnUtilityService
     ) {
       $scope.searchObj = {
         params: {
@@ -146,7 +148,13 @@
       $http.get("../api/tags").then(function (response) {
         var nullTag = { id: null, name: "", label: {} };
         nullTag.label[$scope.lang] = "";
-        $scope.categories = [nullTag].concat(response.data);
+        var categoriesSorted = gnUtilityService.sortByTranslation(
+          response.data,
+          $scope.lang,
+          "name"
+        );
+
+        $scope.categories = [nullTag].concat(categoriesSorted);
       });
 
       function loadGroups() {