Skip to content

Commit 6758ab9

Browse files
committed
api integration for scret view acces api of manifest
1 parent 91764ec commit 6758ab9

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetail.component.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,19 +118,19 @@ function NodeDetailComponent({
118118
)
119119
const _resourceContainers = []
120120
if (result?.manifestResponse?.manifest?.spec) {
121-
if (Array.isArray(result.manifest.spec.containers)) {
121+
if (Array.isArray(result.manifestResponse.manifest.spec.containers)) {
122122
_resourceContainers.push(
123-
...result.manifest.spec.containers.map((_container) => ({
123+
...result.manifestResponse.manifest.spec.containers.map((_container) => ({
124124
name: _container.name,
125125
isInitContainer: false,
126126
isEphemeralContainer: false,
127127
})),
128128
)
129129
}
130130

131-
if (Array.isArray(result.manifest.spec.initContainers)) {
131+
if (Array.isArray(result.manifestResponse.manifest.spec.initContainers)) {
132132
_resourceContainers.push(
133-
...result.manifest.spec.initContainers.map((_container) => ({
133+
...result.manifestResponse.manifest.spec.initContainers.map((_container) => ({
134134
name: _container.name,
135135
isInitContainer: true,
136136
isEphemeralContainer: false,

src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Manifest.component.tsx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import MessageUI, { MsgUIType } from '../../../../common/message.ui'
1717
import { AppType, ManifestActionPropsType, NodeType } from '../../../appDetails.type'
1818
import YAML from 'yaml'
1919
import { toast } from 'react-toastify'
20-
import { Checkbox, DeploymentAppTypes, showError, ToastBody } from '@devtron-labs/devtron-fe-common-lib'
20+
import { Checkbox, CHECKBOX_VALUE, DeploymentAppTypes, showError, ToastBody } from '@devtron-labs/devtron-fe-common-lib'
2121
import { appendRefetchDataToUrl } from '../../../../../util/URLUtil'
2222
import {
2323
EA_MANIFEST_SECRET_EDIT_MODE_INFO_TEXT,
@@ -303,25 +303,25 @@ function ManifestComponent({
303303
updateEditor(_tab.name)
304304
}
305305

306-
const onChangeToggleShowDecodedValue = (codeEditorData) => {
306+
const onChangeToggleShowDecodedValue = () => {
307307
setShowDecodedData(!showDecodedData)
308-
const jsonManifestData = YAML.parse(codeEditorData)
308+
const jsonManifestData = YAML.parse(trimedManifestEditorData)
309309
if(!showDecodedData){
310310
setTrimedManifestEditorData(getDecodedEncodedSecretManifestData(jsonManifestData, true , showDecodedData) as string)
311311
} else {
312-
setTrimedManifestEditorData(getDecodedEncodedSecretManifestData(jsonManifestData, true, showDecodedData, true) as string)
312+
setTrimedManifestEditorData(getDecodedEncodedSecretManifestData(jsonManifestData, true, true) as string)
313313
}
314314
}
315315

316-
const renderShowDecodedValueCheckbox = (codeEditorData) => {
316+
const renderShowDecodedValueCheckbox = () => {
317317
return (
318318
<div className="flex left ml-8">
319319
<Checkbox
320320
rootClassName="mb-0-imp h-18"
321321
id="showDecodedValue"
322322
isChecked={showDecodedData}
323-
onChange={() => onChangeToggleShowDecodedValue(codeEditorData)}
324-
value="CHECKED"
323+
onChange={onChangeToggleShowDecodedValue}
324+
value={CHECKBOX_VALUE.CHECKED}
325325
/>
326326
Show decoded Value
327327
</div>
@@ -446,7 +446,9 @@ function ManifestComponent({
446446
}
447447
className="flex left"
448448
>
449-
{!isEditmode && secretViewAccess && renderShowDecodedValueCheckbox(trimedManifestEditorData)}
449+
{/* {!isEditmode && secretViewAccess && renderShowDecodedValueCheckbox()} */}
450+
{ renderShowDecodedValueCheckbox()}
451+
450452
</CodeEditor.Information>
451453
)}
452454
{activeTab === 'Compare' && (

src/components/v2/appDetails/k8Resource/nodeDetail/nodeDetail.util.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ export const getTrimmedManifestData = (
397397
manifestData: ManifestData,
398398
returnAsString: boolean = false,
399399
): ManifestData | string => {
400-
if (manifestData[MANIFEST_KEY_FIELDS?.METADATA]) {
400+
if (manifestData[MANIFEST_KEY_FIELDS.METADATA]) {
401401
const { [MANIFEST_KEY_FIELDS.MANAGED_FIELDS]: _, ...metadata } = manifestData[MANIFEST_KEY_FIELDS.METADATA]
402402
const trimmedManifestData = {...manifestData, [MANIFEST_KEY_FIELDS.METADATA]: metadata}
403403

@@ -410,10 +410,9 @@ export const getTrimmedManifestData = (
410410
export const getDecodedEncodedSecretManifestData = (
411411
manifestData: ManifestData,
412412
returnAsString: boolean = false,
413-
showDecodedData?: boolean,
414413
isEncoded?: boolean,
415414
): ManifestData | string => {
416-
if (manifestData && manifestData[MANIFEST_KEY_FIELDS.DATA]) {
415+
if (manifestData && manifestData?.MANIFEST_KEY_FIELDS.DATA) {
417416
const encodedData = {
418417
...manifestData,
419418
[MANIFEST_KEY_FIELDS.DATA]: decode(manifestData[MANIFEST_KEY_FIELDS.DATA], isEncoded),

0 commit comments

Comments
 (0)