Merge pull request #2110 from devtron-labs/v19-sync-to-v20

chore: V19-sync-to-v20

Author: vivek-devtron

package.json

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

src/components/v2/appDetails/sourceInfo/environmentStatus/EnvironmentStatus.component.tsx

@@ -202,7 +202,7 @@ const EnvironmentStatusComponent = ({
                     {renderLastUpdatedBlock()}
                     {renderChartUsedBlock()}
                     {renderUpgraderChartBlock()}
-                    {isScanV2Enabled && <SecurityVulnerabilityCard cardLoading={cardLoading} installedAppId={appDetails?.installedAppId} />}
+                    {isScanV2Enabled && appDetails?.appType === AppType.DEVTRON_HELM_CHART && <SecurityVulnerabilityCard cardLoading={cardLoading} installedAppId={appDetails?.installedAppId} />}
                 </div>
             )}
             {showAppStatusDetail && (

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

@@ -116,7 +116,7 @@ const ChartDeploymentHistory = ({
             DEPLOYMENT_HISTORY_TAB.SOURCE,
             DEPLOYMENT_HISTORY_TAB.VALUES_YAML,
             DEPLOYMENT_HISTORY_TAB.HELM_GENERATED_MANIFEST,
-            (ChartSecurityTab && isScanV2Enabled && DEPLOYMENT_HISTORY_TAB.SECURITY),
+            (ChartSecurityTab && isScanV2Enabled && !isExternal && DEPLOYMENT_HISTORY_TAB.SECURITY),
         ]
         if (installedAppInfo?.deploymentType === DeploymentAppTypes.GITOPS) {
             tabs.unshift(DEPLOYMENT_HISTORY_TAB.STEPS)
@@ -632,7 +632,7 @@ const ChartDeploymentHistory = ({
 
         return (
             <div className="trigger-details pb-20">
-                <div className="flex dc__content-space trigger-details__summary">
+                <div className="flex dc__content-space trigger-details__summary py-10 px-20">
                     <div className="flex left py-10 px-20 dc__gap-8">
                         <Rocket className="scn-6 icon-dim-20" />
                         <div className="cn-9 fs-14 fw-6" data-testid="deployed-at-heading">

src/css/base.scss

@@ -4941,3 +4941,69 @@ textarea::placeholder {
     animation-iteration-count: infinite;
     animation-timing-function: linear;
 }
+
+.security-policy--whitelist,
+.security-policy--whitelisted {
+    color: var(--G500);
+    text-transform: capitalize;
+}
+
+.security-policy--block {
+    color: var(--R500);
+    text-transform: capitalize;
+}
+.dc__transparent-div {
+    position: fixed;
+    background: transparent;
+    top: 0px;
+    left: 0px;
+    right: 0;
+    height: 100vh;
+    z-index: var(--transparent-div-index);
+}
+
+@-webkit-keyframes pulse {
+    0% {
+        -webkit-box-shadow: 0 0 0 0 rgba(255, 131, 0, 0.4);
+    }
+
+    70% {
+        -webkit-box-shadow: 0 0 0 10px rgba(255, 131, 0, 0.4);
+    }
+
+    100% {
+        -webkit-box-shadow: 0 0 0 0 rgba(255, 131, 0, 0.4);
+    }
+}
+
+@keyframes pulse {
+    0% {
+        -moz-box-shadow: 0 0 0 0 rgba(255, 131, 0, 0.4);
+        box-shadow: 0 0 0 0 rgba(255, 131, 0, 0.4);
+    }
+
+    70% {
+        -moz-box-shadow: 0 0 0 10px rgba(204, 169, 44, 0);
+        box-shadow: 0 0 0 10px rgba(204, 169, 44, 0);
+    }
+
+    100% {
+        -moz-box-shadow: 0 0 0 0 rgba(204, 169, 44, 0);
+        box-shadow: 0 0 0 0 rgba(204, 169, 44, 0);
+    }
+}
+
+.badge {
+    font-size: 10px;
+    border-radius: 10px;
+    background-color: var(--B500);
+    font-weight: 600;
+    font-style: normal;
+    font-stretch: normal;
+    line-height: 1.4;
+    letter-spacing: normal;
+    text-align: center;
+    color: var(--white);
+    padding: 2px 10px;
+    margin-left: 10px;
+}

yarn.lock

@@ -1346,10 +1346,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@devtron-labs/devtron-fe-common-lib@4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-4.0.2.tgz#0de79353aacc52d9f7dbcd8636a1b1ff6b4ce2cd"
-  integrity sha512-0wEAPHeKwLKZxAEyJOmPHSIFEmCVZZX7SiAukfLROrnnui5+jGOU+zy+CVhxtkGdzBULMWQ2DrcToPeB7aR3sw==
+"@devtron-labs/devtron-fe-common-lib@0.4.4":
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-0.4.4.tgz#2b2dbe17d82628017334ea0c3292127563dba863"
+  integrity sha512-G8QRY+gHN9IH1NG7L8+1etDjbbdgy2Waw344xOJcebEgFuN8ZBTtIREzgAC+QZp2qUiYmn4wA2fNWf30A1ywhw==
   dependencies:
     "@types/react-dates" "^21.8.6"
     ansi_up "^5.2.1"