Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(teams): allow team admin to remove members on frontend (#4855)
Will Hutchinson0d46d6b93fb1
diff --git a/apps/web/src/features/settings/Team.tsx b/apps/web/src/features/settings/Team.tsxindex 75e15dad74..56f38fd16e 100644--- a/apps/web/src/features/settings/Team.tsx+++ b/apps/web/src/features/settings/Team.tsx@@ -65,6 +65,10 @@ import {SettingsRow,SettingsSection,} from './primitives';+import {+ canRemoveTeamMember,+ isTeamAdminOrOwner,+} from './teamMemberPermissions';import { getTeamSlugError, normalizeTeamSlugInput } from './teamSlug';function useRequiresPaidUpgrade() {@@ -303,6 +307,8 @@ function MemberRow(props: {member: TeamMember;isOwner: boolean;isCurrentUser: boolean;+ canManageRemovals: boolean;+ canRemove: boolean;onRemove: () => void;onRoleChange: (role: TeamRole) => void;}) {@@ -346,9 +352,9 @@ function MemberRow(props: {><RoleSelect value={props.member.role} onChange={props.onRoleChange} /></Show>- <Show when={props.isOwner}>+ <Show when={props.canManageRemovals}><Show- when={!props.isCurrentUser && !isMemberOwner()}+ when={props.canRemove}fallback={<Tooltiplabel={@@ -969,6 +975,15 @@ function TeamManagement(props: {);});+ const currentUserRole = createMemo(() => {+ const currentUserId = userId();+ if (!currentUserId) return undefined;++ return teamQuery.data?.members.find(+ (member) => member.user_id === currentUserId+ )?.role;+ });+ const canManageMemberRemovals = () => isTeamAdminOrOwner(currentUserRole());const isOwner = createMemo(() => {const currentUserId = userId();if (!currentUserId) return false;@@ -1253,7 +1268,7 @@ function TeamManagement(props: {<SettingsSectiontitle="Members"actions={- <Show when={isOwner()}>+ <Show when={canManageMemberRemovals()}><Buttonvariant="base"size="sm"@@ -1321,6 +1336,12 @@ function TeamManagement(props: {member={member}isOwner={isOwner()}isCurrentUser={member.user_id === userId()}+ canManageRemovals={canManageMemberRemovals()}+ canRemove={canRemoveTeamMember(+ userId(),+ currentUserRole(),+ member+ )}onRemove={() => setShowRemoveModal(member)}onRoleChange={(newRole) => {if (!props.teamId) return;diff --git a/apps/web/src/features/settings/teamMemberPermissions.test.ts b/apps/web/src/features/settings/teamMemberPermissions.test.tsnew file mode 100644index 0000000000..5e9caca40e--- /dev/null+++ b/apps/web/src/features/settings/teamMemberPermissions.test.ts@@ -0,0 +1,74 @@+import { type TeamMember, TeamRole } from '@service-auth/generated/schemas';+import { describe, expect, it } from 'vitest';+import {+ canRemoveTeamMember,+ isTeamAdminOrOwner,+} from './teamMemberPermissions.ts';++const TEAM_ID = 'team-id';+const ACTING_USER_ID = 'acting-user-id';++function teamMember(userId: string, role: TeamRole): TeamMember {+ return {+ role,+ team_id: TEAM_ID,+ user_id: userId,+ };+}++describe('isTeamAdminOrOwner', function () {+ it.each([+ [TeamRole.owner, true],+ [TeamRole.admin, true],+ [TeamRole.member, false],+ [undefined, false],+ ])('identifies the %s role as authorized: %s', function (role, expected) {+ expect(isTeamAdminOrOwner(role)).toBe(expected);+ });+});++describe('canRemoveTeamMember', function () {+ const ordinaryMember = teamMember('member-id', TeamRole.member);+ const peerAdmin = teamMember('peer-admin-id', TeamRole.admin);+ const owner = teamMember('owner-id', TeamRole.owner);++ it.each([+ [TeamRole.owner, true],+ [TeamRole.admin, true],+ [TeamRole.member, false],+ [undefined, false],+ ])('allows the %s role to remove an ordinary member: %s', function (role, expected) {+ expect(canRemoveTeamMember(ACTING_USER_ID, role, ordinaryMember)).toBe(+ expected+ );+ });++ it.each([+ TeamRole.owner,+ TeamRole.admin,+ ])('allows the %s role to remove a peer admin', function (role) {+ expect(canRemoveTeamMember(ACTING_USER_ID, role, peerAdmin)).toBe(true);+ });++ it.each([+ TeamRole.owner,+ TeamRole.admin,+ ])('prevents the %s role from removing themselves', function (role) {+ const actingMember = teamMember(ACTING_USER_ID, role);++ expect(canRemoveTeamMember(ACTING_USER_ID, role, actingMember)).toBe(false);+ });++ it.each([+ TeamRole.owner,+ TeamRole.admin,+ ])('prevents the %s role from removing the owner', function (role) {+ expect(canRemoveTeamMember(ACTING_USER_ID, role, owner)).toBe(false);+ });++ it('prevents removal when the acting user ID is unavailable', function () {+ expect(canRemoveTeamMember(undefined, TeamRole.admin, ordinaryMember)).toBe(+ false+ );+ });+});diff --git a/apps/web/src/features/settings/teamMemberPermissions.ts b/apps/web/src/features/settings/teamMemberPermissions.tsnew file mode 100644index 0000000000..24b5383fdc--- /dev/null+++ b/apps/web/src/features/settings/teamMemberPermissions.ts@@ -0,0 +1,18 @@+import { type TeamMember, TeamRole } from '@service-auth/generated/schemas';++export function isTeamAdminOrOwner(role: TeamRole | undefined): boolean {+ return role === TeamRole.admin || role === TeamRole.owner;+}++export function canRemoveTeamMember(+ actingUserId: string | undefined,+ actingRole: TeamRole | undefined,+ targetMember: TeamMember+): boolean {+ return (+ actingUserId !== undefined &&+ isTeamAdminOrOwner(actingRole) &&+ targetMember.user_id !== actingUserId &&+ targetMember.role !== TeamRole.owner+ );+}