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

M: Sort users in select user component

Browse Source
This commit is contained in:
Ivan 2025-04-07 21:43:49 +03:00
parent f329496679
commit 74edb2b757
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rsconcept/frontend/src/features/users/components/select-user.tsx
View File

@ -5,6 +5,7 @@ import clsx from 'clsx';
import { SelectSingle } from '@/components/input';
import { type Styling } from '@/components/props';
import { type IUserInfo } from '../backend/types';
import { useLabelUser } from '../backend/use-label-user';
import { useUsers } from '../backend/use-users';
import { matchUser } from '../models/user-api';
@ -18,6 +19,19 @@ interface SelectUserProps extends Styling {
noBorder?: boolean;
}
function compareUsers(a: IUserInfo, b: IUserInfo) {
if (!a.last_name && !!b.last_name) {
return 1;
} else if (!!a.last_name && !b.last_name) {
return -1;
} else if (a.last_name !== b.last_name) {
return a.last_name.localeCompare(b.last_name);
} else if (a.first_name !== b.first_name) {
return a.first_name.localeCompare(b.first_name);
}
return a.id - b.id;
}
export function SelectUser({
className,
filter,
@ -30,7 +44,11 @@ export function SelectUser({
const getUserLabel = useLabelUser();
const items = filter ? users.filter(user => filter(user.id)) : users;
const options = items.map(user => ({
const sorted = [
...items.filter(user => !!user.first_name || !!user.last_name).sort(compareUsers),
...items.filter(user => !user.first_name && !user.last_name)
];
const options = sorted.map(user => ({
value: user.id,
label: getUserLabel(user.id)
}));