feat(MED-171): move sorting to loader to fix warning
This commit is contained in:
@@ -63,7 +63,20 @@ async function loadAccountMembers(
|
|||||||
throw error;
|
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(
|
export async function loadAccountMembersBenefitsUsage(
|
||||||
|
|||||||
@@ -83,10 +83,10 @@ export function AccountMembersTable({
|
|||||||
membersBenefitsUsage,
|
membersBenefitsUsage,
|
||||||
});
|
});
|
||||||
|
|
||||||
const filteredMembers = members
|
|
||||||
.filter((member) => {
|
|
||||||
const searchString = search.toLowerCase();
|
const searchString = search.toLowerCase();
|
||||||
|
const filteredMembers = searchString.length > 0
|
||||||
|
? members
|
||||||
|
.filter((member) => {
|
||||||
const displayName = (
|
const displayName = (
|
||||||
member.name ??
|
member.name ??
|
||||||
member.email.split('@')[0] ??
|
member.email.split('@')[0] ??
|
||||||
@@ -99,17 +99,7 @@ export function AccountMembersTable({
|
|||||||
(member.personal_code || '').includes(searchString)
|
(member.personal_code || '').includes(searchString)
|
||||||
);
|
);
|
||||||
})
|
})
|
||||||
.sort((prev, next) => {
|
: members;
|
||||||
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 (
|
return (
|
||||||
<div className={'flex flex-col space-y-2'}>
|
<div className={'flex flex-col space-y-2'}>
|
||||||
@@ -265,7 +255,7 @@ function useGetColumns(
|
|||||||
),
|
),
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
[t, params, permissions],
|
[t, params, permissions, language],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user