From 632675079028292b148d2f433ebabf4f675c3a26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20Gabri=C3=ABl?= <michel.gabriel@geocat.net>
Date: Thu, 12 Oct 2023 15:04:33 +0200
Subject: [PATCH] Sort the portals by label, not by name (identifier) (#7424)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Sort the portals by label, not by name

* Main sort portal by label update (#13)

* Remove old password field for admins (#7417)

Using an administrator user, the old password field can be left empty.
Removing it as it's not required when and admin reset the password of other user.

* Portal switcher - update label by language sorting

* Revert the changes to `users.html`

---------

Co-authored-by: Jose García <josegar74@gmail.com>
---
 .../catalog/components/usersearches/UserSearchesDirective.js  | 4 ++++
 .../components/usersearches/partials/portalswitcher.html      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/web-ui/src/main/resources/catalog/components/usersearches/UserSearchesDirective.js b/web-ui/src/main/resources/catalog/components/usersearches/UserSearchesDirective.js
index 938e8c3837..32377f5866 100644
--- a/web-ui/src/main/resources/catalog/components/usersearches/UserSearchesDirective.js
+++ b/web-ui/src/main/resources/catalog/components/usersearches/UserSearchesDirective.js
@@ -49,6 +49,10 @@
           if (scope.showPortalSwitcher) {
             getPortals();
           }
+
+          scope.sortByLabel = function (portal) {
+            return portal.label[scope.lang];
+          };
         }
       };
     }
diff --git a/web-ui/src/main/resources/catalog/components/usersearches/partials/portalswitcher.html b/web-ui/src/main/resources/catalog/components/usersearches/partials/portalswitcher.html
index 76c65de059..f092eae093 100644
--- a/web-ui/src/main/resources/catalog/components/usersearches/partials/portalswitcher.html
+++ b/web-ui/src/main/resources/catalog/components/usersearches/partials/portalswitcher.html
@@ -39,7 +39,7 @@
     <li
       class="gn-menuitem-xs"
       role="menuitem"
-      data-ng-repeat="p in portals | filter: {listableInHeaderSelector: true} |orderBy:'name'"
+      data-ng-repeat="p in portals | filter: {listableInHeaderSelector: true} |orderBy:sortByLabel"
     >
       <a href="../../{{p.uuid}}/{{lang}}/catalog.search">
         <img