improvements: address feedback

This commit is contained in:
Scott Wilson
2024-11-28 08:54:27 -08:00
parent 18a2547b24
commit 6c4cb5e084
4 changed files with 13 additions and 4 deletions

View File

@@ -57,7 +57,7 @@ export const OrgGroupsSection = () => {
return (
<div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
<div className="mb-4 flex justify-between">
<p className="text-xl font-semibold text-mineshaft-100">User Groups</p>
<p className="text-xl font-semibold text-mineshaft-100">Groups</p>
<OrgPermissionCan I={OrgPermissionActions.Create} a={OrgPermissionSubjects.Groups}>
{(isAllowed) => (
<Button

View File

@@ -201,6 +201,9 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
valueTwo = memberTwo.user.firstName;
}
if (!valueOne) return 1;
if (!valueTwo) return -1;
return valueOne.toLowerCase().localeCompare(valueTwo.toLowerCase());
}),
[members, search, orderDirection, orderBy]

View File

@@ -121,9 +121,12 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {
});
return (orgUsers || [])
.filter(({ user: u }) => !wsUserUsernames.has(u.username))
.map((member) => ({
value: member.id,
label: `${member.user.firstName} ${member.user.lastName}`
.map(({ id, inviteEmail, user: { firstName, lastName, email } }) => ({
value: id,
label:
firstName && lastName
? `${firstName} ${lastName}`
: firstName || lastName || email || inviteEmail
}));
}, [orgUsers, members]);

View File

@@ -118,6 +118,9 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {
valueTwo = memberTwo.user.firstName;
}
if (!valueOne) return 1;
if (!valueTwo) return -1;
return valueOne.toLowerCase().localeCompare(valueTwo.toLowerCase());
}),
[members, search, orderDirection, orderBy]