Merge branch 'feat/flux-deployment' of https://github.com/devtron-labs/dashboard into add-gitlab

Author: arunjaindev

package.json

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

src/components/v2/chartDeploymentHistory/ChartDeploymentHistory.component.tsx

@@ -511,7 +511,8 @@ const ChartDeploymentHistory = ({
                         isHelmApps
                         isGitops={
                             installedAppInfo?.deploymentType === DeploymentAppTypes.GITOPS ||
-                            installedAppInfo?.deploymentType === DeploymentAppTypes.MANIFEST_DOWNLOAD
+                            installedAppInfo?.deploymentType === DeploymentAppTypes.MANIFEST_DOWNLOAD ||
+                            installedAppInfo?.deploymentType === DeploymentAppTypes.FLUX
                         }
                         installedAppVersionHistoryId={deployment.version}
                         isVirtualEnvironment={isVirtualEnvironment}

src/components/v2/values/chartValuesDiff/ChartValuesView.component.tsx

@@ -293,7 +293,7 @@ export const DeploymentAppRadioGroup = ({
                         value={DeploymentAppTypes.GITOPS}
                         disabled={allowedDeploymentTypes.indexOf(DeploymentAppTypes.GITOPS) === -1}
                     >
-                        GitOps
+                        GitOps (Via Argo CD)
                     </RadioGroupItem>
                 </ConditionalWrap>
             )}
@@ -313,7 +313,7 @@ export const DeploymentAppRadioGroup = ({
                         value={DeploymentAppTypes.FLUX}
                         disabled={allowedDeploymentTypes.indexOf(DeploymentAppTypes.FLUX) === -1}
                     >
-                        Flux
+                        GitOps (Via Flux CD)
                     </RadioGroupItem>
                 </ConditionalWrap>
             )}

yarn.lock

@@ -1124,10 +1124,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@devtron-labs/[email protected]":
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.15.2.tgz#a420e9187c8bfd5fb9a5f3e5bbe1744278718d53"
-  integrity sha512-PNg9S/UjHNqVac8V0JGi3RgxPt0D48hy4eMbJCvOLSn/aUXVe5t+Ik7CNyjeiiQ5SOG2Ly4ry1wDGQkqXm2Wdw==
+"@devtron-labs/[email protected]-beta-2":
+  version "1.15.2-beta-2"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.15.2-beta-2.tgz#dbf115cb424e469b371c5e4f8aa6f57a0feebe02"
+  integrity sha512-uUv5IV6mr7uTbA9b4VOCu2veIi6dZ2P0QYoPhKpZeqD8XW37wVer8CuCahUJTCXem3Z64sg7bAJSG5jNj633fw==
   dependencies:
     "@codemirror/lang-json" "6.0.1"
     "@codemirror/lang-yaml" "6.1.2"