From e73aa469a347a19bd90e7b30c74b8dc4a86f52c9 Mon Sep 17 00:00:00 2001
From: Bryan Frimin <bryan@getprobo.com>
Date: Thu, 7 May 2026 17:06:12 +0200
Subject: [PATCH] Hide other IdP connector once one is connected

Previously the SCIM settings page rendered both Google Workspace and
Microsoft 365 connector cards even after a bridge was connected,
making it look like the other provider was still actionable. Once a
bridge exists we now only show the connector matching the bridge
type; both are still listed when nothing is configured.

Signed-off-by: Bryan Frimin <bryan@getprobo.com>
---
 .../settings/_components/ConnectorList.tsx    | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/apps/console/src/pages/iam/organizations/settings/_components/ConnectorList.tsx b/apps/console/src/pages/iam/organizations/settings/_components/ConnectorList.tsx
index 3da445f84..4d63bb2f7 100644
--- a/apps/console/src/pages/iam/organizations/settings/_components/ConnectorList.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/_components/ConnectorList.tsx
@@ -27,6 +27,9 @@ const connectorListFragment = graphql`
       oauth2Scopes
     }
     scimConfiguration {
+      bridge {
+        type
+      }
       ...GoogleWorkspaceConnectorFragment
       ...Microsoft365ConnectorFragment
     }
@@ -43,6 +46,10 @@ export function ConnectorList(props: { fKey: ConnectorListFragment$key }) {
   const microsoft365Scopes
     = data.scimBridgeTypes.find(info => info.type === "MICROSOFT_365")?.oauth2Scopes ?? [];
 
+  const bridgeType = data.scimConfiguration?.bridge?.type ?? null;
+  const showGoogleWorkspace = bridgeType === null || bridgeType === "GOOGLE_WORKSPACE";
+  const showMicrosoft365 = bridgeType === null || bridgeType === "MICROSOFT_365";
+
   return (
     <div className="space-y-4">
       <h2 className="text-base font-medium">{__("Identity Provider")}</h2>
@@ -51,14 +58,18 @@ export function ConnectorList(props: { fKey: ConnectorListFragment$key }) {
           "Connect your identity provider to automatically sync users to your organization. Once connected, you don't need to configure SCIM manually.",
         )}
       </p>
-      <GoogleWorkspaceConnector
-        fKey={data.scimConfiguration ?? null}
-        oauth2Scopes={googleWorkspaceScopes}
-      />
-      <Microsoft365Connector
-        fKey={data.scimConfiguration ?? null}
-        oauth2Scopes={microsoft365Scopes}
-      />
+      {showGoogleWorkspace && (
+        <GoogleWorkspaceConnector
+          fKey={data.scimConfiguration ?? null}
+          oauth2Scopes={googleWorkspaceScopes}
+        />
+      )}
+      {showMicrosoft365 && (
+        <Microsoft365Connector
+          fKey={data.scimConfiguration ?? null}
+          oauth2Scopes={microsoft365Scopes}
+        />
+      )}
     </div>
   );
 }