Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions charts/opskubedbcom-druidopsrequest-editor/ui/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@ export const useFunc = (model) => {
)

// Initialize on load
getDbDetails()
showAndInitOpsRequestType()

// ============================================================
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 []
}
Expand Down Expand Up @@ -2171,6 +2176,6 @@ export const useFunc = (model) => {
getNestedValue,
hasTopologyType,
getResourceConfig,
isTlsEnabled
isTlsEnabled,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,6 @@ export const useFunc = (model) => {
)

// Initialize on load
getDbDetails()
showAndInitOpsRequestType()

// =====================================================
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -2078,6 +2083,6 @@ export const useFunc = (model) => {
setApplyToIfReady,
hasResourceValue,
hasVolumeExpansion,
isTlsEnabled
isTlsEnabled,
}
}
11 changes: 8 additions & 3 deletions charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()
async function fetchJsons({ axios, itemCtx }) {
let ui = {}
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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 {
Expand Down
11 changes: 8 additions & 3 deletions charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()
async function fetchJsons({ axios, itemCtx }) {
let ui = {}
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()
async function fetchJsons({ axios, itemCtx }) {
let ui = {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()

async function fetchJsons({ axios, itemCtx }) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()
async function fetchJsons({ axios, itemCtx }) {
let ui = {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()

async function fetchJsons({ axios, itemCtx }) {
Expand Down
1 change: 0 additions & 1 deletion charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()
async function fetchJsons({ axios, itemCtx }) {
let ui = {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()
async function fetchJsons({ axios, itemCtx }) {
let ui = {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()
async function fetchJsons({ axios, itemCtx }) {
let ui = {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()

async function fetchJsons({ axios, itemCtx }) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()

async function fetchJsons({ axios, itemCtx }) {
Expand Down
11 changes: 8 additions & 3 deletions charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()
async function fetchJsons({ axios, itemCtx }) {
let ui = {}
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()

async function fetchJsons({ axios, itemCtx }) {
Expand Down
1 change: 0 additions & 1 deletion charts/opskubedbcom-redisopsrequest-editor/ui/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()
async function fetchJsons({ axios, itemCtx }) {
let ui = {}
Expand Down
11 changes: 8 additions & 3 deletions charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()
async function fetchJsons({ axios, itemCtx }) {
let ui = {}
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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 {
Expand Down
8 changes: 6 additions & 2 deletions charts/opskubedbcom-solropsrequest-editor/ui/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()

// for config secret
Expand Down Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,6 @@ export const useFunc = (model) => {
store.state,
)

getDbDetails()
showAndInitOpsRequestType()

function returnFalse() {
Expand Down
Loading