Merge pull request #2811 from devtron-labs/fix/cluster-del-modal-close

AbhishekA1509 · web-flow · commit 933a314ad07b · 2025-07-04T12:24:49.000+05:30
fix: handle success for cluster deletion
diff --git a/src/Pages/GlobalConfigurations/ClustersAndEnvironments/ClusterForm.tsx b/src/Pages/GlobalConfigurations/ClustersAndEnvironments/ClusterForm.tsx
@@ -1515,6 +1515,7 @@ const ClusterForm = ({
                                 clusterId={String(id)}
                                 clusterName={clusterName}
                                 handleClose={hideConfirmationModal}
+                                handleSuccess={hideEditModal}
                                 reload={reload}
                                 installationId={String(installationId)}
                             />
diff --git a/src/Pages/GlobalConfigurations/ClustersAndEnvironments/DeleteClusterConfirmationModal.tsx b/src/Pages/GlobalConfigurations/ClustersAndEnvironments/DeleteClusterConfirmationModal.tsx
@@ -23,6 +23,7 @@ const DeleteClusterConfirmationModal = ({
     handleClose,
     installationId,
     reload,
+    handleSuccess,
 }: DeleteClusterConfirmationModalProps) => {
     const isClusterInCreationPhase = Number(clusterId) === 0
 
@@ -40,6 +41,7 @@ const DeleteClusterConfirmationModal = ({
             await deleteCluster({ id: numberedClusterId })
         }
         reload?.()
+        handleSuccess?.()
     }
 
     const handleToggleShouldDeleteInstalledCluster = () => {
diff --git a/src/Pages/GlobalConfigurations/ClustersAndEnvironments/cluster.type.ts b/src/Pages/GlobalConfigurations/ClustersAndEnvironments/cluster.type.ts
@@ -231,6 +231,7 @@ export interface DeleteClusterConfirmationModalProps
         Pick<ClusterEnvironmentListProps, 'clusterId'> {
     handleClose: () => void
     installationId: string
+    handleSuccess?: () => void
 }
 
 export interface DeleteClusterPayload {

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ const DeleteClusterConfirmationModal = ({`
`23`	`23`	`handleClose,`
`24`	`24`	`installationId,`
`25`	`25`	`reload,`
	`26`	`+ handleSuccess,`
`26`	`27`	`}: DeleteClusterConfirmationModalProps) => {`
`27`	`28`	`const isClusterInCreationPhase = Number(clusterId) === 0`
`28`	`29`
`@@ -40,6 +41,7 @@ const DeleteClusterConfirmationModal = ({`
`40`	`41`	`await deleteCluster({ id: numberedClusterId })`
`41`	`42`	`}`
`42`	`43`	`reload?.()`
	`44`	`+ handleSuccess?.()`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`const handleToggleShouldDeleteInstalledCluster = () => {`
Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,7 @@ export interface DeleteClusterConfirmationModalProps`
`231`	`231`	`Pick<ClusterEnvironmentListProps, 'clusterId'> {`
`232`	`232`	`handleClose: () => void`
`233`	`233`	`installationId: string`
	`234`	`+ handleSuccess?: () => void`
`234`	`235`	`}`
`235`	`236`
`236`	`237`	`export interface DeleteClusterPayload {`