Merge pull request #2049 from devtron-labs/fix/force-delete-helm

fix: force delete when cluster unreachable

Author: arunjaindev

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.3.19",
+        "@devtron-labs/devtron-fe-common-lib": "0.3.19-beta-2",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/components/cdPipeline/CDPipeline.tsx

@@ -663,9 +663,11 @@ export default function CDPipeline({
             deploymentAppName: formData.deploymentAppName,
             releaseMode: formData.releaseMode,
             deploymentAppCreated: formData.deploymentAppCreated,
-            ...(getUserApprovalConfigPayload ? {
-                userApprovalConfig: getUserApprovalConfigPayload(formData.userApprovalConfig)
-            }: {}),
+            ...(getUserApprovalConfigPayload
+                ? {
+                      userApprovalConfig: getUserApprovalConfigPayload(formData.userApprovalConfig),
+                  }
+                : {}),
             triggerType: formData.triggerType,
             environmentName: formData.environmentName,
             preStageConfigMapSecretNames: _preStageConfigMapSecretNames,
@@ -1031,8 +1033,10 @@ export default function CDPipeline({
             })
             .catch((error: ServerErrors) => {
                 // 412 is for linked pipeline and 403 is for RBAC
-                // 422 is for deployment window
-                if (!force && error.code != 403 && error.code != 412 && error.code != 422) {
+                //For now we are removing check for error code 422 which is of deployment window, 
+                // so in that case force delete modal would be shown.
+                // This should be done at BE and when done we will revert our changes
+                if (!force && error.code != 403 && error.code != 412) {
                     setForceDeleteDialogData(error)
                     setDeleteDialog(DeleteDialogType.showForceDeleteDialog)
                 } else {

src/components/charts/charts.service.ts

@@ -14,10 +14,24 @@
  * limitations under the License.
  */
 
-import { get, post, put, trash, sortCallback, ResponseType } from '@devtron-labs/devtron-fe-common-lib'
+import {
+    get,
+    post,
+    put,
+    trash,
+    sortCallback,
+    ResponseType,
+    getUrlWithSearchParams,
+} from '@devtron-labs/devtron-fe-common-lib'
 import { DELETE_ACTION, Routes } from '../../config'
 import { getAPIOptionsWithTriggerTimeout, handleUTCTime } from '../common'
-import { ChartValuesType, ChartGroup, HelmTemplateChartRequest, HelmProjectUpdatePayload } from './charts.types'
+import {
+    ChartValuesType,
+    ChartGroup,
+    HelmTemplateChartRequest,
+    HelmProjectUpdatePayload,
+    DeleteInstalledChartParamsType,
+} from './charts.types'
 import { SavedValueListResponse } from './SavedValues/types'
 
 interface RootObject {
@@ -57,13 +71,20 @@ export function deleteInstalledChart(
     isGitops?: boolean,
     deleteAction?: DELETE_ACTION,
 ) {
-    let URL: string = `app-store/deployment/application/delete/${installedAppId}?partialDelete=${isGitops ? 'true' : 'false'}`
+    const baseUrl: string = `app-store/deployment/application/delete/${installedAppId}`
+    let params: DeleteInstalledChartParamsType = {}
     if (deleteAction === DELETE_ACTION.FORCE_DELETE) {
-        URL += `&force=true`
-    } else if (deleteAction === DELETE_ACTION.NONCASCADE_DELETE) {
-        URL += `&cascade=false`
+        params = {
+            forceDelete: true,
+        }
+    } else if (isGitops) {
+        params['partialDelete'] = true
+        if (deleteAction === DELETE_ACTION.NONCASCADE_DELETE) {
+            params['cascade'] = false
+        }
     }
-    return trash(URL)
+    const url = getUrlWithSearchParams(baseUrl, params)
+    return trash(url)
 }
 
 export function getChartValuesTemplateList(chartId: number | string): Promise<SavedValueListResponse> {

src/components/charts/charts.types.tsx

@@ -401,3 +401,9 @@ export interface ChartHeaderFilterProps {
     isGrid: boolean
     setIsGrid: (isGrid: boolean) => void
 }
+
+export interface DeleteInstalledChartParamsType {
+    forceDelete?: true
+    partialDelete?: true
+    cascade?: false
+}

src/components/charts/discoverChartDetail/ChartDeploymentList.tsx

@@ -176,7 +176,8 @@ export const DeploymentRow = ({
                 fetchDeployments()
             } else if (
                 deleteAction !== DELETE_ACTION.NONCASCADE_DELETE &&
-                !response.result.deleteResponse?.clusterReachable
+                !response.result.deleteResponse?.clusterReachable &&
+                deploymentAppType === DeploymentAppTypes.GITOPS
             ) {
                 setClusterName(response.result.deleteResponse?.clusterName)
                 toggleConfirmation(false)
@@ -208,6 +209,7 @@ export const DeploymentRow = ({
     const handleForceDelete = () => {
         handleDelete(DELETE_ACTION.FORCE_DELETE)
     }
+
     const handleCascadeDelete = () => {
         handleDelete(DELETE_ACTION.DELETE)
     }

src/components/v2/appDetails/sourceInfo/EnvironmentSelector.component.tsx

@@ -182,7 +182,8 @@ const EnvironmentSelectorComponent = ({
                 }
             } else if (
                 deleteAction !== DELETE_ACTION.NONCASCADE_DELETE &&
-                !response.result.deleteResponse?.clusterReachable
+                !response.result.deleteResponse?.clusterReachable && 
+                appDetails?.deploymentAppType === DeploymentAppTypes.GITOPS
             ) {
                 setClusterName(response.result.deleteResponse?.clusterName)
                 setShowDeleteConfirmation(false)

src/components/v2/values/chartValuesDiff/ChartValuesView.reducer.ts

@@ -23,6 +23,7 @@ export const initState = (
     chartValuesFromParent: ChartValuesType,
     installedConfigFromParent: any,
     chartVersionsDataFromParent: ChartVersionType[],
+    deploymentAppType: DeploymentAppTypes,
 ): ChartValuesViewState => {
     return {
         isLoading: true,
@@ -79,7 +80,7 @@ export const initState = (
         invalidProject: false,
         formValidationError: {},
         showNoGitOpsWarning: false,
-        deploymentAppType: DeploymentAppTypes.HELM,
+        deploymentAppType: deploymentAppType ?? DeploymentAppTypes.HELM,
         gitRepoURL: '',
         authMode: null,
         initialChartVersionValues: {

src/components/v2/values/chartValuesDiff/ChartValuesView.tsx

@@ -198,6 +198,7 @@ const ChartValuesView = ({
                 : chartValuesFromParent,
             installedConfigFromParent,
             chartVersionsDataFromParent,
+            appDetails?.deploymentAppType,
         ),
     )
 
@@ -706,7 +707,8 @@ const ChartValuesView = ({
                 // helm app delete failed due to cluster not reachable (ArgoCD installed)
                 if (
                     deleteAction !== DELETE_ACTION.NONCASCADE_DELETE &&
-                    !response.result.deleteResponse?.clusterReachable
+                    !response.result.deleteResponse?.clusterReachable &&
+                    commonState.deploymentAppType === DeploymentAppTypes.GITOPS
                 ) {
                     dispatch({
                         type: ChartValuesViewActionTypes.multipleOptions,

yarn.lock

@@ -1346,10 +1346,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@devtron-labs/[email protected]":
-  version "0.3.19"
-  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-0.3.19.tgz#a1b22552e1e9d998c1d2d6690bf23afcef9253cc"
-  integrity sha512-sEUyag/2Ee7KG7JWRuv/IbJzZNQ9AbjqvDTty+VebuXTrCrOAhTUNXz+uGouUQ/x7J/bqDNY/M3d7Zwluw13yQ==
+"@devtron-labs/[email protected]-beta-2":
+  version "0.3.19-beta-2"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-0.3.19-beta-2.tgz#fb2d5a758c5567ebf95335ad79a7647b81ad9d19"
+  integrity sha512-rWUP1Cpiobw1pz8RHRQlSRUxfX+fwZpQKWx3SZomeq75nHvUYGCoT/NRvo1aBqzylIjQ005HDbXI3uHJdeobkw==
   dependencies:
     "@types/react-dates" "^21.8.6"
     ansi_up "^5.2.1"