Managed resources deletion

Author: Hubert-Szczepanski-SAP

public/locales/en.json

@@ -37,7 +37,13 @@
     "tableHeaderName": "Name",
     "tableHeaderCreated": "Created",
     "tableHeaderSynced": "Synced",
-    "tableHeaderReady": "Ready"
+    "tableHeaderReady": "Ready",
+    "tableHeaderDelete": "Delete",
+    "deleteAction": "Delete resource",
+    "deleteDialogTitle": "Delete resource",
+    "advancedOptions": "Advanced options",
+    "forceDeletion": "Force deletion",
+    "forceWarningLine": "Force deletion removes finalizers. Related resources may not be deleted and cleanup may be skipped."
   },
   "ProvidersConfig": {
     "headerProviderConfigs": "Provider Configs",

src/components/ControlPlane/ManagedResources.tsx

@@ -3,9 +3,13 @@ import {
   AnalyticalTable,
   AnalyticalTableColumnDefinition,
   AnalyticalTableScaleWidthMode,
+  Button,
   Title,
+  Menu,
+  MenuItem,
+  MenuDomRef,
 } from '@ui5/webcomponents-react';
-import { useApiResource } from '../../lib/api/useApiResource';
+import { useApiResource, useCRDItemsMapping } from '../../lib/api/useApiResource';
 import { ManagedResourcesRequest } from '../../lib/api/types/crossplane/listManagedResources';
 import { formatDateAsTimeAgo } from '../../utils/i18n/timeAgo';
 import IllustratedError from '../Shared/IllustratedError';
@@ -14,10 +18,37 @@ import '@ui5/webcomponents-icons/dist/sys-cancel-2';
 import { resourcesInterval } from '../../lib/shared/constants';
 
 import { YamlViewButton } from '../Yaml/YamlViewButton.tsx';
-import { useMemo } from 'react';
+import { FC, useMemo, useRef, useState } from 'react';
 import StatusFilter from '../Shared/StatusFilter/StatusFilter.tsx';
 import { ResourceStatusCell } from '../Shared/ResourceStatusCell.tsx';
 import { Resource } from '../../utils/removeManagedFieldsAndFilterData.ts';
+import { ManagedResourceItem } from '../../lib/shared/types.ts';
+import { ManagedResourceDeleteDialog } from '../Dialogs/ManagedResourceDeleteDialog.tsx';
+
+const getItemKey = (item: ManagedResourceItem): string => `${item.kind}-${item.metadata.name}`;
+
+const RowActionsMenu: FC<{
+  item: ManagedResourceItem;
+  onOpen: (item: ManagedResourceItem) => void;
+  isDeleting: boolean;
+}> = ({ item, onOpen, isDeleting }) => {
+  const { t } = useTranslation();
+  const popoverRef = useRef<MenuDomRef>(null);
+
+  return (
+    <>
+      <Button icon="overflow" icon-end disabled={isDeleting} onClick={() => onOpen(item)} />
+      <Menu
+        ref={popoverRef}
+        onItemClick={() => {
+          onOpen(item);
+        }}
+      >
+        <MenuItem text={t('ManagedResources.deleteAction')} icon="delete" />
+      </Menu>
+    </>
+  );
+};
 
 interface CellData<T> {
   cell: {
@@ -43,13 +74,30 @@ type ResourceRow = {
 
 export function ManagedResources() {
   const { t } = useTranslation();
+  const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
+  const [selectedItem, setSelectedItem] = useState<ManagedResourceItem | null>(null);
+  const [deletingItems, setDeletingItems] = useState<Set<string>>(new Set());
 
   const {
     data: managedResources,
     error,
     isLoading,
   } = useApiResource(ManagedResourcesRequest, {
-    refreshInterval: resourcesInterval, // Resources are quite expensive to fetch, so we refresh every 30 seconds
+    refreshInterval: resourcesInterval,
+  });
+
+  const openDeleteDialog = (item: ManagedResourceItem) => {
+    setSelectedItem(item);
+    setDeleteDialogOpen(true);
+  };
+
+  const handleDeleteStart = (item: ManagedResourceItem) => {
+    const itemKey = getItemKey(item);
+    setDeletingItems((prev) => new Set(prev.add(itemKey)));
+  };
+
+  const { data: kindMapping } = useCRDItemsMapping({
+    refreshInterval: resourcesInterval,
   });
 
   const columns: AnalyticalTableColumnDefinition[] = useMemo(
@@ -106,20 +154,39 @@ export function ManagedResources() {
         width: 75,
         accessor: 'yaml',
         disableFilters: true,
-        Cell: (cellData: CellData<ResourceRow>) =>
-          cellData.cell.row.original?.item ? (
+        Cell: (cellData: CellData<ResourceRow>) => {
+          return cellData.cell.row.original?.item ? (
             <YamlViewButton variant="resource" resource={cellData.cell.row.original?.item as Resource} />
-          ) : undefined,
+          ) : undefined;
+        },
+      },
+      {
+        Header: ' ',
+        hAlign: 'Center',
+        width: 60,
+        disableFilters: true,
+        Cell: (cellData: CellData<ResourceRow>) => {
+          const item = cellData.cell.row.original?.item as ManagedResourceItem;
+          const itemKey = item ? getItemKey(item) : '';
+          const isDeleting = deletingItems.has(itemKey);
+
+          return cellData.cell.row.original?.item ? (
+            <RowActionsMenu item={item} isDeleting={isDeleting} onOpen={openDeleteDialog} />
+          ) : undefined;
+        },
       },
     ],
-    [t],
+    [t, deletingItems],
   );
 
   const rows: ResourceRow[] =
     managedResources
       ?.filter((managedResource) => managedResource.items)
       .flatMap((managedResource) =>
         managedResource.items?.map((item) => {
+          const itemKey = getItemKey(item);
+          const isDeleting = deletingItems.has(itemKey);
+
           const conditionSynced = item.status?.conditions?.find((condition) => condition.type === 'Synced');
           const conditionReady = item.status?.conditions?.find((condition) => condition.type === 'Ready');
 
@@ -134,6 +201,7 @@ export function ManagedResources() {
             item: item,
             conditionSyncedMessage: conditionSynced?.message ?? conditionSynced?.reason ?? '',
             conditionReadyMessage: conditionReady?.message ?? conditionReady?.reason ?? '',
+            style: isDeleting ? { opacity: 0.5, pointerEvents: 'none' } : undefined,
           };
         }),
       ) ?? [];
@@ -145,28 +213,36 @@ export function ManagedResources() {
       {error && <IllustratedError details={error.message} />}
 
       {!error && (
-        <AnalyticalTable
-          columns={columns}
-          data={rows}
-          minRows={1}
-          groupBy={['kind']}
-          scaleWidthMode={AnalyticalTableScaleWidthMode.Smart}
-          loading={isLoading}
-          filterable
-          // Prevent the table from resetting when the data changes
-          retainColumnWidth
-          reactTableOptions={{
-            autoResetHiddenColumns: false,
-            autoResetPage: false,
-            autoResetExpanded: false,
-            autoResetGroupBy: false,
-            autoResetSelectedRows: false,
-            autoResetSortBy: false,
-            autoResetFilters: false,
-            autoResetRowState: false,
-            autoResetResize: false,
-          }}
-        />
+        <>
+          <AnalyticalTable
+            columns={columns}
+            data={rows}
+            minRows={1}
+            groupBy={['kind']}
+            scaleWidthMode={AnalyticalTableScaleWidthMode.Smart}
+            loading={isLoading}
+            filterable
+            retainColumnWidth
+            reactTableOptions={{
+              autoResetHiddenColumns: false,
+              autoResetPage: false,
+              autoResetExpanded: false,
+              autoResetGroupBy: false,
+              autoResetSelectedRows: false,
+              autoResetSortBy: false,
+              autoResetFilters: false,
+              autoResetRowState: false,
+              autoResetResize: false,
+            }}
+          />
+          <ManagedResourceDeleteDialog
+            kindMapping={kindMapping}
+            open={deleteDialogOpen}
+            item={selectedItem}
+            onClose={() => setDeleteDialogOpen(false)}
+            onDeleteStart={handleDeleteStart}
+          />
+        </>
       )}
     </>
   );

src/components/Dialogs/DeleteConfirmationDialog.tsx

@@ -1,10 +1,10 @@
 import { ReactNode, useState } from 'react';
-import { Bar, Button, Dialog, Input, InputDomRef, Label } from '@ui5/webcomponents-react';
+import { Bar, Button, Dialog, InputDomRef } from '@ui5/webcomponents-react';
 import ButtonDesign from '@ui5/webcomponents/dist/types/ButtonDesign.js';
-import { Trans, useTranslation } from 'react-i18next';
+import { useTranslation } from 'react-i18next';
 
-import styles from './DeleteConfirmationDialog.module.css';
 import type { Ui5CustomEvent } from '@ui5/webcomponents-react-base';
+import { DeleteConfirmationForm } from './DeleteConfirmationForm.tsx';
 
 interface DeleteConfirmationDialogProps {
   isOpen: boolean;
@@ -67,26 +67,13 @@ export function DeleteConfirmationDialog({
         />
       }
     >
-      <div className={styles.dialogContent}>
-        <span className={styles.message}>
-          <Trans
-            i18nKey="DeleteConfirmationDialog.deleteMessage"
-            values={{ resourceName }}
-            components={{
-              b: <b />,
-            }}
-          />
-        </span>
-        <Label className={styles.confirmLabel} for="mcp-name-input">
-          {t('DeleteConfirmationDialog.deleteConfirmation', { resourceName })}
-        </Label>
-        <Input
-          id="mcp-name-input"
-          value={confirmationText}
-          className={styles.confirmationInput}
-          onInput={onConfirmationInputChange}
-        />
-      </div>
+      <DeleteConfirmationForm
+        resourceName={resourceName}
+        confirmationText={confirmationText}
+        deleteMessageKey="DeleteConfirmationDialog.deleteMessage"
+        deleteConfirmationLabel={t('DeleteConfirmationDialog.deleteConfirmation', { resourceName })}
+        onConfirmationInputChange={onConfirmationInputChange}
+      />
     </Dialog>
   );
 }

…logs/DeleteConfirmationDialog.module.css …ialogs/DeleteConfirmationForm.module.csssrc/components/Dialogs/DeleteConfirmationDialog.module.css renamed to src/components/Dialogs/DeleteConfirmationForm.module.css src/components/Dialogs/DeleteConfirmationDialog.module.css renamed to src/components/Dialogs/DeleteConfirmationForm.module.css

@@ -0,0 +1,36 @@
+import { Trans } from 'react-i18next';
+import { Input, InputDomRef, Label, Ui5CustomEvent } from '@ui5/webcomponents-react';
+import styles from './DeleteConfirmationForm.module.css';
+
+interface DeleteConfirmationFormProps {
+  resourceName: string;
+  confirmationText: string;
+  onConfirmationInputChange: (event: Ui5CustomEvent<InputDomRef>) => void;
+  deleteMessageKey: string;
+  deleteConfirmationLabel: string;
+}
+
+export function DeleteConfirmationForm({
+  resourceName,
+  confirmationText,
+  onConfirmationInputChange,
+  deleteMessageKey,
+  deleteConfirmationLabel,
+}: DeleteConfirmationFormProps) {
+  return (
+    <div className={styles.dialogContent}>
+      <span className={styles.message}>
+        <Trans i18nKey={deleteMessageKey} values={{ resourceName }} components={{ b: <b /> }} />
+      </span>
+      <Label className={styles.confirmLabel} for="delete-confirm-input">
+        {deleteConfirmationLabel}
+      </Label>
+      <Input
+        id="delete-confirm-input"
+        value={confirmationText}
+        className={styles.confirmationInput}
+        onInput={onConfirmationInputChange}
+      />
+    </div>
+  );
+}

src/components/Dialogs/DeleteConfirmationForm.tsx

@@ -0,0 +1,15 @@
+.dialog {
+  width: 520px;
+}
+
+.content {
+  gap: 0.75rem;
+}
+
+.advancedOptionsContent {
+  gap: 0.5rem;
+}
+
+.actions {
+  gap: 0.5rem;
+}