Sort categories list by translation in the categories and groups pages

GeoCat · Jan 30, 2025 · 25ec5eb · 25ec5eb
1 parent d1c1c4a
commit 25ec5eb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 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 };
 
@@ -138,7 +147,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
@@ -53,6 +53,7 @@
     "gnConfig",
     "gnConfigService",
     "gnAuditableService",
+    "gnUtilityService",
     function (
       $scope,
       $routeParams,
@@ -63,7 +64,8 @@
       $log,
       gnConfig,
       gnConfigService,
-      gnAuditableService
+      gnAuditableService,
+      gnUtilityService
     ) {
       $scope.searchObj = {
         params: {
@@ -156,7 +158,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() {