Skip to content

fix(integrations): show disabled role combobox for readonly members #3921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
waleedlatif1 merged 1 commit into from
Apr 3, 2026
Merged

fix(integrations): show disabled role combobox for readonly members #3921

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 27 additions & 38 deletions ...sim/app/workspace/[workspaceId]/settings/components/integrations/integrations-manager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ const roleOptions = [
{ value: 'admin', label: 'Admin' },
] as const

const roleComboOptions = roleOptions.map((option) => ({ value: option.value, label: option.label }))

export function IntegrationsManager() {
const params = useParams()
const workspaceId = (params?.workspaceId as string) || ''
Expand Down Expand Up @@ -1315,42 +1317,32 @@ export function IntegrationsManager() {
</div>
</div>

<Combobox
options={roleComboOptions}
value={
roleOptions.find((option) => option.value === member.role)?.label || ''
}
selectedValue={member.role}
onChange={(value) =>
handleChangeMemberRole(member.userId, value as WorkspaceCredentialRole)
}
placeholder='Role'
disabled={
!isSelectedAdmin || (member.role === 'admin' && adminMemberCount <= 1)
}
size='sm'
/>
{isSelectedAdmin ? (
<>
<Combobox
options={roleOptions.map((option) => ({
value: option.value,
label: option.label,
}))}
value={
roleOptions.find((option) => option.value === member.role)?.label ||
''
}
selectedValue={member.role}
onChange={(value) =>
handleChangeMemberRole(
member.userId,
value as WorkspaceCredentialRole
)
}
placeholder='Role'
disabled={member.role === 'admin' && adminMemberCount <= 1}
size='sm'
/>
<Button
variant='ghost'
onClick={() => handleRemoveMember(member.userId)}
disabled={member.role === 'admin' && adminMemberCount <= 1}
className='w-full justify-end'
>
Remove
</Button>
</>
<Button
variant='ghost'
onClick={() => handleRemoveMember(member.userId)}
disabled={member.role === 'admin' && adminMemberCount <= 1}
className='w-full justify-end'
>
Remove
</Button>
) : (
<>
<Badge variant='gray-secondary'>{member.role}</Badge>
<div />
</>
<div />
)}
</div>
))}
Expand All @@ -1370,10 +1362,7 @@ export function IntegrationsManager() {
size='sm'
/>
<Combobox
options={roleOptions.map((option) => ({
value: option.value,
label: option.label,
}))}
options={roleComboOptions}
value={
roleOptions.find((option) => option.value === memberRole)?.label || ''
}
Expand Down
Loading