From b93b8489ebfe685a2c3d19cddec568bd613ed2ad Mon Sep 17 00:00:00 2001 From: Samiul Date: Wed, 28 Jan 2026 16:50:05 +0600 Subject: [PATCH] fix double calls for opsrequest Signed-off-by: Samiul --- .../ui/functions.js | 17 +++++++++++------ .../ui/functions.js | 13 +++++++++---- .../ui/functions.js | 11 ++++++++--- .../ui/functions.js | 11 ++++++++--- .../ui/functions.js | 1 - .../ui/functions.js | 1 - .../ui/functions.js | 1 - .../ui/functions.js | 1 - .../ui/functions.js | 1 - .../ui/functions.js | 1 - .../ui/functions.js | 1 - .../ui/functions.js | 1 - .../ui/functions.js | 1 - .../ui/functions.js | 11 ++++++++--- .../ui/functions.js | 1 - .../ui/functions.js | 1 - .../ui/functions.js | 11 ++++++++--- .../ui/functions.js | 8 ++++++-- .../ui/functions.js | 1 - 19 files changed, 58 insertions(+), 36 deletions(-) diff --git a/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js b/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js index b1b00eecef..1eaf1a73ca 100644 --- a/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js @@ -335,7 +335,6 @@ export const useFunc = (model) => { ) // Initialize on load - getDbDetails() showAndInitOpsRequestType() // ============================================================ @@ -457,9 +456,14 @@ export const useFunc = (model) => { } else return {} } - function isTlsEnabled() { + function isTlsEnabled() { const dbDetails = getValue(discriminator, '/dbDetails') - return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + return ( + (dbDetails?.spec?.sslMode && + dbDetails?.spec?.sslMode !== 'disabled' && + dbDetails?.spec?.sslMode !== 'disable') || + dbDetails?.spec?.tls + ) } async function getDbVersions() { @@ -851,7 +855,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -1746,7 +1751,7 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers - }else if (!kind) { + } else if (!kind) { commit('wizard/model$delete', '/spec/tls/issuerRef/name') return [] } @@ -2171,6 +2176,6 @@ export const useFunc = (model) => { getNestedValue, hasTopologyType, getResourceConfig, - isTlsEnabled + isTlsEnabled, } } diff --git a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js index 7159618f9b..30f61f661d 100644 --- a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js @@ -326,7 +326,6 @@ export const useFunc = (model) => { ) // Initialize on load - getDbDetails() showAndInitOpsRequestType() // ===================================================== @@ -482,7 +481,12 @@ export const useFunc = (model) => { function isTlsEnabled() { const dbDetails = getValue(discriminator, '/dbDetails') - return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + return ( + (dbDetails?.spec?.sslMode && + dbDetails?.spec?.sslMode !== 'disabled' && + dbDetails?.spec?.sslMode !== 'disable') || + dbDetails?.spec?.tls + ) } function initDatabaseRef() { @@ -903,7 +907,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -2078,6 +2083,6 @@ export const useFunc = (model) => { setApplyToIfReady, hasResourceValue, hasVolumeExpansion, - isTlsEnabled + isTlsEnabled, } } diff --git a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js index a343e5204c..835f7c4e5f 100644 --- a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js @@ -315,7 +315,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() async function fetchJsons({ axios, itemCtx }) { let ui = {} @@ -353,7 +352,12 @@ export const useFunc = (model) => { function isTlsEnabled() { const dbDetails = getValue(discriminator, '/dbDetails') - return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + return ( + (dbDetails?.spec?.sslMode && + dbDetails?.spec?.sslMode !== 'disabled' && + dbDetails?.spec?.sslMode !== 'disable') || + dbDetails?.spec?.tls + ) } function isRancherManaged() { @@ -749,7 +753,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { diff --git a/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js b/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js index 8aae4b135c..cd2e7bbf49 100644 --- a/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js @@ -318,7 +318,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() async function fetchJsons({ axios, itemCtx }) { let ui = {} @@ -356,7 +355,12 @@ export const useFunc = (model) => { function isTlsEnabled() { const dbDetails = getValue(discriminator, '/dbDetails') - return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + return ( + (dbDetails?.spec?.sslMode && + dbDetails?.spec?.sslMode !== 'disabled' && + dbDetails?.spec?.sslMode !== 'disable') || + dbDetails?.spec?.tls + ) } function isRancherManaged() { @@ -773,7 +777,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { diff --git a/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js index 8df05164c5..9813457014 100644 --- a/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js @@ -317,7 +317,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() async function fetchJsons({ axios, itemCtx }) { let ui = {} diff --git a/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js b/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js index 73a459108c..7b673cf34c 100644 --- a/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js @@ -317,7 +317,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() async function fetchJsons({ axios, itemCtx }) { diff --git a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js index d90d9eb480..e65c32d43f 100644 --- a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js @@ -328,7 +328,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() async function fetchJsons({ axios, itemCtx }) { let ui = {} diff --git a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js index 406e2516ba..8595844a76 100644 --- a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js @@ -317,7 +317,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() async function fetchJsons({ axios, itemCtx }) { diff --git a/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js index 50af2e9937..9b2afbf891 100644 --- a/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js @@ -317,7 +317,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() async function fetchJsons({ axios, itemCtx }) { let ui = {} diff --git a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js index 2242010ee5..a36c71d3cf 100644 --- a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js @@ -318,7 +318,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() async function fetchJsons({ axios, itemCtx }) { let ui = {} diff --git a/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js b/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js index 72eb432c53..44bab3fca1 100644 --- a/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js @@ -318,7 +318,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() async function fetchJsons({ axios, itemCtx }) { let ui = {} diff --git a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js index fd785ca712..5f7e18a66b 100644 --- a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js @@ -318,7 +318,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() async function fetchJsons({ axios, itemCtx }) { diff --git a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js index ff28700e23..3f52e95c07 100644 --- a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js @@ -316,7 +316,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() async function fetchJsons({ axios, itemCtx }) { diff --git a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js index b67f691bf5..937f50a1b4 100644 --- a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js @@ -315,7 +315,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() async function fetchJsons({ axios, itemCtx }) { let ui = {} @@ -353,7 +352,12 @@ export const useFunc = (model) => { function isTlsEnabled() { const dbDetails = getValue(discriminator, '/dbDetails') - return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + return ( + (dbDetails?.spec?.sslMode && + dbDetails?.spec?.sslMode !== 'disabled' && + dbDetails?.spec?.sslMode !== 'disable') || + dbDetails?.spec?.tls + ) } function isRancherManaged() { @@ -731,7 +735,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { diff --git a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js index e43716f0cb..a035202d37 100644 --- a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js @@ -317,7 +317,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() async function fetchJsons({ axios, itemCtx }) { diff --git a/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js b/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js index 2da0031aad..c7c3692709 100644 --- a/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js @@ -317,7 +317,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() async function fetchJsons({ axios, itemCtx }) { let ui = {} diff --git a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js index e1a14235ca..ebf2bba522 100644 --- a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js @@ -317,7 +317,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() async function fetchJsons({ axios, itemCtx }) { let ui = {} @@ -355,7 +354,12 @@ export const useFunc = (model) => { function isTlsEnabled() { const dbDetails = getValue(discriminator, '/dbDetails') - return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + return ( + (dbDetails?.spec?.sslMode && + dbDetails?.spec?.sslMode !== 'disabled' && + dbDetails?.spec?.sslMode !== 'disable') || + dbDetails?.spec?.tls + ) } function isRancherManaged() { @@ -749,7 +753,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { diff --git a/charts/opskubedbcom-solropsrequest-editor/ui/functions.js b/charts/opskubedbcom-solropsrequest-editor/ui/functions.js index fd8bd8b1fa..79861c1456 100644 --- a/charts/opskubedbcom-solropsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-solropsrequest-editor/ui/functions.js @@ -317,7 +317,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() // for config secret @@ -359,7 +358,12 @@ export const useFunc = (model) => { function isTlsEnabled() { const dbDetails = getValue(discriminator, '/dbDetails') - return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + return ( + (dbDetails?.spec?.sslMode && + dbDetails?.spec?.sslMode !== 'disabled' && + dbDetails?.spec?.sslMode !== 'disable') || + dbDetails?.spec?.tls + ) } function isRancherManaged() { diff --git a/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js b/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js index 5e7832c6c3..8d0a4f3e70 100644 --- a/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js @@ -318,7 +318,6 @@ export const useFunc = (model) => { store.state, ) - getDbDetails() showAndInitOpsRequestType() function returnFalse() {