From e80662bd3511420b49ec985a361c6fdfd7baf623 Mon Sep 17 00:00:00 2001
From: Arun Jain <arun.jain@devtron.ai>
Date: Wed, 18 Jun 2025 17:28:00 +0530
Subject: [PATCH 1/2] feat: rename deployment app type gitops to argo

---
 src/Common/Types.ts                                           | 2 +-
 .../Components/CICDHistory/DeploymentStatusBreakdown.tsx      | 4 ++--
 src/Shared/Components/CICDHistory/TriggerOutput.tsx           | 2 +-
 src/Shared/Components/DeploymentStatusBreakdown/utils.tsx     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Common/Types.ts b/src/Common/Types.ts
index f089e60f2..6ff682050 100644
--- a/src/Common/Types.ts
+++ b/src/Common/Types.ts
@@ -710,7 +710,7 @@ export interface CommonNodeAttr extends Pick<MandatoryPluginBaseStateType, 'isTr
 
 export enum DeploymentAppTypes {
     HELM = 'helm',
-    GITOPS = 'argo_cd',
+    ARGO = 'argo_cd',
     MANIFEST_DOWNLOAD = 'manifest_download',
     MANIFEST_PUSH = 'manifest_push',
     FLUX = 'flux_cd',
diff --git a/src/Shared/Components/CICDHistory/DeploymentStatusBreakdown.tsx b/src/Shared/Components/CICDHistory/DeploymentStatusBreakdown.tsx
index 6a7b8748b..aa8cd9bd9 100644
--- a/src/Shared/Components/CICDHistory/DeploymentStatusBreakdown.tsx
+++ b/src/Shared/Components/CICDHistory/DeploymentStatusBreakdown.tsx
@@ -60,8 +60,8 @@ const DeploymentStatusDetailBreakdown = ({
                     {(
                         [
                             TIMELINE_STATUS.GIT_COMMIT,
-                            ...(appDetails.deploymentAppType === DeploymentAppTypes.GITOPS ||
-                            deploymentAppType === DeploymentAppTypes.GITOPS
+                            ...(appDetails.deploymentAppType === DeploymentAppTypes.ARGO ||
+                            deploymentAppType === DeploymentAppTypes.ARGO
                                 ? [TIMELINE_STATUS.ARGOCD_SYNC, TIMELINE_STATUS.KUBECTL_APPLY]
                                 : []),
                         ] as DeploymentStatusDetailRowType['type'][]
diff --git a/src/Shared/Components/CICDHistory/TriggerOutput.tsx b/src/Shared/Components/CICDHistory/TriggerOutput.tsx
index 970356b39..f3929c229 100644
--- a/src/Shared/Components/CICDHistory/TriggerOutput.tsx
+++ b/src/Shared/Components/CICDHistory/TriggerOutput.tsx
@@ -128,7 +128,7 @@ const HistoryLogs: React.FC<HistoryLogsProps> = ({
                                 deploymentAppType={deploymentAppType}
                                 userApprovalMetadata={userApprovalMetadata}
                                 isGitops={
-                                    deploymentAppType === DeploymentAppTypes.GITOPS ||
+                                    deploymentAppType === DeploymentAppTypes.ARGO ||
                                     deploymentAppType === DeploymentAppTypes.FLUX ||
                                     deploymentAppType === DeploymentAppTypes.MANIFEST_DOWNLOAD ||
                                     deploymentAppType === DeploymentAppTypes.MANIFEST_PUSH
diff --git a/src/Shared/Components/DeploymentStatusBreakdown/utils.tsx b/src/Shared/Components/DeploymentStatusBreakdown/utils.tsx
index 956c4e217..b2f6f9154 100644
--- a/src/Shared/Components/DeploymentStatusBreakdown/utils.tsx
+++ b/src/Shared/Components/DeploymentStatusBreakdown/utils.tsx
@@ -62,7 +62,7 @@ const getDefaultDeploymentStatusTimeline = (
                 ...commonProps,
                 displayText: 'Push manifest to Git',
             },
-            ...(deploymentAppType === DeploymentAppTypes.GITOPS
+            ...(deploymentAppType === DeploymentAppTypes.ARGO
                 ? {
                       [TIMELINE_STATUS.ARGOCD_SYNC]: {
                           ...commonProps,

From bbcb6c7b0151ce18dee6ff8f123018ac7e342d53 Mon Sep 17 00:00:00 2001
From: Arun Jain <arun.jain@devtron.ai>
Date: Thu, 19 Jun 2025 15:29:04 +0530
Subject: [PATCH 2/2] chore: add feature flag

---
 src/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/index.ts b/src/index.ts
index ad1a12381..e671e1bee 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -171,6 +171,7 @@ export interface customEnv {
      * @default false
      */
     FEATURE_FLUX_DEPLOYMENTS_ENABLE?: boolean
+    FEATURE_LINK_EXTERNAL_FLUX_ENABLE?: boolean
 }
 declare global {
     interface Window {