Merge pull request #902 from devtron-labs/fix/helm-app-delete

feat: add global API timeout setting and enhance force delete confirmation modal

Author: AbhishekA1509

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.20.2",
+    "version": "1.20.3",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -278,6 +278,10 @@ class CoreAPI {
 
     trash = <T = any, K = object>(url: string, data?: K, options?: APIOptions): Promise<ResponseType<T>> =>
         this.fetchInTime<K>({ url, type: 'DELETE', data, options })
+
+    setGlobalAPITimeout = (timeout: number) => {
+        this.timeout = timeout || FALLBACK_REQUEST_TIMEOUT
+    }
 }
 
 export default CoreAPI

src/Common/API/CoreAPI.ts

@@ -23,7 +23,7 @@ const dashboardAPI = new CoreAPI({
     handleRedirectToLicenseActivation,
 })
 
-export const { post, put, patch, get, trash } = dashboardAPI
+export const { post, put, patch, get, trash, setGlobalAPITimeout } = dashboardAPI
 export { default as CoreAPI } from './CoreAPI'
 export { QueryClientProvider } from './QueryClientProvider'
 export * from './reactQueryHooks'

src/Common/API/index.ts

@@ -23,6 +23,7 @@ export const ForceDeleteConfirmationModal = ({
     subtitle,
     onDelete,
     closeConfirmationModal,
+    isDeleting,
 }: ForceDeleteConfirmationProps) => {
     const renderSubtitle = () => (
         <>
@@ -43,6 +44,7 @@ export const ForceDeleteConfirmationModal = ({
                 primaryButtonConfig: {
                     text: 'Force Delete',
                     onClick: onDelete,
+                    isLoading: isDeleting,
                 },
             }}
             handleClose={closeConfirmationModal}

src/Shared/Components/ConfirmationModal/ForceDeleteConfirmationModal.tsx

@@ -187,7 +187,7 @@ export interface CannotDeleteModalProps
  * and `ConfirmationModalProps` to configure the force delete confirmation modal.
  */
 export interface ForceDeleteConfirmationProps
-    extends Partial<Pick<DeleteConfirmationModalProps, 'onDelete' | 'closeConfirmationModal'>>,
+    extends Partial<Pick<DeleteConfirmationModalProps, 'onDelete' | 'closeConfirmationModal' | 'isDeleting'>>,
         Partial<Pick<ConfirmationModalProps, 'title' | 'subtitle'>> {}
 
 export interface ConfirmationModalContextType {