PR comments

Author: Hubert-Szczepanski-SAP

src/components/ControlPlane/ManagedResources.module.css

@@ -0,0 +1,4 @@
+.deletingRow {
+  opacity: 0.5;
+  pointer-events: none;
+}

src/components/ControlPlane/ManagedResources.tsx

@@ -19,6 +19,7 @@ import { Resource } from '../../utils/removeManagedFieldsAndFilterData.ts';
 import { ManagedResourceItem } from '../../lib/shared/types.ts';
 import { ManagedResourceDeleteDialog } from '../Dialogs/ManagedResourceDeleteDialog.tsx';
 import { RowActionsMenu } from './ManagedResourcesActionMenu.tsx';
+import styles from './ManagedResources.module.css';
 
 const getItemKey = (item: ManagedResourceItem): string => `${item.kind}-${item.metadata.name}`;
 
@@ -173,7 +174,7 @@ export function ManagedResources() {
             item: item,
             conditionSyncedMessage: conditionSynced?.message ?? conditionSynced?.reason ?? '',
             conditionReadyMessage: conditionReady?.message ?? conditionReady?.reason ?? '',
-            style: isDeleting ? { opacity: 0.5, pointerEvents: 'none' } : undefined,
+            className: isDeleting ? styles.deletingRow : undefined,
           };
         }),
       ) ?? [];

src/components/Dialogs/ManagedResourceDeleteDialog.tsx

@@ -44,8 +44,9 @@ export const ManagedResourceDeleteDialog: FC<Props> = ({ kindMapping, open, onCl
     }
   }, [open]);
 
-  const { apiVersion, resourceName, pluralKind } = useMemo(
+  const { apiVersion, resourceName, pluralKind, namespace } = useMemo(
     () => ({
+      namespace: item?.metadata?.namespace ?? '',
       apiVersion: item?.apiVersion ?? '',
       resourceName: item?.metadata?.name ?? '',
       pluralKind: item ? getPluralKind(item, kindMapping) : '',
@@ -60,11 +61,11 @@ export const ManagedResourceDeleteDialog: FC<Props> = ({ kindMapping, open, onCl
   const isConfirmed = confirmationText === resourceName;
 
   const { trigger: deleteTrigger } = useApiResourceMutation<DeleteManagedResourceType>(
-    DeleteMCPManagedResource(apiVersion, pluralKind, resourceName),
+    DeleteMCPManagedResource(apiVersion, pluralKind, resourceName, namespace),
   );
 
   const { trigger: patchTrigger } = useApiResourceMutation<undefined>(
-    PatchResourceForForceDeletion(apiVersion, pluralKind, resourceName),
+    PatchResourceForForceDeletion(apiVersion, pluralKind, resourceName, namespace),
   );
 
   const handleForceDeletionChange = () => {

src/lib/api/types/crate/deleteResource.ts

@@ -13,11 +13,19 @@ export const PatchResourceForForceDeletionBody = {
 
 export const PatchResourceForForceDeletion = (
   apiVersion: string,
-  kind: string,
+  pluralKind: string,
   resourceName: string,
+  namespace?: string,
 ): Resource<undefined> => {
+  // If namespace is provided, use namespaced path; otherwise, use cluster-scoped path
+  const basePath = `/apis/${apiVersion}`;
+
+  const path = namespace
+    ? `${basePath}/namespaces/${namespace}/${pluralKind}/${resourceName}`
+    : `${basePath}/${pluralKind}/${resourceName}`;
+
   return {
-    path: `/apis/${apiVersion}/${kind}/${resourceName}/`,
+    path: path,
     method: 'PATCH',
     jq: undefined,
     body: JSON.stringify(PatchResourceForForceDeletionBody),
@@ -26,11 +34,18 @@ export const PatchResourceForForceDeletion = (
 
 export const DeleteMCPManagedResource = (
   apiVersion: string,
-  kind: string,
+  pluralKind: string,
   resourceName: string,
+  namespace?: string,
 ): Resource<undefined> => {
+  // If namespace is provided, use namespaced path; otherwise, use cluster-scoped path
+  const basePath = `/apis/${apiVersion}`;
+
+  const path = namespace
+    ? `${basePath}/namespaces/${namespace}/${pluralKind}/${resourceName}`
+    : `${basePath}/${pluralKind}/${resourceName}`;
   return {
-    path: `/apis/${apiVersion}/${kind}/${resourceName}/`,
+    path: path,
     method: 'DELETE',
     jq: undefined,
     body: undefined,