agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-14 22:23:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Admin Tools: Fix user name

Browse Source 
fix user name is not updated

fix first_name/last_name is undefined
This commit is contained in:
yu-i-i
2026-09-22 02:41:38 +02:00
parent 7a671ab244
commit 9f29a11826
3 changed files with 54 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/modules/admin-tools/frontend/js/project-list/util/sort-projects.ts
+13 -4
View File
@@ -7,6 +7,15 @@ const order = (order: SortingOrder, projects: Project[]) => {
return order === 'asc' ? [...projects] : projects.reverse()
}
function cmp(a, b) {
const aEmpty = a == null || a === ""
const bEmpty = b == null || b === ""
if (aEmpty && bEmpty) return Compare.SORT_KEEP_ORDER
if (aEmpty) return Compare.SORT_A_AFTER_B
if (bEmpty) return Compare.SORT_A_BEFORE_B
return a.localeCompare(b)
}
export const ownerNameComparator =
(getUserById: (userId: string) => User | null) =>
(v1: Project, v2: Project) => {
@@ -26,11 +35,11 @@ export const ownerNameComparator =
return Compare.SORT_A_BEFORE_B
}
const lastNameCmp = user1.lastName.localeCompare(user2.lastName)
if (lastNameCmp !== 0) return lastNameCmp
const lastNameCmp = cmp(user1.lastName, user2.lastName)
if (lastNameCmp !== Compare.SORT_KEEP_ORDER) return lastNameCmp
const firstNameCmp = user1.firstName.localeCompare(user2.firstName)
if (firstNameCmp !== 0) return firstNameCmp
const firstNameCmp = cmp(user1.firstName, user2.firstName)
if (firstNameCmp !== Compare.SORT_KEEP_ORDER) return firstNameCmp
return v1.lastUpdated < v2.lastUpdated
? Compare.SORT_A_BEFORE_B
services/web/modules/admin-tools/frontend/js/user-list/util/sort-users.ts
+5 -5
View File
@@ -6,18 +6,18 @@ const order = (order: SortingOrder, users: User[]) => {
return order === 'asc' ? [...users] : users.reverse()
}
function cmp(a, b) {
const aEmpty = (a === "")
const bEmpty = (b === "")
const aEmpty = a == null || a === ""
const bEmpty = b == null || b === ""
if (aEmpty && bEmpty) return Compare.SORT_KEEP_ORDER
if (aEmpty !== bEmpty) return aEmpty ? Compare.SORT_A_AFTER_B : Compare.SORT_A_BEFORE_B
if (aEmpty) return Compare.SORT_A_AFTER_B
if (bEmpty) return Compare.SORT_A_BEFORE_B
return a.localeCompare(b)
}
export const userNameComparator = (v1: User, v2: User) => {
const res = cmp(v1.lastName, v2.lastName)
if (res !== 0) return res
if (res !== Compare.SORT_KEEP_ORDER) return res
return cmp(v1.firstName, v2.firstName)
}