Merge branch 'develop' of https://github.com/devtron-labs/dashboard into feat/catalog-schema

Author: arunjaindev

package.json

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

src/App.tsx

@@ -23,6 +23,7 @@ import {
     BreadcrumbStore,
     DevtronProgressing,
     ErrorScreenManager,
+    setGlobalAPITimeout,
     showError,
     URLS as CommonURLS,
     useUserEmail,
@@ -147,6 +148,8 @@ const App = () => {
             setValidating(false)
             defaultRedirection()
         }
+
+        setGlobalAPITimeout(window._env_.GLOBAL_API_TIMEOUT)
     }, [])
 
     const renderRoutesWithErrorBoundary = () =>

src/components/common/ClusterNotReachableDialog/ClusterNotReachableDialog.tsx

@@ -19,7 +19,12 @@ import { ForceDeleteConfirmationModal } from '@devtron-labs/devtron-fe-common-li
 import { NON_CASCADE_DELETE_DIALOG_INTERNAL_MESSAGE } from '../../../config/constantMessaging'
 import { ClusterNotReachableDialogType } from './ClusterNotReachableDialog.type'
 
-const ClusterNotReachableDialog = ({ clusterName, onClickCancel, onClickDelete }: ClusterNotReachableDialogType) => {
+const ClusterNotReachableDialog = ({
+    clusterName,
+    onClickCancel,
+    onClickDelete,
+    isDeleting,
+}: ClusterNotReachableDialogType) => {
     if (!clusterName) {
         return null
     }
@@ -34,6 +39,7 @@ const ClusterNotReachableDialog = ({ clusterName, onClickCancel, onClickDelete }
                 </p>
             }
             onDelete={onClickDelete}
+            isDeleting={isDeleting}
             closeConfirmationModal={onClickCancel}
         />
     )

src/components/common/ClusterNotReachableDialog/ClusterNotReachableDialog.type.ts

@@ -18,4 +18,5 @@ export interface ClusterNotReachableDialogType {
     clusterName: string
     onClickCancel: () => void
     onClickDelete: () => void
+    isDeleting?: boolean
 }

src/components/externalArgoApps/ExternalArgoAppDetail.tsx

@@ -24,6 +24,7 @@ import {
     DeploymentAppTypes,
     getIsRequestAborted,
     abortPreviousRequests,
+    API_STATUS_CODES,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { getArgoAppDetail } from '../external-apps/ExternalAppService'
 import { checkIfToRefetchData, deleteRefetchDataFromUrl } from '../util/URLUtil'
@@ -41,6 +42,8 @@ const ExternalArgoAppDetail = ({ appName, clusterId, isExternalApp, namespace }:
     const [isReloadResourceTreeInProgress, setIsReloadResourceTreeInProgress] = useState(false)
     const [errorResponseCode, setErrorResponseCode] = useState(undefined)
 
+    const handledFirstCall = useRef(false)
+
     let isAPICallInProgress = false
 
     const abortControllerRef = useRef<AbortController>(new AbortController())
@@ -114,7 +117,11 @@ const ExternalArgoAppDetail = ({ appName, clusterId, isExternalApp, namespace }:
             .catch((errors: ServerErrors) => {
                 if (!getIsRequestAborted(errors)) {
                     showError(errors)
-                    setErrorResponseCode(errors.code)
+
+                    if (!handledFirstCall.current || errors.code === API_STATUS_CODES.NOT_FOUND) {
+                        setErrorResponseCode(errors.code)
+                    }
+
                     isAPICallInProgress = false
                     handleInitiatePolling()
                 }
@@ -123,6 +130,7 @@ const ExternalArgoAppDetail = ({ appName, clusterId, isExternalApp, namespace }:
                 setIsLoading(false)
                 isAPICallInProgress = false
                 setIsReloadResourceTreeInProgress(false)
+                handledFirstCall.current = true
             })
     }
 

src/components/v2/appDetails/ea/EAAppDetail.component.tsx

@@ -24,6 +24,7 @@ import {
     DeploymentAppTypes,
     getIsRequestAborted,
     abortPreviousRequests,
+    API_STATUS_CODES,
 } from '@devtron-labs/devtron-fe-common-lib'
 import moment from 'moment'
 import { sortOptionsByValue } from '../../../common'
@@ -54,6 +55,7 @@ const ExternalAppDetail = ({ appId, appName, isExternalApp }) => {
     const [isReloadResourceTreeInProgress, setIsReloadResourceTreeInProgress] = useState(false)
 
     const abortControllerRef = useRef<AbortController>(new AbortController())
+    const handledFirstCall = useRef(false)
 
     let isAPICallInProgress = false
 
@@ -189,12 +191,15 @@ const ExternalAppDetail = ({ appId, appName, isExternalApp }) => {
 
                 if (!getIsRequestAborted(errors)) {
                     showError(errors)
-                    setErrorResponseCode(errors.code)
+                    if (!handledFirstCall.current || errors.code === API_STATUS_CODES.NOT_FOUND) {
+                        setErrorResponseCode(errors.code)
+                    }
                     handleInitiatePolling()
                 }
             })
             .finally(() => {
                 setIsReloadResourceTreeInProgress(false)
+                handledFirstCall.current = true
             })
     }
 

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

@@ -76,6 +76,8 @@ const EnvironmentSelectorComponent = ({
     const [forceDeleteDialogMessage, setForceDeleteDialogMessage] = useState<string>('')
     const [nonCascadeDeleteDialog, showNonCascadeDeleteDialog] = useState<boolean>(false)
     const [clusterName, setClusterName] = useState<string>('')
+    const [isDeleteLoading, setIsDeleteLoading] = useState<boolean>(false)
+
     const isGitops = appDetails?.deploymentAppType === DeploymentAppTypes.ARGO
     const isExternalArgo = appDetails.appType === AppType.EXTERNAL_ARGO_APP
     const isExternalFlux = appDetails.appType === AppType.EXTERNAL_FLUX_APP
@@ -150,6 +152,7 @@ const EnvironmentSelectorComponent = ({
 
     async function deleteResourceAction(deleteAction: DELETE_ACTION) {
         try {
+            setIsDeleteLoading(true)
             const response = await getDeleteApplicationApi(deleteAction)
             if (response.result.deleteResponse?.deleteInitiated || (isExternalApp && response.result?.success)) {
                 setShowDeleteConfirmation(false)
@@ -179,6 +182,8 @@ const EnvironmentSelectorComponent = ({
                 showForceDeleteDialog(true)
             }
             showError(error)
+        } finally {
+            setIsDeleteLoading(false)
         }
     }
 
@@ -376,6 +381,7 @@ const EnvironmentSelectorComponent = ({
                                     handleDelete={handleDelete}
                                     toggleConfirmation={setShowDeleteConfirmation}
                                     isCreateValueView={false}
+                                    disableButton={isDeleteLoading}
                                 />
                             )}
                         </div>
@@ -387,6 +393,7 @@ const EnvironmentSelectorComponent = ({
                             subtitle={forceDeleteDialogMessage}
                             onDelete={handleForceDelete}
                             closeConfirmationModal={closeForceConfirmationModal}
+                            isDeleting={isDeleteLoading}
                         />
                     )}
 
@@ -395,6 +402,7 @@ const EnvironmentSelectorComponent = ({
                             clusterName={clusterName}
                             onClickCancel={onClickHideNonCascadeDeletePopup}
                             onClickDelete={onClickNonCascadeDelete}
+                            isDeleting={isDeleteLoading}
                         />
                     )}
                 </div>

src/components/v2/index.tsx

@@ -19,6 +19,7 @@ import { Redirect, Route, Switch, useHistory, useLocation, useParams, useRouteMa
 
 import {
     abortPreviousRequests,
+    API_STATUS_CODES,
     DetailsProgressing,
     ErrorScreenManager,
     getIsRequestAborted,
@@ -64,6 +65,7 @@ const RouterComponent = () => {
     const [isReloadResourceTreeInProgress, setIsReloadResourceTreeInProgress] = useState(false)
     const appDetailsRef = useRef({} as AppDetails)
     const isVirtualRef = useRef(false)
+    const handledFirstCall = useRef(false)
 
     useEffect(() => {
         IndexStore.setEnvDetails(EnvType.CHART, +params.appId, +params.envId)
@@ -126,8 +128,11 @@ const RouterComponent = () => {
             return
         }
 
-        setErrorResponseCode(e.code)
-        if (e.code === 404 && initTimer) {
+        if (!handledFirstCall.current || e.code === API_STATUS_CODES.NOT_FOUND) {
+            setErrorResponseCode(e.code)
+        }
+
+        if (e.code === API_STATUS_CODES.NOT_FOUND && initTimer) {
             clearTimeout(initTimer)
         }
     }
@@ -204,6 +209,8 @@ const RouterComponent = () => {
             if (!isAborted) {
                 handleInitiatePolling()
             }
+        }).finally(() => {
+            handledFirstCall.current = true
         })
     }
 

yarn.lock

@@ -1722,9 +1722,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@devtron-labs/devtron-fe-common-lib@npm:1.20.2-pre-1":
-  version: 1.20.2-pre-1
-  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.2-pre-1"
+"@devtron-labs/devtron-fe-common-lib@npm:1.20.3-pre-1":
+  version: 1.20.3-pre-1
+  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.3-pre-1"
   dependencies:
     "@codemirror/autocomplete": "npm:6.18.6"
     "@codemirror/lang-json": "npm:6.0.1"
@@ -1775,7 +1775,7 @@ __metadata:
     react-select: 5.8.0
     rxjs: ^7.8.1
     yaml: ^2.4.1
-  checksum: 10c0/92f267d988304ee901da89edf9f589667ca40f0bdeda44df78c97079aaf017ca5c6bcf9f9d3c7cb4dd26c9805e94519e94db30e560bf3f86ea32b5d465170ba3
+  checksum: 10c0/9a27418453f61b8df4786feb9456104481594156e3d3cde56910e8068abe30613b523378722df8977352e70a935af658c404f48572f4ad011f981b8e987c9142
   languageName: node
   linkType: hard
 
@@ -5738,7 +5738,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "dashboard@workspace:."
   dependencies:
-    "@devtron-labs/devtron-fe-common-lib": "npm:1.20.2-pre-1"
+    "@devtron-labs/devtron-fe-common-lib": "npm:1.20.3-pre-1"
     "@esbuild-plugins/node-globals-polyfill": "npm:0.2.3"
     "@playwright/test": "npm:^1.32.1"
     "@rjsf/core": "npm:^5.13.3"