Merge branch 'main' into patch-502

Author: ritvikmahajan17

.env

@@ -38,3 +38,5 @@ ANNOUNCEMENT_BANNER_MSG=
 LOGIN_PAGE_IMAGE=
 LOGIN_PAGE_IMAGE_BG=
 HIDE_DEFAULT_CLUSTER=false
+GLOBAL_API_TIMEOUT=60000
+TRIGGER_API_TIMEOUT=60000

config.md

@@ -28,5 +28,7 @@
 | LOGIN_PAGE_IMAGE                   | ""         | Login page image url                          |
 | LOGIN_PAGE_IMAGE_BG                | ""         | Login page image background color code        |
 | DEFAULT_CI_TRIGGER_TYPE_MANUAL     | "false"    | Change default trigger behaviour of newly created ci-pipeline to manual |
+| GLOBAL_API_TIMEOUT    |  60000  | Default timeout for all API requests in DASHBOARD  |
+| TRIGGER_API_TIMEOUT   |  60000  | Default timeout for all API requests for Trigger calls (Deploy artifacts, charts) in DASHBOARD  |
 
 # DASHBOARD CONFIG SECRET

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.0.48",
+        "@devtron-labs/devtron-fe-common-lib": "0.0.49",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
         "@rjsf/validator-ajv8": "^5.13.3",

src/components/app/service.ts

@@ -9,7 +9,7 @@ import {
     DeploymentNodeType,
     put,
 } from '@devtron-labs/devtron-fe-common-lib'
-import { createGitCommitUrl, handleUTCTime, ISTTimeModal } from '../common'
+import { createGitCommitUrl, getAPIOptionsWithTriggerTimeout, handleUTCTime, ISTTimeModal } from '../common'
 import moment from 'moment-timezone'
 import { History } from './details/cicdHistory/types'
 import { AppDetails, ArtifactsCiJob, EditAppRequest } from './types'
@@ -334,7 +334,9 @@ export const triggerCDNode = (
             request['wfrIdForDeploymentWithSpecificTrigger'] = wfrId
         }
     }
-    return post(Routes.CD_TRIGGER_POST, request)
+    const options = getAPIOptionsWithTriggerTimeout()
+
+    return post(Routes.CD_TRIGGER_POST, request, options)
 }
 
 export const triggerBranchChange = (appIds: number[], envId: number, value: string) => {

src/components/charts/charts.service.ts

@@ -1,6 +1,6 @@
 import { get, post, put, trash, sortCallback, ResponseType } from '@devtron-labs/devtron-fe-common-lib'
 import { DELETE_ACTION, Routes } from '../../config'
-import { handleUTCTime } from '../common'
+import { getAPIOptionsWithTriggerTimeout, handleUTCTime } from '../common'
 import { ChartValuesType, ChartGroup, HelmTemplateChartRequest, HelmProjectUpdatePayload } from './charts.types'
 import { SavedValueListResponse } from './SavedValues/types'
 
@@ -26,11 +26,13 @@ export function getInstalledAppDetail(installedAppId, envId) {
 }
 
 export function installChart(request) {
-    return post(`app-store/deployment/application/install`, request)
+    const options = getAPIOptionsWithTriggerTimeout()
+    return post(`app-store/deployment/application/install`, request, options)
 }
 
 export function updateChart(request) {
-    return put(Routes.UPDATE_APP_API, request)
+    const options = getAPIOptionsWithTriggerTimeout()
+    return put(Routes.UPDATE_APP_API, request, options)
 }
 
 export function deleteInstalledChart(installedAppId: string | number, isGitops?: boolean, deleteAction?: DELETE_ACTION) {
@@ -124,13 +126,15 @@ interface ChartValuesCreate {
 }
 
 export function createChartValues(request: ChartValuesCreate) {
+    const options = getAPIOptionsWithTriggerTimeout()
     const URL = `${Routes.CHART_STORE}/${Routes.CHART_STORE_VALUES}/${Routes.CHART_VALUES}`
-    return post(URL, request)
+    return post(URL, request, options)
 }
 
 export function updateChartValues(request) {
+    const options = getAPIOptionsWithTriggerTimeout()
     const URL = `${Routes.CHART_STORE}/${Routes.CHART_STORE_VALUES}/${Routes.CHART_VALUES}`
-    return put(URL, request)
+    return put(URL, request, options)
 }
 
 export function deleteChartValues(chartId: number): Promise<any> {
@@ -218,8 +222,9 @@ export interface DeployableCharts {
 }
 
 export function deployChartGroup(projectId: number, charts: DeployableCharts[], chartGroupId?: number) {
+    const options = getAPIOptionsWithTriggerTimeout()
     // chartGroupId empty when normal deployment
-    return post(`app-store/group/install`, { projectId, chartGroupId, charts })
+    return post(`app-store/group/install`, { projectId, chartGroupId, charts }, options)
 }
 
 interface appName {

src/components/charts/list/DiscoverCharts.tsx

@@ -213,6 +213,7 @@ function DiscoverChartList({isSuperAdmin} : {isSuperAdmin: boolean}) {
         }
         try {
             setInstalling(true)
+            // NOTE: This validation call also goes inside component as well discuss about it
             const validated = await validateData()
             if (!validated) {
                 toast.warn('Click on highlighted charts and resolve errors.', { autoClose: 5000 })

src/components/common/helpers/Helpers.tsx

@@ -5,6 +5,7 @@ import {
     OptionType,
     DeploymentAppTypes,
     getLoginInfo,
+    APIOptions,
 } from '@devtron-labs/devtron-fe-common-lib'
 import YAML from 'yaml'
 import { useWindowSize } from './UseWindowSize'
@@ -1133,3 +1134,12 @@ export const hasApproverAccess = (approverList: string[]): boolean => {
 export const getNonEditableChartRepoText = (name: string): string => {
     return `Cannot edit chart repo "${name}". Some charts from this repository are being used by helm apps.`
 }
+
+export const getAPIOptionsWithTriggerTimeout = (options?: APIOptions): APIOptions => {
+    const _options: APIOptions = options ? JSON.parse(JSON.stringify(options)) : {}
+    if (Number.isInteger(window._env_.TRIGGER_API_TIMEOUT)) {
+        _options.timeout = window._env_.TRIGGER_API_TIMEOUT
+    }
+
+    return _options
+}

src/components/external-apps/ExternalAppService.ts

@@ -1,7 +1,8 @@
-import {get, post, put, trash, ResponseType} from '@devtron-labs/devtron-fe-common-lib';
+import {get, put, trash, ResponseType} from '@devtron-labs/devtron-fe-common-lib';
 import {Routes} from '../../config';
 import {HelmApp, AppEnvironmentDetail} from '../app/list-new/AppListService';
 import {ResourceTree} from '../v2/appDetails/appDetails.type';
+import { getAPIOptionsWithTriggerTimeout } from '../common'
 
 export interface ReleaseInfoResponse extends ResponseType {
     result?: ReleaseAndInstalledAppInfo
@@ -125,15 +126,18 @@ export const deleteApplicationRelease = (appId: string): Promise<UninstallReleas
 }
 
 export const updateAppReleaseWithoutLinking = (requestPayload: UpdateAppReleaseWithoutLinkingRequest): Promise<UpdateReleaseResponse> => {
-    return put(Routes.HELM_RELEASE_APP_UPDATE_WITHOUT_LINKING_API, requestPayload);
+    const options = getAPIOptionsWithTriggerTimeout()
+    return put(Routes.HELM_RELEASE_APP_UPDATE_WITHOUT_LINKING_API, requestPayload, options);
 };
 
 export const updateAppRelease = (requestPayload: UpdateAppReleaseRequest): Promise<any> => {
-    return put(Routes.UPDATE_APP_API, requestPayload);
+    const options = getAPIOptionsWithTriggerTimeout()
+    return put(Routes.UPDATE_APP_API, requestPayload, options);
 };
 
 export const linkToChartStore = (request: LinkToChartStoreRequest): Promise<UpdateReleaseResponse> => {
-    return put(Routes.HELM_LINK_TO_CHART_STORE_API, request);
+    const options = getAPIOptionsWithTriggerTimeout()
+    return put(Routes.HELM_LINK_TO_CHART_STORE_API, request, options);
 };
 
 export const getManifestUrlInfo = (appId: string): Promise<ResponseType> => {

src/index.tsx

@@ -48,6 +48,8 @@ interface customEnv {
     LOGIN_PAGE_IMAGE?: string
     LOGIN_PAGE_IMAGE_BG?: string
     HIDE_DEFAULT_CLUSTER?: boolean
+    GLOBAL_API_TIMEOUT?: number
+    TRIGGER_API_TIMEOUT?: number
 }
 declare global {
     interface Window {
@@ -150,6 +152,8 @@ if (!window || !window._env_) {
         LOGIN_PAGE_IMAGE: '',
         LOGIN_PAGE_IMAGE_BG: '',
         HIDE_DEFAULT_CLUSTER: false,
+        GLOBAL_API_TIMEOUT: 60000,
+        TRIGGER_API_TIMEOUT: 60000,
     }
 }