Skip to content

Commit 1bc3e9d

Browse files
committed
replaced isArgo query with externalArgoApplicationName
1 parent 6fe8556 commit 1bc3e9d

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Terminal.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ function TerminalComponent({
160160
}/${selectedContainerName}`
161161
if (!isResourceBrowserView) {
162162
return (
163-
url+`?${isExternalArgoApp ? 'isArgo=true&' : ''}appType=${getK8sResourcePayloadAppType(appDetails.appType)}`
163+
url+`?${isExternalArgoApp ? `externalArgoApplicationName=${appDetails.appName}&` : ''}appType=${getK8sResourcePayloadAppType(appDetails.appType)}`
164164
)
165165
}
166166
return url

src/components/v2/appDetails/k8Resource/nodeDetail/nodeDetail.api.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export const getManifestResource = (
2222
? createResourceRequestBody(selectedResource)
2323
: createBody(ad, podName, nodeType)
2424
const url =
25-
Routes.MANIFEST + (ad.appType === AppType.EXTERNAL_ARGO_APP && !isResourceBrowserView ? '?isArgo=true' : '')
25+
Routes.MANIFEST + (ad.appType === AppType.EXTERNAL_ARGO_APP && !isResourceBrowserView ? `?externalArgoApplicationName=${ad.appName}` : '')
2626
return post(url, requestData)
2727
}
2828

@@ -148,7 +148,7 @@ function getEventHelmApps(
148148
const requestData = isResourceBrowserView
149149
? createResourceRequestBody(selectedResource)
150150
: createBody(ad, nodeName, nodeType)
151-
const url = Routes.EVENTS + ((ad.appType === AppType.EXTERNAL_ARGO_APP && !isResourceBrowserView) ? '?isArgo=true' : '')
151+
const url = Routes.EVENTS + ((ad.appType === AppType.EXTERNAL_ARGO_APP && !isResourceBrowserView) ? `?externalArgoApplicationName=${ad.appName}` : '')
152152
return post(url, requestData)
153153
}
154154

@@ -175,7 +175,7 @@ export const getLogsURL = (
175175
if (isResourceBrowserView) {
176176
logsURL += `&clusterId=${clusterId}&namespace=${namespace}`
177177
} else if (ad.appType === AppType.EXTERNAL_ARGO_APP) {
178-
logsURL += `&clusterId=${ad.clusterId}&appType=${K8sResourcePayloadAppType.EXTERNAL_ARGO_APP}&namespace=${selectedNamespace}&isArgo=true`
178+
logsURL += `&clusterId=${ad.clusterId}&appType=${K8sResourcePayloadAppType.EXTERNAL_ARGO_APP}&namespace=${selectedNamespace}&externalArgoApplicationName=${ad.appName}`
179179
} else {
180180
const appType = getK8sResourcePayloadAppType(ad.appType)
181181
const deploymentType =
@@ -203,12 +203,12 @@ export const createResource = (
203203
return post(Routes.CREATE_RESOURCE, requestData)
204204
}
205205

206-
const getEphemeralURL = (isResourceBrowserView: boolean, params: ParamsType, appType: string, appIds: string) => {
206+
const getEphemeralURL = (isResourceBrowserView: boolean, params: ParamsType, appType: string, appIds: string, appName: string) => {
207207
let url: string = Routes.EPHEMERAL_CONTAINERS
208208
if (isResourceBrowserView) {
209209
url += `?identifier=${params.clusterId}`
210210
} else if (appType === AppType.EXTERNAL_ARGO_APP) {
211-
url += `?identifier=${params.clusterId}&clusterId=${params.clusterId}&appType=${K8sResourcePayloadAppType.EXTERNAL_ARGO_APP}&isArgo=true`
211+
url += `?identifier=${params.clusterId}&clusterId=${params.clusterId}&appType=${K8sResourcePayloadAppType.EXTERNAL_ARGO_APP}&externalArgoApplicationName=${appName}`
212212
} else {
213213
url += `?identifier=${appIds}&appType=${getK8sResourcePayloadAppType(appType)}`
214214
}
@@ -231,7 +231,7 @@ export const generateEphemeralUrl = (
231231
? generateDevtronAppIdentiferForK8sRequest(clusterId, appId, environmentId)
232232
: getAppId(clusterId, namespace, appName)
233233

234-
let url = getEphemeralURL(isResourceBrowserView, params, appType, appIds)
234+
let url = getEphemeralURL(isResourceBrowserView, params, appType, appIds, appName)
235235
return post(url, requestData)
236236
}
237237

@@ -251,6 +251,6 @@ export const deleteEphemeralUrl = (
251251
? generateDevtronAppIdentiferForK8sRequest(clusterId, appId, environmentId)
252252
: getAppId(clusterId, namespace, appName)
253253

254-
let url = getEphemeralURL(isResourceBrowserView, params, appType, appIds)
254+
let url = getEphemeralURL(isResourceBrowserView, params, appType, appIds, appName)
255255
return trash(url, requestData)
256256
}

0 commit comments

Comments
 (0)