Admin Tools: Fix sorting

services/web/modules/admin-tools/app/src/ProjectListController.mjs

@@ -111,16 +111,23 @@ function _applyFilters(projects,  filters) {
 
 function _sortAndPaginate(projects, sort, page) {
   if (
-    (sort.by && !['lastUpdated', 'title', 'deletedAt'].includes(sort.by)) ||
+    (sort.by && !['lastUpdated', 'title', 'deletedAt', 'owner'].includes(sort.by)) ||
     (sort.order && !['asc', 'desc'].includes(sort.order))
   ) {
     throw new OError('Invalid sorting criteria', { sort })
   }
-  const sortedProjects = _.orderBy(
-    projects,
-    [sort.by || 'lastUpdated'],
-    [sort.order || 'desc']
-  )
+
+// sorting by owner is not implemented, it is mot needed
+  const sortedProjects =
+    sort.by === 'title'
+      ? [...projects].sort((a, b) =>
+          (a.name ?? '\uffff').localeCompare(b.name ?? '\uffff')
+        )
+      : _.orderBy(
+          projects,
+          [sort.by || 'lastUpdated'],
+          [sort.order || 'desc']
+        )
   return sortedProjects
 }
 

services/web/modules/admin-tools/app/src/UserListController.mjs

@@ -266,11 +266,23 @@ function _sortAndPaginate(users, sort, page) {
     throw new OError('Invalid sorting criteria', { sort })
   }
 
-  const sortedUsers = _.orderBy(
-    users,
-    [sort.by || 'signUpDate'],
-    [sort.order || 'desc']
-  )
+  const LAST = '\uffff'
+  const sortedUsers =
+    sort.by === 'name'
+      ? [...users].sort((a, b) =>
+          (a.lastName ?? LAST).localeCompare(b.lastName ?? LAST, undefined, { sensitivity: 'base' }) ||
+          (a.firstName ?? LAST).localeCompare(b.firstName ?? LAST, undefined, { sensitivity: 'base' }) ||
+          (a.email ?? LAST).localeCompare(b.email ?? LAST, undefined, { sensitivity: 'base' })
+        )
+      : _.orderBy(
+          users,
+          [u => {
+            const key = sort.by || 'signUpDate'
+            const value = u[key]
+            return typeof value === 'string' ? (value ?? LAST).toLowerCase() : value
+          }],
+          [sort.order || 'desc']
+        )
   return sortedUsers
 }