From 80be22fe8a5502825ccc154c766bfcb2e4245671 Mon Sep 17 00:00:00 2001 From: Bryan Frimin Date: Thu, 28 May 2026 09:46:10 -0700 Subject: [PATCH] Show SCIM error message Signed-off-by: Bryan Frimin --- .../_components/GoogleWorkspaceConnector.tsx | 22 ++++++++++++------- .../_components/Microsoft365Connector.tsx | 22 ++++++++++++------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/apps/console/src/pages/iam/organizations/settings/_components/GoogleWorkspaceConnector.tsx b/apps/console/src/pages/iam/organizations/settings/_components/GoogleWorkspaceConnector.tsx index 06d8b77e9..265749986 100644 --- a/apps/console/src/pages/iam/organizations/settings/_components/GoogleWorkspaceConnector.tsx +++ b/apps/console/src/pages/iam/organizations/settings/_components/GoogleWorkspaceConnector.tsx @@ -91,17 +91,21 @@ export function GoogleWorkspaceConnector(props: { const bridgeState = bridge?.state ?? null; const latestBridgeError = bridge?.syncError ?? null; const isBridgeFailed = bridgeState === "FAILED"; + const isBridgeDisabled = bridgeState === "DISABLED"; + const hasBridgeError = isBridgeFailed || isBridgeDisabled; const isBridgePending = bridgeState === "PENDING"; - const bridgeStatusBadgeVariant = isBridgeFailed + const bridgeStatusBadgeVariant = hasBridgeError ? "danger" : isBridgePending ? "warning" : "success"; - const bridgeStatusLabel = isBridgeFailed - ? __("Error") - : isBridgePending - ? __("Syncing") - : __("Connected"); + const bridgeStatusLabel = isBridgeDisabled + ? __("Disabled") + : isBridgeFailed + ? __("Error") + : isBridgePending + ? __("Syncing") + : __("Connected"); const bridgeErrorMessage = latestBridgeError ?? __( "The bridge is currently failing to sync. Check the provisioning event history for more details.", @@ -360,12 +364,14 @@ export function GoogleWorkspaceConnector(props: { - {isBridgeFailed && ( + {hasBridgeError && (

- {__("Bridge is in an error state")} + {isBridgeDisabled + ? __("Bridge is disabled") + : __("Bridge is in an error state")}

{bridgeErrorMessage} diff --git a/apps/console/src/pages/iam/organizations/settings/_components/Microsoft365Connector.tsx b/apps/console/src/pages/iam/organizations/settings/_components/Microsoft365Connector.tsx index 84d6f5852..79a640207 100644 --- a/apps/console/src/pages/iam/organizations/settings/_components/Microsoft365Connector.tsx +++ b/apps/console/src/pages/iam/organizations/settings/_components/Microsoft365Connector.tsx @@ -91,17 +91,21 @@ export function Microsoft365Connector(props: { const bridgeState = bridge?.state ?? null; const latestBridgeError = bridge?.syncError ?? null; const isBridgeFailed = bridgeState === "FAILED"; + const isBridgeDisabled = bridgeState === "DISABLED"; + const hasBridgeError = isBridgeFailed || isBridgeDisabled; const isBridgePending = bridgeState === "PENDING"; - const bridgeStatusBadgeVariant = isBridgeFailed + const bridgeStatusBadgeVariant = hasBridgeError ? "danger" : isBridgePending ? "warning" : "success"; - const bridgeStatusLabel = isBridgeFailed - ? __("Error") - : isBridgePending - ? __("Syncing") - : __("Connected"); + const bridgeStatusLabel = isBridgeDisabled + ? __("Disabled") + : isBridgeFailed + ? __("Error") + : isBridgePending + ? __("Syncing") + : __("Connected"); const bridgeErrorMessage = latestBridgeError ?? __( "The bridge is currently failing to sync. Check the provisioning event history for more details.", @@ -358,12 +362,14 @@ export function Microsoft365Connector(props: {

- {isBridgeFailed && ( + {hasBridgeError && (

- {__("Bridge is in an error state")} + {isBridgeDisabled + ? __("Bridge is disabled") + : __("Bridge is in an error state")}

{bridgeErrorMessage}