feat(MED-171): move sorting to loader to fix warning

This commit is contained in:
Karli
2025-10-01 01:47:49 +03:00
parent aec736af3d
commit b4ab02b4ef
2 changed files with 31 additions and 28 deletions

View File

@@ -63,7 +63,20 @@ async function loadAccountMembers(
throw error;
}
return data ?? [];
const members = data ?? [];
return members
.sort((prev, next) => {
if (prev.primary_owner_user_id === prev.user_id) {
return -1;
}
if (prev.role_hierarchy_level < next.role_hierarchy_level) {
return -1;
}
return 1;
});
}
export async function loadAccountMembersBenefitsUsage(

View File

@@ -83,33 +83,23 @@ export function AccountMembersTable({
membersBenefitsUsage,
});
const filteredMembers = members
.filter((member) => {
const searchString = search.toLowerCase();
const searchString = search.toLowerCase();
const filteredMembers = searchString.length > 0
? members
.filter((member) => {
const displayName = (
member.name ??
member.email.split('@')[0] ??
''
).toLowerCase();
const displayName = (
member.name ??
member.email.split('@')[0] ??
''
).toLowerCase();
return (
displayName.includes(searchString) ||
member.role.toLowerCase().includes(searchString) ||
(member.personal_code || '').includes(searchString)
);
})
.sort((prev, next) => {
if (prev.primary_owner_user_id === prev.user_id) {
return -1;
}
if (prev.role_hierarchy_level < next.role_hierarchy_level) {
return -1;
}
return 1;
});
return (
displayName.includes(searchString) ||
member.role.toLowerCase().includes(searchString) ||
(member.personal_code || '').includes(searchString)
);
})
: members;
return (
<div className={'flex flex-col space-y-2'}>
@@ -265,7 +255,7 @@ function useGetColumns(
),
},
],
[t, params, permissions],
[t, params, permissions, language],
);
}