Sort groups alphabetically on the new account and report pages

GeoCat · Oct 29, 2024 · 4abd3c3 · 4abd3c3
1 parent b62e6c2
commit 4abd3c3
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 4 deletions.
diff --git a/web-ui/src/main/resources/catalog/components/utility/UtilityService.js b/web-ui/src/main/resources/catalog/components/utility/UtilityService.js
@@ -436,6 +436,22 @@
         return defer.promise;
       };
 
+      /**
+       * Sort an array of elements with translations labels, using the provided language.
+       *
+       */
+      var sortByTranslation = function (values, sortByLanguage, defaultProperty) {
+        return Object.values(
+          // Don't mutate the original array
+          values.concat().sort(function (a, b) {
+            var aValue = a.label[sortByLanguage] || a[defaultProperty];
+            var bValue = b.label[sortByLanguage] || b[defaultProperty];
+
+            return aValue.localeCompare(bValue);
+          })
+        );
+      };
+
       return {
         scrollTo: scrollTo,
         isInView: isInView,
@@ -452,7 +468,8 @@
         randomUuid: randomUuid,
         displayPermalink: displayPermalink,
         openModal: openModal,
-        goBack: goBack
+        goBack: goBack,
+        sortByTranslation: sortByTranslation
       };
     }
   ]);

diff --git a/web-ui/src/main/resources/catalog/js/LoginController.js b/web-ui/src/main/resources/catalog/js/LoginController.js
@@ -155,7 +155,11 @@
       $scope.retrieveGroups = function () {
         $http.get("../api/groups").then(
           function (response) {
-            $scope.groups = response.data;
+            $scope.groups = gnUtilityService.sortByTranslation(
+              response.data,
+              $scope.lang,
+              "name"
+            );
           },
           function (response) {}
         );

diff --git a/web-ui/src/main/resources/catalog/js/admin/ReportController.js b/web-ui/src/main/resources/catalog/js/admin/ReportController.js
@@ -36,7 +36,8 @@
     "$http",
     "$rootScope",
     "$translate",
-    function ($scope, $routeParams, $http, $rootScope, $translate) {
+    "gnUtilityService",
+    function ($scope, $routeParams, $http, $rootScope, $translate, gnUtilityService) {
       $scope.pageMenu = {
         folder: "report/",
         defaultTab: "report-updated-metadata",
@@ -150,7 +151,11 @@
         if ($scope.user.profile === "Administrator") {
           $http.get("../api/groups").then(
             function (response) {
-              $scope.groups = response.data;
+              $scope.groups = gnUtilityService.sortByTranslation(
+                response.data,
+                $scope.lang,
+                "name"
+              );
             },
             function (response) {
               // TODO
@@ -166,6 +171,12 @@
               $scope.groups = _.uniqBy(groups, function (e) {
                 return e.id;
               });
+
+              $scope.groups = gnUtilityService.sortByTranslation(
+                $scope.groups,
+                $scope.lang,
+                "name"
+              );
             },
             function (response) {
               // TODO