add typegen and minor style fixes

This commit is contained in:
Danel Kungla
2025-10-03 12:38:10 +03:00
parent 98896fe6de
commit 70c74568be
4 changed files with 46 additions and 52 deletions

View File

@@ -84,22 +84,22 @@ export function AccountMembersTable({
});
const searchString = search.toLowerCase();
const filteredMembers = searchString.length > 0
? members
.filter((member) => {
const displayName = (
member.name ??
member.email.split('@')[0] ??
''
).toLowerCase();
const filteredMembers =
searchString.length > 0
? members.filter((member) => {
const displayName = (
member.name ??
member.email.split('@')[0] ??
''
).toLowerCase();
return (
displayName.includes(searchString) ||
member.role.toLowerCase().includes(searchString) ||
(member.personal_code || '').includes(searchString)
);
})
: members;
return (
displayName.includes(searchString) ||
member.role.toLowerCase().includes(searchString) ||
(member.personal_code || '').includes(searchString)
);
})
: members;
return (
<div className={'flex flex-col space-y-2'}>
@@ -221,16 +221,6 @@ function useGetColumns(
}
>
<RoleBadge role={role} />
<If condition={isPrimaryOwner}>
<span
className={
'rounded-md bg-yellow-400 px-2.5 py-1 text-xs font-medium dark:text-black'
}
>
{t('primaryOwnerLabel')}
</span>
</If>
</span>
);
},

View File

@@ -6,22 +6,25 @@ import { Trans } from '@kit/ui/trans';
type Role = string;
const roles = {
owner: '',
owner: 'bg-yellow-400 text-black',
member:
'bg-blue-50 hover:bg-blue-50 text-blue-500 dark:bg-blue-500/10 dark:hover:bg-blue-500/10',
'bg-blue-50 text-blue-500 dark:bg-blue-500/10 dark:hover:bg-blue-500/10',
};
const roleClassNameBuilder = cva('font-medium capitalize shadow-none', {
variants: {
role: roles,
const roleClassNameBuilder = cva(
'px-2.5 py-1 font-medium capitalize shadow-none',
{
variants: {
role: roles,
},
},
});
);
export function RoleBadge({ role }: { role: Role }) {
// @ts-expect-error: hard to type this since users can add custom roles
const className = roleClassNameBuilder({ role });
const isCustom = !(role in roles);
console.log('role', role);
return (
<Badge className={className} variant={isCustom ? 'outline' : 'default'}>
<span data-test={'member-role-badge'}>