Merge pull request #2694 from devtron-labs/fix-ng-changes-develop-sync

fix: derive helmPackageName from BE and fix runner queryParam for chart download

Author: AbhishekA1509

package.json

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

src/components/ApplicationGroup/AppGroup.types.ts

@@ -96,15 +96,26 @@ export interface BulkCDDetailType
     isExceptionUser?: boolean
 }
 
-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[]>
@@ -183,7 +194,6 @@ export interface TriggerResponseModalBodyProps {
     responseList: ResponseRowType[]
     isLoading: boolean
     isVirtualEnv?: boolean
-    envName?: string
 }
 
 type RetryFailedType =
@@ -206,7 +216,6 @@ export interface TriggerModalRowType {
     rowData: ResponseRowType
     index: number
     isVirtualEnv?: boolean
-    envName?: string
 }
 
 export interface WorkflowNodeSelectionType {

src/components/ApplicationGroup/Details/TriggerView/BulkCDTrigger.tsx

@@ -936,7 +936,6 @@ export default function BulkCDTrigger({
                             responseList={responseList}
                             isLoading={isLoading}
                             isVirtualEnv={isVirtualEnv}
-                            envName={selectedApp.envName}
                         />
                     ) : (
                         renderBodySection()

src/components/ApplicationGroup/Details/TriggerView/EnvTriggerView.tsx

@@ -110,6 +110,7 @@ import {
     BulkCIDetailType,
     ProcessWorkFlowStatusType,
     ResponseRowType,
+    TriggerVirtualEnvResponseRowType,
     WorkflowAppSelectionType,
     WorkflowNodeSelectionType,
 } from '../../AppGroup.types'
@@ -1544,13 +1545,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

src/components/ApplicationGroup/Details/TriggerView/TriggerModalTableRow.tsx

@@ -30,7 +30,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 => {
@@ -58,7 +58,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}
                 />

src/components/ApplicationGroup/Details/TriggerView/TriggerResponseModal.tsx

@@ -77,12 +77,7 @@ export const TriggerResponseModalFooter = ({
     )
 }
 
-const TriggerResponseModalBody = ({
-    responseList,
-    isLoading,
-    isVirtualEnv,
-    envName,
-}: TriggerResponseModalBodyProps) => {
+const TriggerResponseModalBody = ({ responseList, isLoading, isVirtualEnv }: TriggerResponseModalBodyProps) => {
     if (isLoading) {
         return <Progressing pageLoader />
     }
@@ -104,7 +99,6 @@ const TriggerResponseModalBody = ({
                         rowData={response}
                         index={index}
                         isVirtualEnv={isVirtualEnv}
-                        envName={envName}
                     />
                 ))}
         </div>

src/components/app/details/appDetails/SourceInfo.tsx

@@ -15,7 +15,7 @@
  */
 
 import { useMemo, useState } from 'react'
-import { Link, useHistory, useParams } from 'react-router-dom'
+import { Link, useParams } from 'react-router-dom'
 import ReactGA from 'react-ga4'
 import moment from 'moment'
 import {
@@ -27,6 +27,7 @@ import {
     DATE_TIME_FORMATS,
     DeploymentAppTypes,
     handleUTCTime,
+    logExceptionToSentry,
     Icon,
     Progressing,
     ReleaseMode,
@@ -351,10 +352,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} />

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} />

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)
@@ -494,7 +492,7 @@ const ChartDeploymentHistory = ({
         const paramsData = {
             appId,
             envId: params.envId,
-            appName: helmAppPackageName,
+            appName: deployment.helmPackageName,
             workflowId: deployment.version,
             isHelmApp: true,
         }
@@ -594,7 +592,7 @@ const ChartDeploymentHistory = ({
                     renderCodeEditor()}
                 {selectedDeploymentTabName === DEPLOYMENT_HISTORY_TAB.ARTIFACTS && VirtualHistoryArtifact && (
                     <VirtualHistoryArtifact
-                        titleName={`${helmAppPackageName}.tgz`}
+                        titleName={deployment.helmPackageName}
                         params={paramsData}
                         status={deployment.status}
                     />

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 {