Skip to content

Commit 9375588

Browse files
committed
fix double calls for opsrequest (#968)
Signed-off-by: Samiul <samiul@appscode.com>
1 parent 7b8f92b commit 9375588

File tree

19 files changed

+58
-36
lines changed

19 files changed

+58
-36
lines changed

charts/opskubedbcom-druidopsrequest-editor/ui/functions.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,6 @@ export const useFunc = (model) => {
335335
)
336336

337337
// Initialize on load
338-
getDbDetails()
339338
showAndInitOpsRequestType()
340339

341340
// ============================================================
@@ -457,9 +456,14 @@ export const useFunc = (model) => {
457456
} else return {}
458457
}
459458

460-
function isTlsEnabled() {
459+
function isTlsEnabled() {
461460
const dbDetails = getValue(discriminator, '/dbDetails')
462-
return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls
461+
return (
462+
(dbDetails?.spec?.sslMode &&
463+
dbDetails?.spec?.sslMode !== 'disabled' &&
464+
dbDetails?.spec?.sslMode !== 'disable') ||
465+
dbDetails?.spec?.tls
466+
)
463467
}
464468

465469
async function getDbVersions() {
@@ -851,7 +855,8 @@ export const useFunc = (model) => {
851855
memory: machineData.limits.memory,
852856
},
853857
}
854-
} else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
858+
} else
859+
return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
855860
}
856861
})
857862
} else {
@@ -1746,7 +1751,7 @@ export const useFunc = (model) => {
17461751
return getIssuer(url)
17471752
}
17481753
return clusterIssuers
1749-
}else if (!kind) {
1754+
} else if (!kind) {
17501755
commit('wizard/model$delete', '/spec/tls/issuerRef/name')
17511756
return []
17521757
}
@@ -2171,6 +2176,6 @@ export const useFunc = (model) => {
21712176
getNestedValue,
21722177
hasTopologyType,
21732178
getResourceConfig,
2174-
isTlsEnabled
2179+
isTlsEnabled,
21752180
}
21762181
}

charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ export const useFunc = (model) => {
326326
)
327327

328328
// Initialize on load
329-
getDbDetails()
330329
showAndInitOpsRequestType()
331330

332331
// =====================================================
@@ -482,7 +481,12 @@ export const useFunc = (model) => {
482481

483482
function isTlsEnabled() {
484483
const dbDetails = getValue(discriminator, '/dbDetails')
485-
return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls
484+
return (
485+
(dbDetails?.spec?.sslMode &&
486+
dbDetails?.spec?.sslMode !== 'disabled' &&
487+
dbDetails?.spec?.sslMode !== 'disable') ||
488+
dbDetails?.spec?.tls
489+
)
486490
}
487491

488492
function initDatabaseRef() {
@@ -903,7 +907,8 @@ export const useFunc = (model) => {
903907
memory: machineData.limits.memory,
904908
},
905909
}
906-
} else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
910+
} else
911+
return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
907912
}
908913
})
909914
} else {
@@ -2078,6 +2083,6 @@ export const useFunc = (model) => {
20782083
setApplyToIfReady,
20792084
hasResourceValue,
20802085
hasVolumeExpansion,
2081-
isTlsEnabled
2086+
isTlsEnabled,
20822087
}
20832088
}

charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ export const useFunc = (model) => {
315315
store.state,
316316
)
317317

318-
getDbDetails()
319318
showAndInitOpsRequestType()
320319
async function fetchJsons({ axios, itemCtx }) {
321320
let ui = {}
@@ -353,7 +352,12 @@ export const useFunc = (model) => {
353352

354353
function isTlsEnabled() {
355354
const dbDetails = getValue(discriminator, '/dbDetails')
356-
return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls
355+
return (
356+
(dbDetails?.spec?.sslMode &&
357+
dbDetails?.spec?.sslMode !== 'disabled' &&
358+
dbDetails?.spec?.sslMode !== 'disable') ||
359+
dbDetails?.spec?.tls
360+
)
357361
}
358362

359363
function isRancherManaged() {
@@ -749,7 +753,8 @@ export const useFunc = (model) => {
749753
memory: machineData.limits.memory,
750754
},
751755
}
752-
} else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
756+
} else
757+
return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
753758
}
754759
})
755760
} else {

charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ export const useFunc = (model) => {
318318
store.state,
319319
)
320320

321-
getDbDetails()
322321
showAndInitOpsRequestType()
323322
async function fetchJsons({ axios, itemCtx }) {
324323
let ui = {}
@@ -356,7 +355,12 @@ export const useFunc = (model) => {
356355

357356
function isTlsEnabled() {
358357
const dbDetails = getValue(discriminator, '/dbDetails')
359-
return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls
358+
return (
359+
(dbDetails?.spec?.sslMode &&
360+
dbDetails?.spec?.sslMode !== 'disabled' &&
361+
dbDetails?.spec?.sslMode !== 'disable') ||
362+
dbDetails?.spec?.tls
363+
)
360364
}
361365

362366
function isRancherManaged() {
@@ -773,7 +777,8 @@ export const useFunc = (model) => {
773777
memory: machineData.limits.memory,
774778
},
775779
}
776-
} else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
780+
} else
781+
return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
777782
}
778783
})
779784
} else {

charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@ export const useFunc = (model) => {
317317
store.state,
318318
)
319319

320-
getDbDetails()
321320
showAndInitOpsRequestType()
322321
async function fetchJsons({ axios, itemCtx }) {
323322
let ui = {}

charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@ export const useFunc = (model) => {
317317
store.state,
318318
)
319319

320-
getDbDetails()
321320
showAndInitOpsRequestType()
322321

323322
async function fetchJsons({ axios, itemCtx }) {

charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,6 @@ export const useFunc = (model) => {
328328
store.state,
329329
)
330330

331-
getDbDetails()
332331
showAndInitOpsRequestType()
333332
async function fetchJsons({ axios, itemCtx }) {
334333
let ui = {}

charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@ export const useFunc = (model) => {
317317
store.state,
318318
)
319319

320-
getDbDetails()
321320
showAndInitOpsRequestType()
322321

323322
async function fetchJsons({ axios, itemCtx }) {

charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@ export const useFunc = (model) => {
317317
store.state,
318318
)
319319

320-
getDbDetails()
321320
showAndInitOpsRequestType()
322321
async function fetchJsons({ axios, itemCtx }) {
323322
let ui = {}

charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ export const useFunc = (model) => {
318318
store.state,
319319
)
320320

321-
getDbDetails()
322321
showAndInitOpsRequestType()
323322
async function fetchJsons({ axios, itemCtx }) {
324323
let ui = {}

0 commit comments

Comments
 (0)