Merge pull request #2339 from devtron-labs/chore/rc-26-ht-25-sync

chore: Merge branch 'hotfix-v0.25.0' of github.com:devtron-labs/dashboard in…
devtron-labs · Jan 3, 2025 · e958840 · e958840
2 parents 405b61c + b964072
commit e958840
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 5 deletions.
diff --git a/.env b/.env
@@ -59,6 +59,7 @@ FEATURE_CONFIG_DRIFT_ENABLE=false
 FEATURE_PROMO_EMBEDDED_BUTTON_TEXT=
 FEATURE_PROMO_EMBEDDED_MODAL_TITLE=
 FEATURE_PROMO_EMBEDDED_IFRAME_URL=
+FEATURE_SWAP_TRAFFIC_ENABLE=false
 FEATURE_RB_SYNC_CLUSTER_ENABLE=false
 FEATURE_BULK_RESTART_WORKLOADS_FROM_RB=deployment,rollout,daemonset,statefulset
 FEATURE_DEFAULT_MERGE_STRATEGY=

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.4.0",
+        "@devtron-labs/devtron-fe-common-lib": "1.4.0-patch-1",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

diff --git a/src/components/app/details/appDetails/SourceInfo.tsx b/src/components/app/details/appDetails/SourceInfo.tsx
@@ -52,6 +52,7 @@ import HelmAppConfigApplyStatusCard from '@Components/v2/appDetails/sourceInfo/e
 const AppDetailsDownloadCard = importComponentFromFELibrary('AppDetailsDownloadCard')
 const DeploymentWindowStatusCard = importComponentFromFELibrary('DeploymentWindowStatusCard')
 const ConfigSyncStatusButton = importComponentFromFELibrary('ConfigSyncStatusButton', null, 'function')
+const SwapTraffic = importComponentFromFELibrary('SwapTraffic', null, 'function')
 
 export const SourceInfo = ({
     appDetails,
@@ -206,6 +207,18 @@ export const SourceInfo = ({
                                         style={ButtonStyleType.neutral}
                                     />
                                 )}
+                                {window._env_.FEATURE_SWAP_TRAFFIC_ENABLE &&
+                                    SwapTraffic &&
+                                    !!appDetails.pcoId &&
+                                    !appDetails.trafficSwitched && (
+                                        <SwapTraffic
+                                            appName={appDetails.appName}
+                                            envName={appDetails.environmentName}
+                                            appId={appDetails.appId}
+                                            envId={appDetails.environmentId}
+                                            pcoId={appDetails.pcoId}
+                                        />
+                                    )}
                                 {!isVirtualEnvironment && showHibernateModal && (
                                     <Button
                                         dataTestId="app-details-hibernate-modal-button"

diff --git a/src/components/app/types.ts b/src/components/app/types.ts
@@ -137,6 +137,8 @@ export interface AppDetails extends CDModalProps {
     imageTag?: string
     isPipelineTriggered?: boolean
     releaseMode: ReleaseMode
+    trafficSwitched?: boolean
+    pcoId?: number
 }
 
 export interface LabelTag {

diff --git a/src/css/base.scss b/src/css/base.scss
@@ -5349,4 +5349,9 @@ details[open] {
     background: inherit;
     border: none;
     padding: inherit;
+    white-space: pre-wrap;       /* Since CSS 2.1 */
+    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+    white-space: -pre-wrap;      /* Opera 4-6 */
+    white-space: -o-pre-wrap;    /* Opera 7 */
+    word-wrap: break-word;       /* Internet Explorer 5.5+ */
 }
diff --git a/src/index.tsx b/src/index.tsx
@@ -160,6 +160,7 @@ if (!window || !window._env_) {
         FEATURE_CONFIG_DRIFT_ENABLE: false,
         FEATURE_PROMO_EMBEDDED_BUTTON_TEXT: '',
         FEATURE_PROMO_EMBEDDED_MODAL_TITLE: '',
+        FEATURE_SWAP_TRAFFIC_ENABLE: false,
         FEATURE_BULK_RESTART_WORKLOADS_FROM_RB: 'deployment,rollout,daemonset,statefulset',
         FEATURE_RB_SYNC_CLUSTER_ENABLE: true,
         FEATURE_PROMO_EMBEDDED_IFRAME_URL: '',

diff --git a/yarn.lock b/yarn.lock
@@ -974,10 +974,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@devtron-labs/[email protected]":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.4.0.tgz#c486cb98e5eabbe5d8e62976a541f12fa0f6ca99"
-  integrity sha512-n0ZGWXsE9SwogoACKKiViyZQyDRhu2OeApB4STGmBbIz9K03Gxz1t9zUKFWdvv9kCKJvILaZDveNpYyM8E3pAA==
+"@devtron-labs/[email protected]-patch-1":
+  version "1.4.0-patch-1"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.4.0-patch-1.tgz#cb9d8b3ded840bd5d9854a63c9f73270546c6eab"
+  integrity sha512-Y9etcYaTwSsLEPMVAxIhY6u7GqJ34yYZUu+U3hpMqIlsnC7EJ49LxqOFmC/2zHD/TgIWZb+k0kt8iwvkFvZc/w==
   dependencies:
     "@types/react-dates" "^21.8.6"
     ansi_up "^5.2.1"