Merge pull request #2686 from devtron-labs/fix/chart-download-file-name-and-runner-param

AbhishekA1509 · web-flow · commit 24ed78d518f6 · 2025-05-06T16:24:13.000+05:30
fix: derive isolated env chart download file name from BE and fix runner query payload for that.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.10.0-patch-7-ng",
+        "@devtron-labs/devtron-fe-common-lib": "1.10.0-patch-8-ng",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
diff --git a/src/components/ApplicationGroup/AppGroup.types.ts b/src/components/ApplicationGroup/AppGroup.types.ts
@@ -95,15 +95,26 @@ export interface BulkCDDetailType
     resourceFilters?: FilterConditionsListType[]
 }
 
-export interface ResponseRowType {
+export type TriggerVirtualEnvResponseRowType =
+    | {
+          isVirtual: true
+          helmPackageName: string
+          cdWorkflowType: DeploymentNodeType
+      }
+    | {
+          isVirtual?: never
+          helmPackageName?: never
+          cdWorkflowType?: DeploymentNodeType
+      }
+
+export type ResponseRowType = {
     appId: number
     appName: string
     status: BulkResponseStatus
     statusText: string
     message: string
-    isVirtual?: boolean
     envId?: number
-}
+} & TriggerVirtualEnvResponseRowType
 
 interface BulkRuntimeParamsType {
     runtimeParams: Record<string, RuntimePluginVariables[]>
@@ -182,10 +193,10 @@ export interface TriggerResponseModalBodyProps {
     responseList: ResponseRowType[]
     isLoading: boolean
     isVirtualEnv?: boolean
-    envName?: string
 }
 
-export interface TriggerResponseModalFooterProps extends Pick<TriggerResponseModalBodyProps, 'isLoading' | 'responseList'> {
+export interface TriggerResponseModalFooterProps
+    extends Pick<TriggerResponseModalBodyProps, 'isLoading' | 'responseList'> {
     onClickRetryBuild: (appsToRetry: Record<string, boolean>) => void
     closePopup: (e) => void
 }
@@ -194,7 +205,6 @@ export interface TriggerModalRowType {
     rowData: ResponseRowType
     index: number
     isVirtualEnv?: boolean
-    envName?: string
 }
 
 export interface WorkflowNodeSelectionType {
diff --git a/src/components/ApplicationGroup/Details/TriggerView/BulkCDTrigger.tsx b/src/components/ApplicationGroup/Details/TriggerView/BulkCDTrigger.tsx
@@ -874,14 +874,13 @@ export default function BulkCDTrigger({
     return (
         <Drawer position="right" width="75%" minWidth="1024px" maxWidth="1200px">
             <div className="bg__primary bulk-ci-trigger-container">
-                <div className='flexbox-col flex-grow-1 dc__overflow-hidden'>
+                <div className="flexbox-col flex-grow-1 dc__overflow-hidden">
                     {renderHeaderSection()}
                     {responseListLength ? (
                         <TriggerResponseModalBody
                             responseList={responseList}
                             isLoading={isLoading}
                             isVirtualEnv={isVirtualEnv}
-                            envName={selectedApp.envName}
                         />
                     ) : (
                         renderBodySection()
diff --git a/src/components/ApplicationGroup/Details/TriggerView/EnvTriggerView.tsx b/src/components/ApplicationGroup/Details/TriggerView/EnvTriggerView.tsx
@@ -109,6 +109,7 @@ import {
     BulkCIDetailType,
     ProcessWorkFlowStatusType,
     ResponseRowType,
+    TriggerVirtualEnvResponseRowType,
     WorkflowAppSelectionType,
     WorkflowNodeSelectionType,
 } from '../../AppGroup.types'
@@ -1537,13 +1538,26 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
                             BULK_VIRTUAL_RESPONSE_STATUS[BulkResponseStatus.PASS],
                             BULK_CD_RESPONSE_STATUS_TEXT[BulkResponseStatus.PASS],
                         )
+
+                        const virtualEnvResponseRowType: TriggerVirtualEnvResponseRowType =
+                            [DeploymentNodeType.CD, DeploymentNodeType.POSTCD, DeploymentNodeType.PRECD].includes(
+                                bulkTriggerType,
+                            ) && isVirtualEnv
+                                ? {
+                                      isVirtual: true,
+                                      helmPackageName: response.value?.result?.helmPackageName,
+                                      cdWorkflowType: bulkTriggerType,
+                                  }
+                                : {}
+
                         _responseList.push({
                             appId: triggeredAppList[index].appId,
                             appName: triggeredAppList[index].appName,
                             statusText: statusType,
                             status: BulkResponseStatus.PASS,
                             envId: triggeredAppList[index].envId,
                             message: '',
+                            ...virtualEnvResponseRowType,
                         })
                     } else {
                         const errorReason = response.reason
diff --git a/src/components/ApplicationGroup/Details/TriggerView/TriggerModalTableRow.tsx b/src/components/ApplicationGroup/Details/TriggerView/TriggerModalTableRow.tsx
@@ -29,7 +29,7 @@ const DownloadManifestForVirtualEnvironmentButton = importComponentFromFELibrary
     'function',
 )
 
-export const TriggerModalRow = ({ rowData, index, isVirtualEnv, envName }: TriggerModalRowType) => {
+export const TriggerModalRow = ({ rowData, index, isVirtualEnv }: TriggerModalRowType) => {
     const { handleDownload } = useDownload()
 
     const renderStatusIcon = (responseRowData: ResponseRowType): JSX.Element => {
@@ -57,7 +57,8 @@ export const TriggerModalRow = ({ rowData, index, isVirtualEnv, envName }: Trigg
                 <DownloadManifestForVirtualEnvironmentButton
                     appId={rowData.appId}
                     envId={rowData.envId}
-                    appName={`${rowData.appName}-${envName}`}
+                    helmPackageName={rowData.helmPackageName}
+                    cdWorkflowType={rowData.cdWorkflowType}
                     handleDownload={handleDownload}
                     showSuccessfulToast={false}
                 />
diff --git a/src/components/ApplicationGroup/Details/TriggerView/TriggerResponseModal.tsx b/src/components/ApplicationGroup/Details/TriggerView/TriggerResponseModal.tsx
@@ -68,12 +68,7 @@ export const TriggerResponseModalFooter = ({
     )
 }
 
-const TriggerResponseModalBody = ({
-    responseList,
-    isLoading,
-    isVirtualEnv,
-    envName,
-}: TriggerResponseModalBodyProps) => {
+const TriggerResponseModalBody = ({ responseList, isLoading, isVirtualEnv }: TriggerResponseModalBodyProps) => {
     if (isLoading) {
         return <Progressing pageLoader />
     }
@@ -95,7 +90,6 @@ const TriggerResponseModalBody = ({
                         rowData={response}
                         index={index}
                         isVirtualEnv={isVirtualEnv}
-                        envName={envName}
                     />
                 ))}
         </div>
diff --git a/src/components/app/details/appDetails/SourceInfo.tsx b/src/components/app/details/appDetails/SourceInfo.tsx
@@ -26,6 +26,7 @@ import {
     DATE_TIME_FORMATS,
     DeploymentAppTypes,
     handleUTCTime,
+    logExceptionToSentry,
     Progressing,
     ReleaseMode,
     showError,
@@ -318,10 +319,14 @@ export const SourceInfo = ({
     const cardLoading = useMemo(() => loadingDetails || loadingResourceTree, [loadingDetails, loadingResourceTree])
 
     const renderGeneratedManifestDownloadCard = (): JSX.Element => {
+        if (!appDetails?.helmPackageName) {
+            logExceptionToSentry(new Error('Cannot find helm package name in appDetails while downloading'))
+        }
+
         const paramsId = {
             appId: +params.appId,
             envId: +params.envId,
-            appName: `${appDetails?.appName}-${appDetails?.environmentName}-${appDetails?.imageTag}`,
+            appName: appDetails?.helmPackageName || 'helm-package',
         }
         if (AppDetailsDownloadCard) {
             return <AppDetailsDownloadCard params={paramsId} />
@@ -395,13 +400,14 @@ export const SourceInfo = ({
                                   filteredEnvIds={filteredEnvIds}
                               />
                           )}
-                          {!appDetails?.deploymentAppDeleteRequest && !appMigratedFromExternalSourceAndIsNotTriggered && (
-                              <SecurityVulnerabilityCard
-                                  cardLoading={cardLoading}
-                                  appId={params.appId}
-                                  envId={params.envId}
-                              />
-                          )}
+                          {!appDetails?.deploymentAppDeleteRequest &&
+                              !appMigratedFromExternalSourceAndIsNotTriggered && (
+                                  <SecurityVulnerabilityCard
+                                      cardLoading={cardLoading}
+                                      appId={params.appId}
+                                      envId={params.envId}
+                                  />
+                              )}
                           <div className="flex right ml-auto">
                               {appDetails?.appStoreChartId && (
                                   <>
diff --git a/src/components/v2/appDetails/sourceInfo/environmentStatus/EnvironmentStatus.component.tsx b/src/components/v2/appDetails/sourceInfo/environmentStatus/EnvironmentStatus.component.tsx
@@ -126,7 +126,7 @@ const EnvironmentStatusComponent = ({
             const deploymentManifestParams = {
                 appId: +params.appId,
                 envId: +params.envId,
-                appName: appDetails?.helmPackageName,
+                appName: appDetails?.helmPackageName || 'helm-package',
                 isHelmApp: true,
             }
             return <AppDetailsDownloadCard params={deploymentManifestParams} />
diff --git a/src/components/v2/chartDeploymentHistory/ChartDeploymentHistory.component.tsx b/src/components/v2/chartDeploymentHistory/ChartDeploymentHistory.component.tsx
@@ -85,14 +85,12 @@ const ChartDeploymentHistory = ({
     isExternal,
     isVirtualEnvironment,
     isLoadingDetails,
-    helmAppPackageName,
 }: {
     appId: string
     appName?: string
     isExternal: boolean
     isVirtualEnvironment?: boolean
     isLoadingDetails?: boolean
-    helmAppPackageName?: string
 }) => {
     const params = useParams<{ envId: string }>()
     const [isLoading, setIsLoading] = useState(true)
@@ -503,7 +501,7 @@ const ChartDeploymentHistory = ({
         const paramsData = {
             appId,
             envId: params.envId,
-            appName: helmAppPackageName,
+            appName: deployment.helmPackageName,
             workflowId: deployment.version,
             isHelmApp: true,
         }
@@ -603,7 +601,7 @@ const ChartDeploymentHistory = ({
                     renderCodeEditor()}
                 {selectedDeploymentTabName === DEPLOYMENT_HISTORY_TAB.ARTIFACTS && VirtualHistoryArtifact && (
                     <VirtualHistoryArtifact
-                        titleName={`${helmAppPackageName}.tgz`}
+                        titleName={deployment.helmPackageName}
                         params={paramsData}
                         status={deployment.status}
                     />
diff --git a/src/components/v2/chartDeploymentHistory/chartDeploymentHistory.service.ts b/src/components/v2/chartDeploymentHistory/chartDeploymentHistory.service.ts
@@ -44,6 +44,7 @@ export interface ChartDeploymentDetail {
     deployedBy: string
     status: string
     message?: string
+    helmPackageName?: string
 }
 
 export interface RollbackReleaseRequest {
diff --git a/src/components/v2/index.tsx b/src/components/v2/index.tsx
@@ -52,7 +52,6 @@ const RouterComponent = ({ envType }) => {
     })
     const [loadingDetails, setLoadingDetails] = useState(false)
     const [loadingResourceTree, setLoadingResourceTree] = useState(false)
-    const [helmAppPackageName, setHelmAppPackageName] = useState('')
     // NOTE: this might seem like a duplicate of loadingResourceTree
     // but its not since loadingResourceTree runs a loader on the whole page
     // maybe we can rename loadingResourceTree
@@ -128,7 +127,6 @@ const RouterComponent = ({ envType }) => {
                 .then((response) => {
                     handlePublishAppDetails(response)
                     isVirtualRef.current = response.result?.isVirtualEnvironment
-                    setHelmAppPackageName(response.result?.helmPackageName)
                     if (fetchExternalLinks) {
                         getExternalLinksAndTools(response.result?.clusterId)
                     }
@@ -253,7 +251,6 @@ const RouterComponent = ({ envType }) => {
                                     isExternal={false}
                                     isLoadingDetails={loadingDetails}
                                     isVirtualEnvironment={isVirtualRef.current}
-                                    helmAppPackageName={helmAppPackageName}
                                 />
                             </Route>
                             <Redirect to={`${path}/${URLS.APP_DETAILS}`} />
diff --git a/yarn.lock b/yarn.lock
@@ -1126,10 +1126,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@devtron-labs/devtron-fe-common-lib@1.10.0-patch-7-ng":
-  version "1.10.0-patch-7-ng"
-  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.10.0-patch-7-ng.tgz#0e00d8f8aa59205bd8bbabe880280b69234ce2d6"
-  integrity sha512-27uxVUk+9LBxozh0Wu/g9Ds/Mut45WLMFX2bZY+OGPrSPXbM+aWi9uPjjTUIK7ZUfUUcSwd0KljRlsYMZ/CoJA==
+"@devtron-labs/devtron-fe-common-lib@1.10.0-patch-8-ng":
+  version "1.10.0-patch-8-ng"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.10.0-patch-8-ng.tgz#e1028f8b8c62257c2e6c6a0581d87f72b9fc1055"
+  integrity sha512-njv/fFWopmsgG2cnpZpDLixyBfEklZ290fMDOP7ENnlmKw6bj9U6glGRd8pXYi2u71Xqk9YeP0k8LpchnvrVIw==
   dependencies:
     "@codemirror/lang-json" "6.0.1"
     "@codemirror/lang-yaml" "6.1.2"

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ const EnvironmentStatusComponent = ({`
`126`	`126`	`const deploymentManifestParams = {`
`127`	`127`	`appId: +params.appId,`
`128`	`128`	`envId: +params.envId,`
`129`		`- appName: appDetails?.helmPackageName,`
	`129`	`+ appName: appDetails?.helmPackageName \|\| 'helm-package',`
`130`	`130`	`isHelmApp: true,`
`131`	`131`	`}`
`132`	`132`	`return <AppDetailsDownloadCard params={deploymentManifestParams} />`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ export interface ChartDeploymentDetail {`
`44`	`44`	`deployedBy: string`
`45`	`45`	`status: string`
`46`	`46`	`message?: string`
	`47`	`+ helmPackageName?: string`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`export interface RollbackReleaseRequest {`