Skip to content

Commit 8160370

Browse files
committed
fix(ui): some proerties are not checked for undefined
1 parent f2428c2 commit 8160370

1 file changed

Lines changed: 20 additions & 20 deletions

File tree

stackgres-k8s/src/admin-ui/src/components/forms/CreateSGShardedClusters.vue

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7626,7 +7626,7 @@
76267626
"distributedLogs": {
76277627
...(this.hasProp(previous, 'spec.distributedLogs') && previous.spec.distributedLogs),
76287628
...(( (typeof this.distributedLogs !== 'undefined') && this.distributedLogs.length ) && { "sgDistributedLogs": this.distributedLogs }),
7629-
...(this.retention.length && {
7629+
...(this.retention && this.retention.length && {
76307630
"retention": this.retention
76317631
})
76327632
}
@@ -7722,7 +7722,7 @@
77227722
"postgres": {
77237723
...(this.hasProp(previous, 'spec.postgres') && previous.spec.postgres),
77247724
"version": this.postgresVersion,
7725-
...(this.selectedExtensions.length && {
7725+
...(this.selectedExtensions && this.selectedExtensions.length && {
77267726
"extensions": this.selectedExtensions
77277727
} || {"extensions": null} ),
77287728
"flavor": this.flavor,
@@ -7739,16 +7739,16 @@
77397739
"coordinator": {
77407740
...(this.hasProp(previous, 'spec.coordinator') && previous.spec.coordinator),
77417741
"instances": this.coordinator.instances,
7742-
...(this.coordinator.sgInstanceProfile.length && {
7742+
...(this.coordinator.sgInstanceProfile && this.coordinator.sgInstanceProfile.length && {
77437743
"sgInstanceProfile": this.coordinator.sgInstanceProfile
77447744
}),
77457745
...( (this.hasProp(previous, 'spec.coordinator.configurations') || this.coordinator.configurations.sgPoolingConfig.length || this.coordinator.configurations.sgPostgresConfig.length) && ({
77467746
"configurations": {
77477747
...(this.hasProp(previous, 'spec.coordinator.configurations') && previous.spec.coordinator.configurations),
7748-
...(this.coordinator.configurations.sgPoolingConfig.length && {
7748+
...(this.coordinator.configurations.sgPoolingConfig && this.coordinator.configurations.sgPoolingConfig.length && {
77497749
"sgPoolingConfig": this.coordinator.configurations.sgPoolingConfig
77507750
}),
7751-
...(this.coordinator.configurations.sgPostgresConfig.length && {
7751+
...(this.coordinator.configurations.sgPostgresConfig && this.coordinator.configurations.sgPostgresConfig.length && {
77527752
"sgPostgresConfig": this.coordinator.configurations.sgPostgresConfig
77537753
}),
77547754
}
@@ -7792,20 +7792,20 @@
77927792
this.hasProp(previous, 'spec.coordinator.pods.scheduling') ||
77937793
(this.hasProp(this.coordinator, 'pods.scheduling.nodeSelector') && this.hasNodeSelectors(this.coordinator.pods.scheduling.nodeSelector)) ||
77947794
(this.hasProp(this.coordinator, 'pods.scheduling.tolerations') && this.hasTolerations(this.coordinator.pods.scheduling.tolerations)) ||
7795-
requiredAffinity.coordinator.length || preferredAffinity.coordinator.length
7795+
(requiredAffinity.coordinator && requiredAffinity.coordinator.length) || (preferredAffinity.coordinator && preferredAffinity.coordinator.length)
77967796
) && {
77977797
"scheduling": {
77987798
...(this.hasProp(previous, 'spec.coordinator.pods.scheduling') && previous.spec.coordinator.pods.scheduling),
77997799
...( (this.hasProp(this.coordinator, 'pods.scheduling.nodeSelector') && this.hasNodeSelectors(this.coordinator.pods.scheduling.nodeSelector)) && {"nodeSelector": this.parseProps(this.coordinator.pods.scheduling.nodeSelector, 'label')} || {"nodeSelector": null} ),
78007800
...( (this.hasProp(this.coordinator, 'pods.scheduling.tolerations') && this.hasTolerations(this.coordinator.pods.scheduling.tolerations)) && {"tolerations": this.coordinator.pods.scheduling.tolerations} || {"tolerations": null} ),
7801-
...(requiredAffinity.coordinator.length || preferredAffinity.coordinator.length ) && {
7801+
...((requiredAffinity.coordinator && requiredAffinity.coordinator.length) || (preferredAffinity.coordinator && preferredAffinity.coordinator.length) ) && {
78027802
"nodeAffinity": {
7803-
...(requiredAffinity.coordinator.length && {
7803+
...(requiredAffinity.coordinator && requiredAffinity.coordinator.length && {
78047804
"requiredDuringSchedulingIgnoredDuringExecution": {
78057805
"nodeSelectorTerms": requiredAffinity.coordinator
78067806
}
78077807
}),
7808-
...(preferredAffinity.coordinator.length && {
7808+
...(preferredAffinity.coordinator && preferredAffinity.coordinator.length && {
78097809
"preferredDuringSchedulingIgnoredDuringExecution": preferredAffinity.coordinator
78107810
})
78117811
}
@@ -7861,16 +7861,16 @@
78617861
...(this.hasProp(previous, 'spec.shards') && previous.spec.shards),
78627862
"clusters": this.shards.clusters,
78637863
"instancesPerCluster": this.shards.instancesPerCluster,
7864-
...(this.shards.sgInstanceProfile.length && {
7864+
...(this.shards.sgInstanceProfile && this.shards.sgInstanceProfile.length && {
78657865
"sgInstanceProfile": this.shards.sgInstanceProfile
78667866
}),
78677867
...( (this.hasProp(previous, 'spec.shards.configurations') || this.shards.configurations.sgPoolingConfig.length || this.shards.configurations.sgPostgresConfig.length) && ({
78687868
"configurations": {
78697869
...(this.hasProp(previous, 'spec.shards.configurations') && previous.spec.shards.configurations),
7870-
...(this.shards.configurations.sgPoolingConfig.length && {
7870+
...(this.shards.configurations.sgPoolingConfig && this.shards.configurations.sgPoolingConfig.length && {
78717871
"sgPoolingConfig": this.shards.configurations.sgPoolingConfig
78727872
}),
7873-
...(this.shards.configurations.sgPostgresConfig.length && {
7873+
...(this.shards.configurations.sgPostgresConfig && this.shards.configurations.sgPostgresConfig.length && {
78747874
"sgPostgresConfig": this.shards.configurations.sgPostgresConfig
78757875
}),
78767876
}
@@ -7914,20 +7914,20 @@
79147914
this.hasProp(previous, 'spec.shards.pods.scheduling') ||
79157915
(this.hasProp(this.shards, 'pods.scheduling.nodeSelector') && this.hasNodeSelectors(this.shards.pods.scheduling.nodeSelector)) ||
79167916
(this.hasProp(this.shards, 'pods.scheduling.tolerations') && this.hasTolerations(this.shards.pods.scheduling.tolerations)) ||
7917-
requiredAffinity.shards.length || preferredAffinity.shards.length
7917+
(requiredAffinity.shards && requiredAffinity.shards.length) || (preferredAffinity.shards && preferredAffinity.shards.length)
79187918
) && {
79197919
"scheduling": {
79207920
...(this.hasProp(previous, 'spec.shards.pods.scheduling') && previous.spec.shards.pods.scheduling),
79217921
...( (this.hasProp(this.shards, 'pods.scheduling.nodeSelector') && this.hasNodeSelectors(this.shards.pods.scheduling.nodeSelector)) && {"nodeSelector": this.parseProps(this.shards.pods.scheduling.nodeSelector, 'label')} || {"nodeSelector": null} ),
79227922
...( (this.hasProp(this.shards, 'pods.scheduling.tolerations') && this.hasTolerations(this.shards.pods.scheduling.tolerations)) && {"tolerations": this.shards.pods.scheduling.tolerations} || {"tolerations": null} ),
7923-
...(requiredAffinity.shards.length || preferredAffinity.shards.length ) && {
7923+
...((requiredAffinity.shards && requiredAffinity.shards.length) || (preferredAffinity.shards && preferredAffinity.shards.length) ) && {
79247924
"nodeAffinity": {
7925-
...(requiredAffinity.shards.length && {
7925+
...(requiredAffinity.shards && requiredAffinity.shards.length && {
79267926
"requiredDuringSchedulingIgnoredDuringExecution": {
79277927
"nodeSelectorTerms": requiredAffinity.shards
79287928
}
79297929
}),
7930-
...(preferredAffinity.shards.length && {
7930+
...(preferredAffinity.shards && preferredAffinity.shards.length && {
79317931
"preferredDuringSchedulingIgnoredDuringExecution": preferredAffinity.shards
79327932
})
79337933
}
@@ -8288,7 +8288,7 @@
82888288
override.pods.scheduling = (
82898289
(this.hasProp(override, 'pods.scheduling.nodeSelector') && this.hasNodeSelectors(override.pods.scheduling.nodeSelector)) ||
82908290
(this.hasProp(override, 'pods.scheduling.tolerations') && this.hasTolerations(override.pods.scheduling.tolerations)) ||
8291-
requiredAffinity.length || preferredAffinity.length
8291+
(requiredAffinity && requiredAffinity.length) || (preferredAffinity && preferredAffinity.length)
82928292
)
82938293
? {
82948294
...( (this.hasProp(override, 'pods.scheduling.nodeSelector') && this.hasNodeSelectors(override.pods.scheduling.nodeSelector)) && {
@@ -8297,14 +8297,14 @@
82978297
...( (this.hasProp(override, 'pods.scheduling.tolerations') && this.hasTolerations(override.pods.scheduling.tolerations)) && {
82988298
"tolerations": override.pods.scheduling.tolerations
82998299
} || {"tolerations": null} ),
8300-
...(requiredAffinity.length || preferredAffinity.length ) && {
8300+
...((requiredAffinity && requiredAffinity.length) || (preferredAffinity && preferredAffinity.length) ) && {
83018301
"nodeAffinity": {
8302-
...(requiredAffinity.length && {
8302+
...(requiredAffinity && requiredAffinity.length && {
83038303
"requiredDuringSchedulingIgnoredDuringExecution": {
83048304
"nodeSelectorTerms": requiredAffinity
83058305
}
83068306
}),
8307-
...(preferredAffinity.length && {
8307+
...(preferredAffinity && preferredAffinity.length && {
83088308
"preferredDuringSchedulingIgnoredDuringExecution": preferredAffinity
83098309
})
83108310
}

0 commit comments

Comments
 (0)