Skip to content

Commit 3545372

Browse files
Merge pull request #2731 from devtron-labs/fix/add-more-wfr-status
fix: handle missing, suspended and unknown deployment status in helm apps deployed via gitops
2 parents 04f5c61 + d559996 commit 3545372

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "1.14.0",
7+
"@devtron-labs/devtron-fe-common-lib": "1.14.1",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ const ChartValuesView = ({
160160
presetValueId: string
161161
envId: string
162162
}>()
163-
const { serverMode } = useMainContext()
163+
const { serverMode, isManifestScanningEnabled } = useMainContext()
164164
const { handleDownload } = useDownload()
165165
const chartValuesAbortRef = useRef<AbortController>(new AbortController())
166166
const [chartValuesList, setChartValuesList] = useState<ChartValuesType[]>(chartValuesListFromParent || [])
@@ -1809,12 +1809,15 @@ const ChartValuesView = ({
18091809
/>
18101810
)}
18111811
</div>
1812-
{!isExternalApp && (isDeployChartView || isUpdateAppView) && ToggleSecurityScan && (
1813-
<ToggleSecurityScan
1814-
isManifestScanEnabled={commonState.isManifestScanEnabled}
1815-
handleToggleSecurityScan={handleToggleSecurityScan}
1816-
/>
1817-
)}
1812+
{!isExternalApp &&
1813+
isManifestScanningEnabled &&
1814+
(isDeployChartView || isUpdateAppView) &&
1815+
ToggleSecurityScan && (
1816+
<ToggleSecurityScan
1817+
isManifestScanEnabled={commonState.isManifestScanEnabled}
1818+
handleToggleSecurityScan={handleToggleSecurityScan}
1819+
/>
1820+
)}
18181821
{!isDeployChartView &&
18191822
chartValueId !== '0' &&
18201823
!(

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,10 +1124,10 @@
11241124
dependencies:
11251125
"@jridgewell/trace-mapping" "0.3.9"
11261126

1127-
"@devtron-labs/[email protected].0":
1128-
version "1.14.0"
1129-
resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.14.0.tgz#92ea67194ae9b41381c32486edbfe977ee5e7f17"
1130-
integrity sha512-m/X69ppsT+EZT6mCB7NV0gEvaSaPG0Ieou96f+WWSD5x7sqxr950hkQ3moElv/9b1HYWWXor5Bd/NV22aI+9Nw==
1127+
"@devtron-labs/[email protected].1":
1128+
version "1.14.1"
1129+
resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.14.1.tgz#f47995e25e32600866aea0332394b01df53603a6"
1130+
integrity sha512-9ebIua7+Dgu+9GKUpK7tbYD38ftUGpNIByJwTZV2MldfSLtuJMHv8Jyxxmsyp9OUk5b87D59zQ6jleYk1V6ssA==
11311131
dependencies:
11321132
"@codemirror/lang-json" "6.0.1"
11331133
"@codemirror/lang-yaml" "6.1.2"

0 commit comments

Comments
 (0)