Skip to content

Commit 90acd3b

Browse files
committed
fix(admin): surface ban and role change errors inside the confirm modal
1 parent b95a1c5 commit 90acd3b

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

  • apps/sim/app/workspace/[workspaceId]/settings/components/admin

apps/sim/app/workspace/[workspaceId]/settings/components/admin/admin.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
Chip,
88
ChipConfirmModal,
99
ChipInput,
10+
ChipModalError,
1011
ChipModalField,
1112
ChipSelect,
1213
Label,
@@ -269,7 +270,10 @@ export function Admin() {
269270
},
270271
{
271272
label: u.role === 'admin' ? 'Demote' : 'Promote',
272-
onSelect: () => setPendingAction({ type: 'role', user: u }),
273+
onSelect: () => {
274+
setUserRole.reset()
275+
setPendingAction({ type: 'role', user: u })
276+
},
273277
disabled: pendingUserIds.has(u.id),
274278
},
275279
u.banned
@@ -527,6 +531,7 @@ export function Admin() {
527531
placeholder='Optional'
528532
disabled={banUser.isPending}
529533
/>
534+
<ChipModalError>{banUser.error?.message}</ChipModalError>
530535
</ChipConfirmModal>
531536

532537
<ChipConfirmModal
@@ -553,7 +558,9 @@ export function Admin() {
553558
pending: setUserRole.isPending,
554559
pendingLabel: isDemotion ? 'Demoting...' : 'Promoting...',
555560
}}
556-
/>
561+
>
562+
<ChipModalError>{setUserRole.error?.message}</ChipModalError>
563+
</ChipConfirmModal>
557564

558565
<AddUserModal
559566
open={isAddUserOpen}

0 commit comments

Comments
 (0)