From 7d95fba4fd54f9ed8a8f239c0d1659e69b25a78a Mon Sep 17 00:00:00 2001
From: Andreas Kienle <andreas.kienle@sap.com>
Date: Tue, 8 Jul 2025 11:39:42 +0200
Subject: [PATCH 1/2] disable connection to unsupported IdP

---
 public/locales/en.json                         | 4 +++-
 src/components/ControlPlanes/ConnectButton.tsx | 9 ++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/public/locales/en.json b/public/locales/en.json
index f1a83b47..ac53ae2c 100644
--- a/public/locales/en.json
+++ b/public/locales/en.json
@@ -58,7 +58,9 @@
     "emptyListSubtitleMessage": "Create a workspace to get started"
   },
   "ConnectButton": {
-    "buttonText": "Connect"
+    "buttonText": "Connect",
+    "defaultIdP": "default IdP",
+    "unsupportedIdP": "non-default IdP not supported"
   },
   "MCPHealthPopoverButton": {
     "statusHeader": "Status",
diff --git a/src/components/ControlPlanes/ConnectButton.tsx b/src/components/ControlPlanes/ConnectButton.tsx
index c8f82006..df98e3fc 100644
--- a/src/components/ControlPlanes/ConnectButton.tsx
+++ b/src/components/ControlPlanes/ConnectButton.tsx
@@ -102,9 +102,12 @@ export default function ConnectButton(props: Props) {
             data-target={`/mcp/projects/${props.projectName}/workspaces/${extractWorkspaceNameFromNamespace(
               props.workspaceName,
             )}/mcps/${props.controlPlaneName}/context/${context.name}`}
-            additionalText={
-              currentContext === context.name ? '(default IdP)' : undefined
-            }
+            additionalText={`(${
+              currentContext === context.name
+                ? t('ConnectButton.defaultIdP')
+                : t('ConnectButton.unsupportedIdP')
+            })`}
+            disabled={currentContext !== context.name}
           />
         ))}
         <MenuItem

From 68ef132ba440431ec09b8cca81ee38bee0e6ed6a Mon Sep 17 00:00:00 2001
From: Andreas Kienle <andreas.kienle@sap.com>
Date: Thu, 10 Jul 2025 13:15:16 +0200
Subject: [PATCH 2/2] adjust connect button enablement

---
 .../ControlPlanes/ConnectButton.tsx           |  4 +--
 .../ControlPlaneCard/ControlPlaneCard.tsx     | 35 +++++++++++++++++--
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/components/ControlPlanes/ConnectButton.tsx b/src/components/ControlPlanes/ConnectButton.tsx
index df98e3fc..a4f5f4f5 100644
--- a/src/components/ControlPlanes/ConnectButton.tsx
+++ b/src/components/ControlPlanes/ConnectButton.tsx
@@ -103,11 +103,11 @@ export default function ConnectButton(props: Props) {
               props.workspaceName,
             )}/mcps/${props.controlPlaneName}/context/${context.name}`}
             additionalText={`(${
-              currentContext === context.name
+              context.context.user === 'openmcp'
                 ? t('ConnectButton.defaultIdP')
                 : t('ConnectButton.unsupportedIdP')
             })`}
-            disabled={currentContext !== context.name}
+            disabled={context.context.user !== 'openmcp'}
           />
         ))}
         <MenuItem
diff --git a/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.tsx b/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.tsx
index 36cb4c18..1b8ed108 100644
--- a/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.tsx
+++ b/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.tsx
@@ -17,7 +17,9 @@ import {
   ReadyStatus,
 } from '../../../lib/api/types/crate/controlPlanes.ts';
 import { ListWorkspacesType } from '../../../lib/api/types/crate/listWorkspaces.ts';
-import { useApiResourceMutation } from '../../../lib/api/useApiResource.ts';
+import useResource, {
+  useApiResourceMutation,
+} from '../../../lib/api/useApiResource.ts';
 import {
   DeleteMCPResource,
   DeleteMCPType,
@@ -28,6 +30,8 @@ import {
 import { YamlViewButtonWithLoader } from '../../Yaml/YamlViewButtonWithLoader.tsx';
 import { useToast } from '../../../context/ToastContext.tsx';
 import { canConnectToMCP } from '../controlPlanes.ts';
+import { ResourceObject } from '../../../lib/api/types/crate/resourceObject.ts';
+import { Infobox } from '../../Ui/Infobox/Infobox.tsx';
 
 interface Props {
   controlPlane: ListControlPlanesType;
@@ -60,7 +64,29 @@ export function ControlPlaneCard({
   const name = controlPlane.metadata.name;
   const namespace = controlPlane.metadata.namespace;
 
-  const isConnectButtonEnabled = canConnectToMCP(controlPlane);
+  // Disable the Connect button if the system IdP is disabled
+  const controlPlaneConfig = useResource(
+    ResourceObject(
+      controlPlane.metadata.namespace,
+      'managedcontrolplanes',
+      controlPlane.metadata.name,
+    ),
+    undefined,
+    true,
+  );
+
+  const isSystemIdentityProviderEnabled =
+    // @ts-ignore
+    !!controlPlaneConfig.data?.spec?.authentication
+      ?.enableSystemIdentityProvider;
+
+  const isConnectButtonEnabled =
+    canConnectToMCP(controlPlane) &&
+    isSystemIdentityProviderEnabled &&
+    !controlPlaneConfig.isLoading;
+
+  const showWarningBecauseOfDisabledSystemIdentityProvider =
+    !controlPlaneConfig.isLoading && !isSystemIdentityProviderEnabled;
 
   return (
     <>
@@ -108,6 +134,11 @@ export function ControlPlaneCard({
                   resourceName={controlPlane.metadata.name}
                   resourceType={'managedcontrolplanes'}
                 />
+                {showWarningBecauseOfDisabledSystemIdentityProvider && (
+                  <Infobox size="sm" variant="warning">
+                    {t('ConnectButton.unsupportedIdP')}
+                  </Infobox>
+                )}
                 <ConnectButton
                   disabled={!isConnectButtonEnabled}
                   controlPlaneName={name}