ConceptProd/ConceptPortal-public
1
0
Fork 0
mirror of https://github.com/IRBorisov/ConceptPortal.git synced 2025-06-26 04:50:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix users order

Browse Source
This commit is contained in:
IRBorisov 2024-05-27 20:57:17 +03:00
parent 18beffb1d9
commit 898d6fb7fc
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rsconcept/frontend/src/context/UsersContext.tsx
View File

@ -41,7 +41,7 @@ export const UsersState = ({ children }: UsersStateProps) => {
if (!hasFirstName) {
return user.last_name;
}
return user.first_name + ' ' + user.last_name;
return user.last_name + ' ' + user.first_name;
}
return `Аноним ${userID}`;
}
@ -52,6 +52,25 @@ export const UsersState = ({ children }: UsersStateProps) => {
showError: true,
onError: () => setUsers([]),
onSuccess: newData => {
newData.sort((a, b) => {
if (a.last_name === '') {
if (b.last_name === '') {
return a.id - b.id;
} else {
return 1;
}
} else if (b.last_name === '') {
if (a.last_name === '') {
return a.id - b.id;
} else {
return -1;
}
} else if (a.last_name !== b.last_name) {
return a.last_name.localeCompare(b.last_name);
} else {
return a.first_name.localeCompare(b.first_name);
}
});
setUsers(newData);
if (callback) callback();
}