From 340148b100bf9432ed468ba689cab975fb4fde21 Mon Sep 17 00:00:00 2001
From: Andreas Kienle <andreas.kienle@sap.com>
Date: Fri, 31 Oct 2025 11:25:39 +0100
Subject: [PATCH 1/3] test: added tests for mcp and workspace deletion

---
 .../ControlPlaneCard/ControlPlaneCard.cy.tsx  |  54 +++++++
 .../ControlPlaneCard/ControlPlaneCard.tsx     |  33 ++--
 .../ControlPlaneCard/ControlPlaneCardMenu.tsx |   8 +-
 .../ControlPlanes/ControlPlanesListMenu.tsx   |   2 +-
 .../ControlPlaneListWorkspaceGridTile.cy.tsx  | 144 ++++++++++++++++++
 .../ControlPlaneListWorkspaceGridTile.tsx     |  15 +-
 .../useDeleteManagedControlPlane.spec.ts      |  88 +++++++++++
 src/hooks/useDeleteManagedControlPlane.ts     |  27 ++++
 src/hooks/useDeleteWorkspace.ts               |   3 +-
 src/hooks/useManagedControlPlanesQuery.ts     |  16 ++
 10 files changed, 358 insertions(+), 32 deletions(-)
 create mode 100644 src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.cy.tsx
 create mode 100644 src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.cy.tsx
 create mode 100644 src/hooks/useDeleteManagedControlPlane.spec.ts
 create mode 100644 src/hooks/useDeleteManagedControlPlane.ts
 create mode 100644 src/hooks/useManagedControlPlanesQuery.ts

diff --git a/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.cy.tsx b/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.cy.tsx
new file mode 100644
index 00000000..8763a43e
--- /dev/null
+++ b/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.cy.tsx
@@ -0,0 +1,54 @@
+import { SplitterProvider } from '../../Splitter/SplitterContext.tsx';
+import { ListControlPlanesType } from '../../../lib/api/types/crate/controlPlanes.ts';
+import { MemoryRouter } from 'react-router-dom';
+import '@ui5/webcomponents-cypress-commands';
+import { ControlPlaneCard } from './ControlPlaneCard.tsx';
+import { useDeleteManagedControlPlane } from '../../../hooks/useDeleteManagedControlPlane.ts';
+import { ListWorkspacesType } from '../../../lib/api/types/crate/listWorkspaces.ts';
+
+describe('ControlPlaneCard', () => {
+  let deleteManagedControlPlaneCalled = false;
+  const fakeUseDeleteManagedControlPlane: typeof useDeleteManagedControlPlane = () => ({
+    deleteManagedControlPlane: async (): Promise<void> => {
+      deleteManagedControlPlaneCalled = true;
+    },
+  });
+
+  beforeEach(() => {
+    deleteManagedControlPlaneCalled = false;
+  });
+
+  it('deletes the workspace', () => {
+    const managedControlPlane: ListControlPlanesType = {
+      metadata: {
+        name: 'mcp-name',
+      },
+    } as unknown as ListControlPlanesType;
+
+    const workspace: ListWorkspacesType = {
+      metadata: {
+        name: 'workspaceName',
+      },
+    } as unknown as ListWorkspacesType;
+
+    cy.mount(
+      <MemoryRouter>
+        <SplitterProvider>
+          <ControlPlaneCard
+            controlPlane={managedControlPlane}
+            workspace={workspace}
+            projectName="projectName"
+            useDeleteManagedControlPlane={fakeUseDeleteManagedControlPlane}
+          />
+        </SplitterProvider>
+      </MemoryRouter>,
+    );
+
+    cy.get("[data-testid='ControlPlaneCardMenu-opener']").click();
+    cy.contains('Delete ManagedControlPlane').click({ force: true });
+    cy.get('ui5-dialog[open]').find('ui5-input').typeIntoUi5Input('mcp-name');
+    cy.then(() => cy.wrap(deleteManagedControlPlaneCalled).should('equal', false));
+    cy.get('ui5-dialog[open]').find('ui5-button').contains('Delete').click();
+    cy.then(() => cy.wrap(deleteManagedControlPlaneCalled).should('equal', true));
+  });
+});
diff --git a/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.tsx b/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.tsx
index 22dab2d5..0a9e11e0 100644
--- a/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.tsx
+++ b/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.tsx
@@ -14,16 +14,7 @@ import styles from './ControlPlaneCard.module.css';
 import { KubectlDeleteMcp } from '../../Dialogs/KubectlCommandInfo/Controllers/KubectlDeleteMcp.tsx';
 import { ListControlPlanesType, 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 {
-  DeleteMCPResource,
-  DeleteMCPType,
-  PatchMCPResourceForDeletion,
-  PatchMCPResourceForDeletionBody,
-} from '../../../lib/api/types/crate/deleteMCP.ts';
-
 import { YamlViewButton } from '../../Yaml/YamlViewButton.tsx';
-import { useToast } from '../../../context/ToastContext.tsx';
 import { canConnectToMCP } from '../controlPlanes.ts';
 
 import { Infobox } from '../../Ui/Infobox/Infobox.tsx';
@@ -31,20 +22,26 @@ import { Infobox } from '../../Ui/Infobox/Infobox.tsx';
 import { ControlPlaneCardMenu } from './ControlPlaneCardMenu.tsx';
 import { EditManagedControlPlaneWizardDataLoader } from '../../Wizards/CreateManagedControlPlane/EditManagedControlPlaneWizardDataLoader.tsx';
 import { DISPLAY_NAME_ANNOTATION } from '../../../lib/api/types/shared/keyNames.ts';
+import { useDeleteManagedControlPlane as _useDeleteManagedControlPlane } from '../../../hooks/useDeleteManagedControlPlane.ts';
 
 interface Props {
   controlPlane: ListControlPlanesType;
   workspace: ListWorkspacesType;
   projectName: string;
+  useDeleteManagedControlPlane?: typeof _useDeleteManagedControlPlane;
 }
 
 type MCPWizardState = {
   isOpen: boolean;
   mode?: 'edit' | 'duplicate';
 };
-export const ControlPlaneCard = ({ controlPlane, workspace, projectName }: Props) => {
+export const ControlPlaneCard = ({
+  controlPlane,
+  workspace,
+  projectName,
+  useDeleteManagedControlPlane = _useDeleteManagedControlPlane,
+}: Props) => {
   const [dialogDeleteMcpIsOpen, setDialogDeleteMcpIsOpen] = useState(false);
-  const toast = useToast();
   const { t } = useTranslation();
   const [managedControlPlaneWizardState, setManagedControlPlaneWizardState] = useState<MCPWizardState>({
     isOpen: false,
@@ -54,11 +51,9 @@ export const ControlPlaneCard = ({ controlPlane, workspace, projectName }: Props
   const handleIsManagedControlPlaneWizardOpen = (isOpen: boolean, mode?: 'edit' | 'duplicate') => {
     setManagedControlPlaneWizardState({ isOpen, mode });
   };
-  const { trigger: patchTrigger } = useApiResourceMutation<DeleteMCPType>(
-    PatchMCPResourceForDeletion(controlPlane.metadata.namespace, controlPlane.metadata.name),
-  );
-  const { trigger: deleteTrigger } = useApiResourceMutation<DeleteMCPType>(
-    DeleteMCPResource(controlPlane.metadata.namespace, controlPlane.metadata.name),
+  const { deleteManagedControlPlane } = useDeleteManagedControlPlane(
+    controlPlane.metadata.namespace,
+    controlPlane.metadata.name,
   );
 
   const name = controlPlane.metadata.name;
@@ -135,11 +130,7 @@ export const ControlPlaneCard = ({ controlPlane, workspace, projectName }: Props
         }
         isOpen={dialogDeleteMcpIsOpen}
         setIsOpen={setDialogDeleteMcpIsOpen}
-        onDeletionConfirmed={async () => {
-          await patchTrigger(PatchMCPResourceForDeletionBody);
-          await deleteTrigger();
-          toast.show(t('ControlPlaneCard.deleteConfirmationDialog'));
-        }}
+        onDeletionConfirmed={deleteManagedControlPlane}
       />
       <EditManagedControlPlaneWizardDataLoader
         isOpen={managedControlPlaneWizardState.isOpen}
diff --git a/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCardMenu.tsx b/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCardMenu.tsx
index e85cc714..42b0371b 100644
--- a/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCardMenu.tsx
+++ b/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCardMenu.tsx
@@ -27,7 +27,13 @@ export const ControlPlaneCardMenu: FC<ControlPlanesListMenuProps> = ({
 
   return (
     <>
-      <Button ref={buttonRef} icon="overflow" icon-end onClick={handleOpenerClick} />
+      <Button
+        ref={buttonRef}
+        icon="overflow"
+        icon-end
+        data-testid="ControlPlaneCardMenu-opener"
+        onClick={handleOpenerClick}
+      />
       <Menu
         open={menuIsOpen}
         opener={buttonRef.current}
diff --git a/src/components/ControlPlanes/ControlPlanesListMenu.tsx b/src/components/ControlPlanes/ControlPlanesListMenu.tsx
index f5398673..4af16067 100644
--- a/src/components/ControlPlanes/ControlPlanesListMenu.tsx
+++ b/src/components/ControlPlanes/ControlPlanesListMenu.tsx
@@ -35,7 +35,7 @@ export const ControlPlanesListMenu: FC<ControlPlanesListMenuProps> = ({
 
   return (
     <>
-      <Button icon="overflow" icon-end onClick={handleOpenerClick} />
+      <Button icon="overflow" icon-end data-testid="ControlPlanesListMenu-opener" onClick={handleOpenerClick} />
       <Menu
         ref={popoverRef}
         open={open}
diff --git a/src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.cy.tsx b/src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.cy.tsx
new file mode 100644
index 00000000..be2f2b5b
--- /dev/null
+++ b/src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.cy.tsx
@@ -0,0 +1,144 @@
+import { ControlPlaneListWorkspaceGridTile } from './ControlPlaneListWorkspaceGridTile.tsx';
+import { SplitterProvider } from '../../Splitter/SplitterContext.tsx';
+import { useManagedControlPlanesQuery } from '../../../hooks/useManagedControlPlanesQuery.ts';
+import { ControlPlaneType, ReadyStatus } from '../../../lib/api/types/crate/controlPlanes.ts';
+import { MemoryRouter } from 'react-router-dom';
+import { useDeleteWorkspace } from '../../../hooks/useDeleteWorkspace.ts';
+import '@ui5/webcomponents-cypress-commands';
+import { ListWorkspacesType } from '../../../lib/api/types/crate/listWorkspaces.ts';
+
+describe('ControlPlaneListWorkspaceGridTile', () => {
+  let deleteWorkspaceCalled = false;
+  const fakeUseDeleteWorkspace: typeof useDeleteWorkspace = () => ({
+    deleteWorkspace: async (): Promise<void> => {
+      deleteWorkspaceCalled = true;
+    },
+  });
+
+  const fakeManagedControlPlanes: ControlPlaneType[] = [
+    {
+      metadata: {
+        name: 'mcp-a',
+        namespace: 'project-webapp-playground--ws-workspaceName',
+        creationTimestamp: '2024-05-28T10:00:00Z',
+      },
+      spec: {
+        authentication: {
+          enableSystemIdentityProvider: true,
+        },
+        components: {
+          crossplane: undefined,
+          btpServiceOperator: undefined,
+          externalSecretsOperator: undefined,
+          kyverno: undefined,
+          flux: undefined,
+          landscaper: undefined,
+        },
+      },
+      status: {
+        status: ReadyStatus.Ready,
+        conditions: [],
+        access: undefined,
+      },
+    },
+    {
+      metadata: {
+        annotations: {
+          'openmcp.cloud/created-by': 'andreas.kienle@sap.com',
+          'openmcp.cloud/display-name': '',
+        },
+        name: 'd056765-all',
+        namespace: 'project-webapp-playground--ws-d056765',
+        creationTimestamp: '2024-05-28T10:00:00Z',
+      },
+      spec: {
+        authentication: {
+          enableSystemIdentityProvider: true,
+        },
+        components: {
+          crossplane: undefined,
+          btpServiceOperator: undefined,
+          externalSecretsOperator: undefined,
+          kyverno: undefined,
+          flux: undefined,
+          landscaper: undefined,
+        },
+      },
+      status: {
+        status: ReadyStatus.Ready,
+        conditions: [],
+        access: undefined,
+      },
+    },
+    {
+      metadata: {
+        annotations: {
+          'openmcp.cloud/created-by': 'andreas.kienle@sap.com',
+          'openmcp.cloud/display-name': '',
+        },
+        name: 'flux',
+        namespace: 'project-webapp-playground--ws-d056765',
+        creationTimestamp: '2024-05-28T10:00:00Z',
+      },
+      spec: {
+        authentication: {
+          enableSystemIdentityProvider: true,
+        },
+        components: {
+          crossplane: undefined,
+          btpServiceOperator: undefined,
+          externalSecretsOperator: undefined,
+          kyverno: undefined,
+          flux: undefined,
+          landscaper: undefined,
+        },
+      },
+      status: {
+        status: ReadyStatus.Ready,
+        conditions: [],
+        access: undefined,
+      },
+    },
+  ];
+
+  const fakeUseManagedControlPlanesQuery: typeof useManagedControlPlanesQuery = () => ({
+    managedControlPlanes: fakeManagedControlPlanes,
+    error: undefined,
+    isLoading: false,
+  });
+
+  beforeEach(() => {
+    deleteWorkspaceCalled = false;
+  });
+
+  it('deletes the workspace', () => {
+    const workspace: ListWorkspacesType = {
+      metadata: {
+        name: 'workspaceName',
+      },
+      spec: {
+        members: [],
+      },
+    } as unknown as ListWorkspacesType;
+
+    cy.mount(
+      <MemoryRouter>
+        <SplitterProvider>
+          <ControlPlaneListWorkspaceGridTile
+            workspace={workspace}
+            projectName="some-project"
+            useManagedControlPlanesQuery={fakeUseManagedControlPlanesQuery}
+            useDeleteWorkspace={fakeUseDeleteWorkspace}
+          />
+        </SplitterProvider>
+      </MemoryRouter>,
+    );
+
+    cy.get("[data-testid='ControlPlanesListMenu-opener']").click();
+    cy.contains('Delete workspace').click({ force: true });
+    cy.get('ui5-dialog[open]').find('ui5-input').typeIntoUi5Input('workspaceName');
+    cy.then(() => cy.wrap(deleteWorkspaceCalled).should('equal', false));
+    cy.get('ui5-dialog[open]').find('ui5-button').contains('Delete').click();
+    cy.then(() => cy.wrap(deleteWorkspaceCalled).should('equal', true));
+  });
+});
diff --git a/src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.tsx b/src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.tsx
index 216d9e61..a768f063 100644
--- a/src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.tsx
+++ b/src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.tsx
@@ -7,11 +7,9 @@ import { ControlPlaneCard } from '../ControlPlaneCard/ControlPlaneCard.tsx';
 import { ListWorkspacesType, isWorkspaceReady } from '../../../lib/api/types/crate/listWorkspaces.ts';
 import { useMemo, useState } from 'react';
 import { MembersAvatarView } from './MembersAvatarView.tsx';
-import { useApiResource } from '../../../lib/api/useApiResource.ts';
 import { DISPLAY_NAME_ANNOTATION } from '../../../lib/api/types/shared/keyNames.ts';
 import { DeleteConfirmationDialog } from '../../Dialogs/DeleteConfirmationDialog.tsx';
 import { KubectlDeleteWorkspace } from '../../Dialogs/KubectlCommandInfo/Controllers/KubectlDeleteWorkspace.tsx';
-import { ListControlPlanes } from '../../../lib/api/types/crate/controlPlanes.ts';
 import IllustratedError from '../../Shared/IllustratedError.tsx';
 import { APIError } from '../../../lib/api/error.ts';
 import { useTranslation } from 'react-i18next';
@@ -23,16 +21,19 @@ import styles from './WorkspacesList.module.css';
 import { ControlPlanesListMenu } from '../ControlPlanesListMenu.tsx';
 import { CreateManagedControlPlaneWizardContainer } from '../../Wizards/CreateManagedControlPlane/CreateManagedControlPlaneWizardContainer.tsx';
 import { useDeleteWorkspace as _useDeleteWorkspace } from '../../../hooks/useDeleteWorkspace.ts';
+import { useManagedControlPlanesQuery as _useManagedControlPlanesQuery } from '../../../hooks/useManagedControlPlanesQuery.ts';
 
 interface Props {
   projectName: string;
   workspace: ListWorkspacesType;
+  useManagedControlPlanesQuery?: typeof _useManagedControlPlanesQuery;
   useDeleteWorkspace?: typeof _useDeleteWorkspace;
 }
 
 export function ControlPlaneListWorkspaceGridTile({
   projectName,
   workspace,
+  useManagedControlPlanesQuery = _useManagedControlPlanesQuery,
   useDeleteWorkspace = _useDeleteWorkspace,
 }: Props) {
   const [isCreateManagedControlPlaneWizardOpen, setIsCreateManagedControlPlaneWizardOpen] = useState(false);
@@ -46,7 +47,7 @@ export function ControlPlaneListWorkspaceGridTile({
 
   const [dialogDeleteWsIsOpen, setDialogDeleteWsIsOpen] = useState(false);
 
-  const { data: controlplanes, error: cpsError } = useApiResource(ListControlPlanes(projectName, workspaceName));
+  const { managedControlPlanes, error: cpsError } = useManagedControlPlanesQuery(projectName, workspaceName);
   const { deleteWorkspace } = useDeleteWorkspace(projectName, projectNamespace, workspaceName);
 
   const { mcpCreationGuide } = useLink();
@@ -138,7 +139,7 @@ export function ControlPlaneListWorkspaceGridTile({
         >
           {errorView ? (
             errorView
-          ) : controlplanes?.length === 0 ? (
+          ) : managedControlPlanes?.length === 0 ? (
             <IllustratedBanner
               title={t('IllustratedBanner.titleMessage')}
               subtitle={t('IllustratedBanner.subtitleMessage')}
@@ -164,10 +165,10 @@ export function ControlPlaneListWorkspaceGridTile({
           ) : (
             <div className={styles.wrapper}>
               <div className={styles.grid}>
-                {controlplanes?.map((cp) => (
+                {managedControlPlanes?.map((mcp) => (
                   <ControlPlaneCard
-                    key={`${cp.metadata.name}--${cp.metadata.namespace}`}
-                    controlPlane={cp}
+                    key={`${mcp.metadata.name}--${mcp.metadata.namespace}`}
+                    controlPlane={mcp}
                     projectName={projectName}
                     workspace={workspace}
                   />
diff --git a/src/hooks/useDeleteManagedControlPlane.spec.ts b/src/hooks/useDeleteManagedControlPlane.spec.ts
new file mode 100644
index 00000000..a541ede7
--- /dev/null
+++ b/src/hooks/useDeleteManagedControlPlane.spec.ts
@@ -0,0 +1,88 @@
+import { act, renderHook } from '@testing-library/react';
+import { describe, it, expect, vi, afterEach, Mock } from 'vitest';
+import { assertNonNullish, assertString } from '../utils/test/vitest-utils.ts';
+
+import { useDeleteManagedControlPlane } from './useDeleteManagedControlPlane.ts';
+
+vi.mock('../context/ToastContext', () => ({
+  useToast: () => ({
+    show: vi.fn(),
+  }),
+}));
+
+describe.only('useDeleteManagedControlPlane', () => {
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should perform a valid delete request', async () => {
+    const fetchMock: Mock<typeof fetch> = vi.fn();
+    fetchMock.mockResolvedValue({
+      ok: true,
+      status: 200,
+      json: vi.fn().mockResolvedValue({}),
+    } as unknown as Response);
+    global.fetch = fetchMock;
+
+    // ACT
+    const renderHookResult = renderHook(() => useDeleteManagedControlPlane('namespace', 'mcpName'));
+    const { deleteManagedControlPlane } = renderHookResult.result.current;
+
+    await act(async () => {
+      await deleteManagedControlPlane();
+    });
+
+    // ASSERT
+    expect(fetchMock).toHaveBeenCalledTimes(2);
+
+    // Assert PATCH call
+    const patchCall = fetchMock.mock.calls[0];
+    const [patchUrl, patchInit] = patchCall;
+    assertNonNullish(patchInit);
+    const { method: patchMethod, headers: patchHeaders, body: patchBody } = patchInit;
+
+    expect(patchUrl).toContain(
+      '/api/onboarding/apis/core.openmcp.cloud/v1alpha1/namespaces/namespace/managedcontrolplanes/mcpName?fieldManager=kubectl-annotate',
+    );
+
+    expect(patchMethod).toBe('PATCH');
+
+    expect(patchHeaders).toEqual(
+      expect.objectContaining({
+        'Content-Type': 'application/merge-patch+json',
+        'X-use-crate': 'true',
+      }),
+    );
+
+    assertString(patchBody);
+    const parsedPatchBody = JSON.parse(patchBody);
+    expect(parsedPatchBody).toEqual({
+      metadata: {
+        annotations: {
+          'confirmation.openmcp.cloud/deletion': 'true',
+        },
+      },
+    });
+
+    // Assert DELETE call
+    const postCall = fetchMock.mock.calls[1];
+    const [postUrl, postInit] = postCall;
+    assertNonNullish(postInit);
+    const { method: postMethod, headers: postHeaders, body: postBody } = postInit;
+
+    expect(postUrl).toContain(
+      '/api/onboarding/apis/core.openmcp.cloud/v1alpha1/namespaces/namespace/managedcontrolplanes/mcpName',
+    );
+
+    expect(postMethod).toBe('DELETE');
+
+    expect(postHeaders).toEqual(
+      expect.objectContaining({
+        'Content-Type': 'application/json',
+        'X-use-crate': 'true',
+      }),
+    );
+
+    expect(postBody).toBeUndefined();
+  });
+});
diff --git a/src/hooks/useDeleteManagedControlPlane.ts b/src/hooks/useDeleteManagedControlPlane.ts
new file mode 100644
index 00000000..86cb923d
--- /dev/null
+++ b/src/hooks/useDeleteManagedControlPlane.ts
@@ -0,0 +1,27 @@
+import { useCallback } from 'react';
+import { useApiResourceMutation } from '../lib/api/useApiResource';
+import { useToast } from '../context/ToastContext';
+import { useTranslation } from 'react-i18next';
+import {
+  DeleteMCPResource,
+  DeleteMCPType,
+  PatchMCPResourceForDeletion,
+  PatchMCPResourceForDeletionBody,
+} from '../lib/api/types/crate/deleteMCP.ts';
+
+export function useDeleteManagedControlPlane(namespace: string, name: string) {
+  const { trigger: patchTrigger } = useApiResourceMutation<DeleteMCPType>(PatchMCPResourceForDeletion(namespace, name));
+  const { trigger: deleteTrigger } = useApiResourceMutation<DeleteMCPType>(DeleteMCPResource(namespace, name));
+  const { t } = useTranslation();
+  const toast = useToast();
+
+  const deleteManagedControlPlane = useCallback(async (): Promise<void> => {
+    await patchTrigger(PatchMCPResourceForDeletionBody);
+    await deleteTrigger();
+    toast.show(t('ControlPlaneCard.deleteConfirmationDialog'));
+  }, [patchTrigger, deleteTrigger, toast, t]);
+
+  return {
+    deleteManagedControlPlane,
+  };
+}
diff --git a/src/hooks/useDeleteWorkspace.ts b/src/hooks/useDeleteWorkspace.ts
index 8e4f417a..d2741975 100644
--- a/src/hooks/useDeleteWorkspace.ts
+++ b/src/hooks/useDeleteWorkspace.ts
@@ -9,7 +9,7 @@ export function useDeleteWorkspace(projectName: string, projectNamespace: string
   const { t } = useTranslation();
   const toast = useToast();
 
-  const { trigger, isMutating } = useApiResourceMutation<DeleteWorkspaceType>(
+  const { trigger } = useApiResourceMutation<DeleteWorkspaceType>(
     DeleteWorkspaceResource(projectNamespace, workspaceName),
   );
   const revalidate = useRevalidateApiResource(ListWorkspaces(projectName));
@@ -22,6 +22,5 @@ export function useDeleteWorkspace(projectName: string, projectNamespace: string
 
   return {
     deleteWorkspace,
-    isDeleting: isMutating,
   };
 }
diff --git a/src/hooks/useManagedControlPlanesQuery.ts b/src/hooks/useManagedControlPlanesQuery.ts
new file mode 100644
index 00000000..6b123c6e
--- /dev/null
+++ b/src/hooks/useManagedControlPlanesQuery.ts
@@ -0,0 +1,16 @@
+import { useApiResource } from '../lib/api/useApiResource.ts';
+import { ControlPlaneType, ListControlPlanes } from '../lib/api/types/crate/controlPlanes.ts';
+import { APIError } from '../lib/api/error.ts';
+
+export interface ManagedControlPlanesQueryHookResult {
+  managedControlPlanes: ControlPlaneType[] | undefined;
+  error: APIError | undefined;
+}
+export function useManagedControlPlanesQuery(
+  projectName: string,
+  workspaceName: string,
+): ManagedControlPlanesQueryHookResult {
+  const { data: managedControlPlanes, error } = useApiResource(ListControlPlanes(projectName, workspaceName));
+
+  return { managedControlPlanes, error };
+}

From eb51e8886becefac7ad4ae05c3807f955515d9d7 Mon Sep 17 00:00:00 2001
From: Andreas Kienle <andreas.kienle@sap.com>
Date: Fri, 31 Oct 2025 11:28:16 +0100
Subject: [PATCH 2/3] remove .only

---
 src/hooks/useDeleteManagedControlPlane.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useDeleteManagedControlPlane.spec.ts b/src/hooks/useDeleteManagedControlPlane.spec.ts
index a541ede7..7da98ad5 100644
--- a/src/hooks/useDeleteManagedControlPlane.spec.ts
+++ b/src/hooks/useDeleteManagedControlPlane.spec.ts
@@ -10,7 +10,7 @@ vi.mock('../context/ToastContext', () => ({
   }),
 }));
 
-describe.only('useDeleteManagedControlPlane', () => {
+describe('useDeleteManagedControlPlane', () => {
   afterEach(() => {
     vi.clearAllMocks();
   });

From fd06880fe57599bd529aa52d6aca37ecdba5e268 Mon Sep 17 00:00:00 2001
From: Andreas Kienle <andreas.kienle@sap.com>
Date: Fri, 31 Oct 2025 11:32:32 +0100
Subject: [PATCH 3/3] Update
 src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.cy.tsx

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../ControlPlanes/List/ControlPlaneListWorkspaceGridTile.cy.tsx  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.cy.tsx b/src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.cy.tsx
index be2f2b5b..74d49c52 100644
--- a/src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.cy.tsx
+++ b/src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.cy.tsx
@@ -104,7 +104,6 @@ describe('ControlPlaneListWorkspaceGridTile', () => {
   const fakeUseManagedControlPlanesQuery: typeof useManagedControlPlanesQuery = () => ({
     managedControlPlanes: fakeManagedControlPlanes,
     error: undefined,
-    isLoading: false,
   });
 
   beforeEach(() => {