Skip to content

Commit 900b83d

Browse files
committed
fix: wrap with value check on display items
1 parent 63b1144 commit 900b83d

File tree

2 files changed

+20
-12
lines changed

2 files changed

+20
-12
lines changed

src/components/bulkEdits/BulkEdits.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,16 @@ class BulkEdits extends Component<BulkEditsProps, BulkEditsState> {
411411
<>
412412
{impactedObjects.deploymentTemplate.map((elm) => (
413413
<div>
414-
App Id: {elm.appId} <br />
415-
App Name: {elm.appName} <br />
414+
{elm.appId && (
415+
<>
416+
App Id: {elm.appId} <br />
417+
</>
418+
)}
419+
{elm.appName && (
420+
<>
421+
App Name: {elm.appName} <br />
422+
</>
423+
)}
416424
{elm.envId && (
417425
<>
418426
Environment Id: {elm.envId} <br />

src/components/bulkEdits/bulkedit.utils.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ export const OutputTabs: React.FC<OutputTabType> = ({ handleOutputTabs, outputNa
3131
const renderCmAndSecretResponseForOneApp = (CMandSecretOutputKeys: CMandSecretOutputKeys) => {
3232
return (
3333
<div>
34-
App Id: {CMandSecretOutputKeys.appId} <br />
35-
App Name: {CMandSecretOutputKeys.appName} <br />
34+
{CMandSecretOutputKeys.appId && <>App Id: {CMandSecretOutputKeys.appId} <br /></>}
35+
{CMandSecretOutputKeys.appName && <>App Name: {CMandSecretOutputKeys.appName} <br /></>}
3636
{CMandSecretOutputKeys.envId && <>Environment Id: {CMandSecretOutputKeys.envId} <br /></>}
3737
{CMandSecretOutputKeys.envName && <>Environment Name: {CMandSecretOutputKeys.envName} <br /></>}
38-
Names : {CMandSecretOutputKeys.names.join(', ')} <br />
39-
Message: {CMandSecretOutputKeys.message} <br />
38+
{CMandSecretOutputKeys.names && <>Names : {CMandSecretOutputKeys.names.join(', ')} <br /></>}
39+
{CMandSecretOutputKeys.message && <>Message: {CMandSecretOutputKeys.message} <br /></>}
4040
<br />
4141
</div>
4242
)
@@ -100,11 +100,11 @@ export const renderConfigMapOutput = (configMap) => {
100100
export const renderDTResponseForOneApp = (DTOutputKeys: DtOutputKeys) => {
101101
return (
102102
<div>
103-
App Id: {DTOutputKeys.appId} <br />
104-
App Name: {DTOutputKeys.appName} <br />
103+
{DTOutputKeys.appId && <>App Id: {DTOutputKeys.appId} <br /></>}
104+
{DTOutputKeys.appName && <>App Name: {DTOutputKeys.appName} <br /></>}
105105
{DTOutputKeys.envId && <>Environment Id: {DTOutputKeys.envId} <br /></>}
106106
{DTOutputKeys.envName && <>Environment Name: {DTOutputKeys.envName} <br /></>}
107-
Message: {DTOutputKeys.message} <br />
107+
{DTOutputKeys.message && <>Message: {DTOutputKeys.message} <br /></>}
108108
<br />
109109
</div>
110110
)
@@ -113,11 +113,11 @@ export const renderDTResponseForOneApp = (DTOutputKeys: DtOutputKeys) => {
113113
export const renderCMAndSecretImpObj = (CMandSecretImpactedObject: CMandSecretImpactedObjects) => {
114114
return (
115115
<div>
116-
App Id: {CMandSecretImpactedObject.appId} <br />
117-
App Name: {CMandSecretImpactedObject.appName} <br />
116+
{CMandSecretImpactedObject.appId && <>App Id: {CMandSecretImpactedObject.appId} <br /></>}
117+
{CMandSecretImpactedObject.appName && <>App Name: {CMandSecretImpactedObject.appName} <br /></>}
118118
{CMandSecretImpactedObject.envId && <>Environment Id: {CMandSecretImpactedObject.envId} <br /></>}
119119
{CMandSecretImpactedObject.envName && <>Environment Name: {CMandSecretImpactedObject.envName} <br /></>}
120-
Names : {CMandSecretImpactedObject.names.join(', ')} <br />
120+
{CMandSecretImpactedObject.names && CMandSecretImpactedObject.names.length > 0 && <>Names : {CMandSecretImpactedObject.names.join(', ')} <br /></>}
121121
<br />
122122
</div>
123123
)

0 commit comments

Comments
 (0)