Skip to content

Commit 3d44b86

Browse files
authored
fix: SCIM UI tweaks (#8360)
1 parent 47b8c12 commit 3d44b86

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

packages/web/app/src/components/organization/members/list.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,8 @@ const OrganizationMemberRow = memo(function OrganizationMemberRow(props: {
276276
<tr key={member.id} className={cn(member.user.provisionInfo?.isDisabled && 'bg-red-800/5')}>
277277
<td className="w-12 pl-2">
278278
<div>
279-
{member.user.provisionInfo?.isDisabled ? (
279+
{member.user.provisionInfo?.provisioningStatus ===
280+
GraphQLSchema.ProvisioningStatus.Active && member.user.provisionInfo?.isDisabled ? (
280281
<div className="flex h-9 w-9 items-center justify-center rounded-full bg-red-800/10">
281282
<UserRoundX className="mx-auto size-5 text-red-800" />
282283
</div>

packages/web/app/src/components/organization/settings/single-sign-on/oidc-integration-configuration.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,14 @@ function OIDCAccessSettings(props: {
747747
{organization.viewerCanManageSCIM ? (
748748
<AlertDialog>
749749
<AlertDialogTrigger asChild>
750-
<Card variant={isSCIMProvisioningEnabled ? 'selected' : 'selectable'}>
750+
<Card
751+
variant={isSCIMProvisioningEnabled ? 'selected' : 'selectable'}
752+
onClick={ev => {
753+
if (isSCIMProvisioningEnabled) {
754+
ev.preventDefault();
755+
}
756+
}}
757+
>
751758
<CardContent variant="selection">
752759
<RadioGroupItem value="scim" id="scim-mode" className="mt-0.5" />
753760
<div className="flex-1">

0 commit comments

Comments
 (0)