From 796607904672ff5b99376b25edca7a05dfdb86c6 Mon Sep 17 00:00:00 2001
From: sourav-roy <souravroy@appscode.com>
Date: Mon, 26 Jan 2026 12:15:40 +0600
Subject: [PATCH 1/6] sslMode logic added to TLS configure

Signed-off-by: sourav-roy <souravroy@appscode.com>
---
 .../ui/create-ui.yaml                                     | 4 ++--
 .../opskubedbcom-mongodbopsrequest-editor/ui/functions.js | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml
index 217d9d5599..d0238881c5 100644
--- a/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml
@@ -1516,7 +1516,7 @@ step:
             label: Remove TLS
             fullwidth: true
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
             schema: schema/properties/spec/properties/tls/properties/remove
           - type: switch
@@ -1524,7 +1524,7 @@ step:
             fullwidth: true
             schema: schema/properties/spec/properties/tls/properties/rotateCertificates
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
           - type: block-layout
             label: Issuer Reference
diff --git a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
index 9a507605c2..46848cde33 100644
--- a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
@@ -364,6 +364,12 @@ export const useFunc = (model) => {
     return true
   }
 
+  function isTlsEnabled() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    const sslMode = dbDetails?.spec?.sslMode
+    return sslMode !== 'disabled'
+  }
+
   function isRancherManaged() {
     const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers')
     const found = managers.find((item) => item === 'Rancher')
@@ -427,6 +433,7 @@ export const useFunc = (model) => {
     if (namespace && name) {
       const url = `/clusters/${owner}/${cluster}/proxy/kubedb.com/v1alpha2/namespaces/${namespace}/mongodbs/${name}`
       const resp = await axios.get(url)
+      console.log('MongoDB details response:', resp.data.spec.sslMode)
 
       setDiscriminatorValue('/dbDetails', resp.data || {})
 
@@ -1879,5 +1886,6 @@ export const useFunc = (model) => {
     onCreateSecretChange,
     cancelCreateSecret,
     onSelectedSecretChange,
+    isTlsEnabled,
   }
 }

From 102e7f2daa9e75b7be023f8122361c45bc74f5c2 Mon Sep 17 00:00:00 2001
From: sourav-roy <souravroy@appscode.com>
Date: Mon, 26 Jan 2026 14:01:45 +0600
Subject: [PATCH 2/6] api kind select issue fixed

Signed-off-by: sourav-roy <souravroy@appscode.com>
---
 .../ui/create-ui.yaml                                  |  4 ++--
 .../ui/functions.js                                    | 10 ++++++++++
 .../ui/functions.js                                    |  3 +++
 .../ui/functions.js                                    |  3 +++
 .../ui/functions.js                                    |  3 +++
 .../ui/functions.js                                    |  3 +++
 .../ui/functions.js                                    |  4 +++-
 .../ui/functions.js                                    |  3 +++
 .../ui/functions.js                                    |  3 +++
 .../ui/functions.js                                    |  3 +++
 .../ui/functions.js                                    |  3 +++
 .../ui/functions.js                                    |  3 +++
 .../ui/functions.js                                    |  3 +++
 .../ui/functions.js                                    |  3 +++
 .../ui/functions.js                                    |  3 +++
 .../ui/functions.js                                    |  3 +++
 .../ui/functions.js                                    |  3 +++
 .../opskubedbcom-solropsrequest-editor/ui/functions.js |  3 +++
 18 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml
index 87ee766452..d98759b7c8 100644
--- a/charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml
@@ -689,14 +689,14 @@ step:
             fullwidth: true
             if:
               type: function
-              name: returnFalse
+              name: isTlsEnabled
             schema: schema/properties/spec/properties/tls/properties/remove
           - type: switch
             label: Rotate Certificates
             fullwidth: true
             if:
               type: function
-              name: returnFalse
+              name: isTlsEnabled
             schema: schema/properties/spec/properties/tls/properties/rotateCertificates
           - type: block-layout
             if:
diff --git a/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js b/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js
index d1ef674046..e89dd573ec 100644
--- a/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js
@@ -455,6 +455,12 @@ export const useFunc = (model) => {
     } else return {}
   }
 
+    function isTlsEnabled() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    const sslMode = dbDetails?.spec?.sslMode
+    return sslMode !== 'disabled'
+  }
+
   async function getDbVersions() {
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
@@ -1741,6 +1747,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    }else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {
@@ -2163,5 +2172,6 @@ export const useFunc = (model) => {
     getNestedValue,
     hasTopologyType,
     getResourceConfig,
+    isTlsEnabled
   }
 }
diff --git a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js
index 422b157eeb..27abc4849b 100644
--- a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js
@@ -1664,6 +1664,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    } else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {
diff --git a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js
index 0de3f797cd..1ffd7a0904 100644
--- a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js
@@ -1035,6 +1035,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    } else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {
diff --git a/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js b/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js
index c9880fb815..a4f4b0b446 100644
--- a/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js
@@ -1549,6 +1549,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    } else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {
diff --git a/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js
index 2a4b975299..26ae2123aa 100644
--- a/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js
@@ -1432,6 +1432,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    } else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {
diff --git a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
index 46848cde33..085928889b 100644
--- a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
@@ -433,7 +433,6 @@ export const useFunc = (model) => {
     if (namespace && name) {
       const url = `/clusters/${owner}/${cluster}/proxy/kubedb.com/v1alpha2/namespaces/${namespace}/mongodbs/${name}`
       const resp = await axios.get(url)
-      console.log('MongoDB details response:', resp.data.spec.sslMode)
 
       setDiscriminatorValue('/dbDetails', resp.data || {})
 
@@ -1507,6 +1506,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    } else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {
diff --git a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js
index 96102b60f6..241f12ba08 100644
--- a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js
@@ -1430,6 +1430,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    } else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {
diff --git a/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
index 3d89d34b4b..fd1a4b88a0 100644
--- a/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
@@ -1444,6 +1444,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    } else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {
diff --git a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js
index b575be8271..ce1ba63e24 100644
--- a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js
@@ -1435,6 +1435,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    } else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {
diff --git a/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js b/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js
index 0b5c680993..285705fb78 100644
--- a/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js
@@ -1427,6 +1427,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    } else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {
diff --git a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js
index 94c6f3df62..ba51b07523 100644
--- a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js
@@ -1504,6 +1504,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    } else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {
diff --git a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js
index 709b82118b..aa783f4d93 100644
--- a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js
@@ -1455,6 +1455,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    } else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {
diff --git a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js
index a876c26a74..45a5e42aaa 100644
--- a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js
@@ -1056,6 +1056,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    } else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {
diff --git a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js
index badf868eea..5577c88ec2 100644
--- a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js
@@ -1422,6 +1422,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    } else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {
diff --git a/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js b/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js
index 044238d55e..90d36310d8 100644
--- a/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js
@@ -1485,6 +1485,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    } else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {
diff --git a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js
index 05e0e26547..45d83c25b7 100644
--- a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js
@@ -1538,6 +1538,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    } else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {
diff --git a/charts/opskubedbcom-solropsrequest-editor/ui/functions.js b/charts/opskubedbcom-solropsrequest-editor/ui/functions.js
index 150b1928cb..8806020dad 100644
--- a/charts/opskubedbcom-solropsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-solropsrequest-editor/ui/functions.js
@@ -1477,6 +1477,9 @@ export const useFunc = (model) => {
         return getIssuer(url)
       }
       return clusterIssuers
+    } else if (!kind) {
+      commit('wizard/model$delete', '/spec/tls/issuerRef/name')
+      return []
     }
 
     async function getIssuer(url) {

From 3a2eba07e2231d664f63484a59f170fbc35af84f Mon Sep 17 00:00:00 2001
From: sourav-roy <souravroy@appscode.com>
Date: Mon, 26 Jan 2026 15:20:37 +0600
Subject: [PATCH 3/6] isTlsEnabled added

Signed-off-by: sourav-roy <souravroy@appscode.com>
---
 .../opskubedbcom-druidopsrequest-editor/ui/functions.js   | 5 ++---
 .../ui/create-ui.yaml                                     | 8 ++++----
 .../ui/functions.js                                       | 6 ++++++
 .../ui/create-ui.yaml                                     | 4 ++--
 .../ui/functions.js                                       | 6 ++++++
 .../opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml | 4 ++--
 .../opskubedbcom-kafkaopsrequest-editor/ui/functions.js   | 6 ++++++
 .../ui/create-ui.yaml                                     | 4 ++--
 .../opskubedbcom-mariadbopsrequest-editor/ui/functions.js | 6 ++++++
 .../opskubedbcom-mongodbopsrequest-editor/ui/functions.js | 7 +++----
 .../opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml | 4 ++--
 .../opskubedbcom-mysqlopsrequest-editor/ui/functions.js   | 6 ++++++
 .../ui/create-ui.yaml                                     | 4 ++--
 .../ui/functions.js                                       | 6 ++++++
 .../ui/create-ui.yaml                                     | 4 ++--
 .../opskubedbcom-pgpoolopsrequest-editor/ui/functions.js  | 6 ++++++
 .../ui/create-ui.yaml                                     | 4 ++--
 .../ui/functions.js                                       | 6 ++++++
 .../ui/create-ui.yaml                                     | 4 ++--
 .../ui/functions.js                                       | 6 ++++++
 .../ui/create-ui.yaml                                     | 4 ++--
 .../ui/functions.js                                       | 6 ++++++
 .../opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml | 4 ++--
 .../opskubedbcom-redisopsrequest-editor/ui/functions.js   | 6 ++++++
 .../ui/create-ui.yaml                                     | 4 ++--
 .../ui/functions.js                                       | 6 ++++++
 .../opskubedbcom-solropsrequest-editor/ui/create-ui.yaml  | 4 ++--
 charts/opskubedbcom-solropsrequest-editor/ui/functions.js | 6 ++++++
 28 files changed, 111 insertions(+), 35 deletions(-)

diff --git a/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js b/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js
index e89dd573ec..4771109132 100644
--- a/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js
@@ -455,10 +455,9 @@ export const useFunc = (model) => {
     } else return {}
   }
 
-    function isTlsEnabled() {
+   function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    const sslMode = dbDetails?.spec?.sslMode
-    return sslMode !== 'disabled'
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
   }
 
   async function getDbVersions() {
diff --git a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml
index b3b94b6ed6..681424f9e5 100644
--- a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml
@@ -1335,18 +1335,18 @@ step:
                 - temp/tlsOperation
             schema: temp/tlsOperation
           - type: switch
-            label: 'Remove TLS'
+            label: Remove TLS
             fullwidth: true
             if:
               type: function
-              name: returnFalse
+              name: isTlsEnabled
             schema: schema/properties/spec/properties/tls/properties/remove
           - type: switch
-            label: 'Rotate Certificates'
+            label: Rotate Certificates
             fullwidth: true
             if:
               type: function
-              name: returnFalse
+              name: isTlsEnabled
             schema: schema/properties/spec/properties/tls/properties/rotateCertificates
           - type: block-layout
             label: Issuer Reference
diff --git a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js
index 27abc4849b..01e6dcfec8 100644
--- a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js
@@ -478,6 +478,11 @@ export const useFunc = (model) => {
     } else return {}
   }
 
+  function isTlsEnabled() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+  }
+
   function initDatabaseRef() {
     // watchDependency('model#/metadata/namespace')
     const { name } = route.params || {}
@@ -2073,5 +2078,6 @@ export const useFunc = (model) => {
     setApplyToIfReady,
     hasResourceValue,
     hasVolumeExpansion,
+    isTlsEnabled
   }
 }
diff --git a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml
index 0e4aea9ee8..1a9f1664c2 100644
--- a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml
@@ -307,7 +307,7 @@ step:
             label: Remove TLS
             fullwidth: true
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
             schema: schema/properties/spec/properties/tls/properties/remove
           - type: switch
@@ -315,7 +315,7 @@ step:
             fullwidth: true
             schema: schema/properties/spec/properties/tls/properties/rotateCertificates
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
           - type: block-layout
             label: Issuer Reference
diff --git a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js
index 1ffd7a0904..ca20b387fa 100644
--- a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js
@@ -351,6 +351,11 @@ export const useFunc = (model) => {
     return false
   }
 
+  function isTlsEnabled() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+  }
+
   function isRancherManaged() {
     const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers')
     const found = managers.find((item) => item === 'Rancher')
@@ -1275,5 +1280,6 @@ export const useFunc = (model) => {
     setMachine,
     onMachineChange,
     isMachineCustom,
+    isTlsEnabled,
   }
 }
diff --git a/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml
index 6754078f21..44cf70a820 100644
--- a/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml
@@ -639,7 +639,7 @@ step:
             label: Remove TLS
             fullwidth: true
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
             schema: schema/properties/spec/properties/tls/properties/remove
           - type: switch
@@ -647,7 +647,7 @@ step:
             fullwidth: true
             schema: schema/properties/spec/properties/tls/properties/rotateCertificates
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
           - type: block-layout
             label: Issuer Reference
diff --git a/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js b/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js
index a4f4b0b446..8bb2108b11 100644
--- a/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js
@@ -354,6 +354,11 @@ export const useFunc = (model) => {
     return false
   }
 
+  function isTlsEnabled() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+  }
+
   function isRancherManaged() {
     const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers')
     const found = managers.find((item) => item === 'Rancher')
@@ -1833,5 +1838,6 @@ export const useFunc = (model) => {
     onRemoveConfigChange,
     onNewConfigSecretChange,
     onSelectedSecretChange,
+    isTlsEnabled,
   }
 }
diff --git a/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml
index 8b7188a519..06a39c15c8 100644
--- a/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml
@@ -460,7 +460,7 @@ step:
             label: Remove TLS
             fullwidth: true
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
             schema: schema/properties/spec/properties/tls/properties/remove
           - type: switch
@@ -468,7 +468,7 @@ step:
             fullwidth: true
             schema: schema/properties/spec/properties/tls/properties/rotateCertificates
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
           - type: switch
             label: Require SSL
diff --git a/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js
index 26ae2123aa..fe6b7101b6 100644
--- a/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js
@@ -353,6 +353,11 @@ export const useFunc = (model) => {
     return false
   }
 
+  function isTlsEnabled() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+  }
+
   function isRancherManaged() {
     const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers')
     const found = managers.find((item) => item === 'Rancher')
@@ -1795,5 +1800,6 @@ export const useFunc = (model) => {
     onRemoveConfigChange,
     onNewConfigSecretChange,
     onSelectedSecretChange,
+    isTlsEnabled,
   }
 }
diff --git a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
index 085928889b..caf20bd2f9 100644
--- a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
@@ -364,12 +364,11 @@ export const useFunc = (model) => {
     return true
   }
 
-  function isTlsEnabled() {
+   function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    const sslMode = dbDetails?.spec?.sslMode
-    return sslMode !== 'disabled'
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
   }
-
+  
   function isRancherManaged() {
     const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers')
     const found = managers.find((item) => item === 'Rancher')
diff --git a/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml
index f88e2eab6e..d1e7474af8 100644
--- a/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml
@@ -503,7 +503,7 @@ step:
             label: Remove TLS
             fullwidth: true
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
             schema: schema/properties/spec/properties/tls/properties/remove
           - type: switch
@@ -511,7 +511,7 @@ step:
             fullwidth: true
             schema: schema/properties/spec/properties/tls/properties/rotateCertificates
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
           - type: block-layout
             label: Require SSL
diff --git a/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
index fd1a4b88a0..97f7382dc7 100644
--- a/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
@@ -353,6 +353,11 @@ export const useFunc = (model) => {
     return false
   }
 
+  function isTlsEnabled() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+  }
+
   function isRancherManaged() {
     const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers')
     const found = managers.find((item) => item === 'Rancher')
@@ -1830,5 +1835,6 @@ export const useFunc = (model) => {
     onRemoveConfigChange,
     onNewConfigSecretChange,
     onSelectedSecretChange,
+    isTlsEnabled,
   }
 }
diff --git a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml
index ba9ee4a19d..b7084be6f3 100644
--- a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml
@@ -481,7 +481,7 @@ step:
             label: Remove TLS
             fullwidth: true
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
             schema: schema/properties/spec/properties/tls/properties/remove
           - type: switch
@@ -489,7 +489,7 @@ step:
             fullwidth: true
             schema: schema/properties/spec/properties/tls/properties/rotateCertificates
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
           - type: block-layout
             label: Issuer Reference
diff --git a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js
index ce1ba63e24..a23e77b22c 100644
--- a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js
@@ -354,6 +354,11 @@ export const useFunc = (model) => {
     return false
   }
 
+  function isTlsEnabled() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+  }
+
   function isRancherManaged() {
     const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers')
     const found = managers.find((item) => item === 'Rancher')
@@ -1793,5 +1798,6 @@ export const useFunc = (model) => {
     onRemoveConfigChange,
     onNewConfigSecretChange,
     onSelectedSecretChange,
+    isTlsEnabled,
   }
 }
diff --git a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml
index 9caeba2ed6..55a85054fb 100644
--- a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml
@@ -422,7 +422,7 @@ step:
             label: Remove TLS
             fullwidth: true
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
             schema: schema/properties/spec/properties/tls/properties/remove
           - type: switch
@@ -430,7 +430,7 @@ step:
             fullwidth: true
             schema: schema/properties/spec/properties/tls/properties/rotateCertificates
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
           - type: block-layout
             label: Issuer Reference
diff --git a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js
index ba51b07523..40fdadb71c 100644
--- a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js
@@ -355,6 +355,11 @@ export const useFunc = (model) => {
     return false
   }
 
+  function isTlsEnabled() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+  }
+
   function isRancherManaged() {
     const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers')
     const found = managers.find((item) => item === 'Rancher')
@@ -1770,5 +1775,6 @@ export const useFunc = (model) => {
     onRemoveConfigChange,
     onNewConfigSecretChange,
     onSelectedSecretChange,
+    isTlsEnabled,
   }
 }
diff --git a/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml
index 33776d0d0a..3dfcd784f7 100644
--- a/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml
@@ -467,7 +467,7 @@ step:
             label: Remove TLS
             fullwidth: true
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
             schema: schema/properties/spec/properties/tls/properties/remove
           - type: switch
@@ -475,7 +475,7 @@ step:
             fullwidth: true
             schema: schema/properties/spec/properties/tls/properties/rotateCertificates
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
           - type: radio
             label: Client Auth Mode
diff --git a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js
index aa783f4d93..246ab3c4fb 100644
--- a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js
@@ -353,6 +353,11 @@ export const useFunc = (model) => {
     return false
   }
 
+  function isTlsEnabled() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+  }
+
   function isRancherManaged() {
     const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers')
     const found = managers.find((item) => item === 'Rancher')
@@ -1881,5 +1886,6 @@ export const useFunc = (model) => {
     onRemoveConfigChange,
     onNewConfigSecretChange,
     onSelectedSecretChange,
+    isTlsEnabled,
   }
 }
diff --git a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml
index 62ef384946..337a3ec29c 100644
--- a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml
@@ -369,7 +369,7 @@ step:
             label: Remove TLS
             fullwidth: true
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
             schema: schema/properties/spec/properties/tls/properties/remove
           - type: switch
@@ -377,7 +377,7 @@ step:
             fullwidth: true
             schema: schema/properties/spec/properties/tls/properties/rotateCertificates
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
           - type: block-layout
             label: Issuer Reference
diff --git a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js
index 45a5e42aaa..94f390c7d1 100644
--- a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js
@@ -351,6 +351,11 @@ export const useFunc = (model) => {
     return true
   }
 
+  function isTlsEnabled() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+  }
+
   function isRancherManaged() {
     const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers')
     const found = managers.find((item) => item === 'Rancher')
@@ -1298,5 +1303,6 @@ export const useFunc = (model) => {
     onMySQLUserReqTypeChange,
     showUserCreationField,
     showUserDeletionField,
+    isTlsEnabled,
   }
 }
diff --git a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml
index 9a36e8c736..4b402d61f6 100644
--- a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml
@@ -470,7 +470,7 @@ step:
             label: Remove TLS
             fullwidth: true
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
             schema: schema/properties/spec/properties/tls/properties/remove
           - type: switch
@@ -478,7 +478,7 @@ step:
             fullwidth: true
             schema: schema/properties/spec/properties/tls/properties/rotateCertificates
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
           - type: block-layout
             label: Issuer Reference
diff --git a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js
index 5577c88ec2..d1b334e1d6 100644
--- a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js
@@ -353,6 +353,11 @@ export const useFunc = (model) => {
     return false
   }
 
+  function isTlsEnabled() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+  }
+
   async function getNamespaces() {
     if (storeGet('/route/params/actions')) return []
     const owner = storeGet('/route/params/user')
@@ -1799,5 +1804,6 @@ export const useFunc = (model) => {
     onRemoveConfigChange,
     onNewConfigSecretChange,
     onSelectedSecretChange,
+    isTlsEnabled,
   }
 }
diff --git a/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml
index 9a0c7aadd6..1660fb86bc 100644
--- a/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml
@@ -473,7 +473,7 @@ step:
             label: Remove TLS
             fullwidth: true
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
             schema: schema/properties/spec/properties/tls/properties/remove
           - type: switch
@@ -481,7 +481,7 @@ step:
             fullwidth: true
             schema: schema/properties/spec/properties/tls/properties/rotateCertificates
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
           - type: block-layout
             label: Issuer Reference
diff --git a/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js b/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js
index 90d36310d8..4aaaf10691 100644
--- a/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js
@@ -353,6 +353,11 @@ export const useFunc = (model) => {
     return false
   }
 
+  function isTlsEnabled() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+  }
+
   function isRancherManaged() {
     const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers')
     const found = managers.find((item) => item === 'Rancher')
@@ -1795,5 +1800,6 @@ export const useFunc = (model) => {
     onRemoveConfigChange,
     onNewConfigSecretChange,
     onSelectedSecretChange,
+    isTlsEnabled,
   }
 }
diff --git a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml
index f7d2c87e47..7d059555c7 100644
--- a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml
@@ -668,7 +668,7 @@ step:
             label: Remove TLS
             fullwidth: true
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
             schema: schema/properties/spec/properties/tls/properties/remove
           - type: switch
@@ -676,7 +676,7 @@ step:
             fullwidth: true
             schema: schema/properties/spec/properties/tls/properties/rotateCertificates
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
           - type: block-layout
             label: Issuer Reference
diff --git a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js
index 45d83c25b7..758c8778df 100644
--- a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js
@@ -353,6 +353,11 @@ export const useFunc = (model) => {
     return false
   }
 
+  function isTlsEnabled() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+  }
+
   function isRancherManaged() {
     const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers')
     const found = managers.find((item) => item === 'Rancher')
@@ -1844,5 +1849,6 @@ export const useFunc = (model) => {
     onRemoveConfigChange,
     onNewConfigSecretChange,
     onSelectedSecretChange,
+    isTlsEnabled,
   }
 }
diff --git a/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml
index 1b48af9120..01903844ed 100644
--- a/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml
@@ -1269,7 +1269,7 @@ step:
             label: Remove TLS
             fullwidth: true
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
             schema: schema/properties/spec/properties/tls/properties/remove
           - type: switch
@@ -1277,7 +1277,7 @@ step:
             fullwidth: true
             schema: schema/properties/spec/properties/tls/properties/rotateCertificates
             if:
-              name: returnFalse
+              name: isTlsEnabled
               type: function
           - type: block-layout
             label: Issuer Reference
diff --git a/charts/opskubedbcom-solropsrequest-editor/ui/functions.js b/charts/opskubedbcom-solropsrequest-editor/ui/functions.js
index 8806020dad..a16085c125 100644
--- a/charts/opskubedbcom-solropsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-solropsrequest-editor/ui/functions.js
@@ -357,6 +357,11 @@ export const useFunc = (model) => {
     return true
   }
 
+  function isTlsEnabled() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+  }
+
   function isRancherManaged() {
     const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers')
     const found = managers.find((item) => item === 'Rancher')
@@ -1837,5 +1842,6 @@ export const useFunc = (model) => {
     onRemoveConfigChange,
     onNewConfigSecretChange,
     onSelectedSecretChange,
+    isTlsEnabled,
   }
 }

From 287e1c58fc9e9a36ca0b051cb42d43cc6db74887 Mon Sep 17 00:00:00 2001
From: sourav-roy <souravroy@appscode.com>
Date: Mon, 26 Jan 2026 16:04:50 +0600
Subject: [PATCH 4/6] isTlsEnabled edited

Signed-off-by: sourav-roy <souravroy@appscode.com>
---
 charts/opskubedbcom-druidopsrequest-editor/ui/functions.js      | 2 +-
 .../opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js | 2 +-
 charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js   | 2 +-
 charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js      | 2 +-
 charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js    | 2 +-
 charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js    | 2 +-
 charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js      | 2 +-
 .../opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js | 2 +-
 charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js     | 2 +-
 charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js   | 2 +-
 charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js   | 2 +-
 charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js   | 2 +-
 charts/opskubedbcom-redisopsrequest-editor/ui/functions.js      | 2 +-
 .../opskubedbcom-singlestoreopsrequest-editor/ui/functions.js   | 2 +-
 charts/opskubedbcom-solropsrequest-editor/ui/functions.js       | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js b/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js
index 4771109132..f4bb57780b 100644
--- a/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js
@@ -457,7 +457,7 @@ export const useFunc = (model) => {
 
    function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls
   }
 
   async function getDbVersions() {
diff --git a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js
index 01e6dcfec8..422a3ef942 100644
--- a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js
@@ -480,7 +480,7 @@ export const useFunc = (model) => {
 
   function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls
   }
 
   function initDatabaseRef() {
diff --git a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js
index ca20b387fa..50a33d344e 100644
--- a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js
@@ -353,7 +353,7 @@ export const useFunc = (model) => {
 
   function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || 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-kafkaopsrequest-editor/ui/functions.js b/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js
index 8bb2108b11..93016227ef 100644
--- a/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js
@@ -356,7 +356,7 @@ export const useFunc = (model) => {
 
   function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || 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-mariadbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js
index fe6b7101b6..6a8a92b4a9 100644
--- a/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js
@@ -355,7 +355,7 @@ export const useFunc = (model) => {
 
   function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || 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-mongodbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
index caf20bd2f9..cd13e80162 100644
--- a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
@@ -366,7 +366,7 @@ export const useFunc = (model) => {
 
    function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || 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-mysqlopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
index 97f7382dc7..045ebe7e3e 100644
--- a/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
@@ -355,7 +355,7 @@ export const useFunc = (model) => {
 
   function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || 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-perconaxtradbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js
index a23e77b22c..685edbb25c 100644
--- a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js
@@ -356,7 +356,7 @@ export const useFunc = (model) => {
 
   function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || 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-pgpoolopsrequest-editor/ui/functions.js b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js
index 40fdadb71c..fdb8c15cde 100644
--- a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js
@@ -357,7 +357,7 @@ export const useFunc = (model) => {
 
   function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || 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-postgresopsrequest-editor/ui/functions.js b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js
index 246ab3c4fb..b36f3ea921 100644
--- a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js
@@ -355,7 +355,7 @@ export const useFunc = (model) => {
 
   function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || 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-proxysqlopsrequest-editor/ui/functions.js b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js
index 94f390c7d1..ac336feb84 100644
--- a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js
@@ -353,7 +353,7 @@ export const useFunc = (model) => {
 
   function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || 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-rabbitmqopsrequest-editor/ui/functions.js b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js
index d1b334e1d6..df433fb23f 100644
--- a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js
@@ -355,7 +355,7 @@ export const useFunc = (model) => {
 
   function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls
   }
 
   async function getNamespaces() {
diff --git a/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js b/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js
index 4aaaf10691..b77935ffe1 100644
--- a/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js
@@ -355,7 +355,7 @@ export const useFunc = (model) => {
 
   function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || 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-singlestoreopsrequest-editor/ui/functions.js b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js
index 758c8778df..6a9c71b894 100644
--- a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js
@@ -355,7 +355,7 @@ export const useFunc = (model) => {
 
   function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || 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-solropsrequest-editor/ui/functions.js b/charts/opskubedbcom-solropsrequest-editor/ui/functions.js
index a16085c125..5c7be1b86a 100644
--- a/charts/opskubedbcom-solropsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-solropsrequest-editor/ui/functions.js
@@ -359,7 +359,7 @@ export const useFunc = (model) => {
 
   function isTlsEnabled() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled') || dbDetails?.spec?.tls
+    return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls
   }
 
   function isRancherManaged() {

From e95bdf244b2468c014c0abc964a5d0d34731bf1d Mon Sep 17 00:00:00 2001
From: sourav-roy <souravroy@appscode.com>
Date: Tue, 27 Jan 2026 12:12:22 +0600
Subject: [PATCH 5/6] vertical issue fixed & make Alias required for all db

Signed-off-by: sourav-roy <souravroy@appscode.com>
---
 .../opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml  | 2 ++
 charts/opskubedbcom-druidopsrequest-editor/ui/functions.js | 6 +++---
 .../ui/create-ui.yaml                                      | 2 ++
 .../ui/functions.js                                        | 6 +++---
 .../ui/create-ui.yaml                                      | 2 ++
 .../opskubedbcom-ferretdbopsrequest-editor/ui/functions.js | 6 +++---
 .../opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml  | 2 ++
 charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js | 6 +++---
 .../ui/create-ui.yaml                                      | 2 ++
 .../opskubedbcom-mariadbopsrequest-editor/ui/functions.js  | 6 +++---
 .../ui/functions.js                                        | 6 +++---
 .../ui/create-ui.yaml                                      | 2 ++
 .../opskubedbcom-mongodbopsrequest-editor/ui/functions.js  | 2 +-
 .../ui/functions.js                                        | 6 +++---
 .../opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml  | 2 ++
 charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js | 6 +++---
 .../ui/create-ui.yaml                                      | 2 ++
 .../ui/functions.js                                        | 6 +++---
 .../ui/functions.js                                        | 6 +++---
 .../opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml | 2 ++
 .../opskubedbcom-pgpoolopsrequest-editor/ui/functions.js   | 6 +++---
 .../ui/create-ui.yaml                                      | 2 ++
 .../opskubedbcom-postgresopsrequest-editor/ui/functions.js | 6 +++---
 .../ui/create-ui.yaml                                      | 2 ++
 .../opskubedbcom-proxysqlopsrequest-editor/ui/functions.js | 6 +++---
 .../ui/create-ui.yaml                                      | 2 ++
 .../opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js | 6 +++---
 .../opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml  | 2 ++
 charts/opskubedbcom-redisopsrequest-editor/ui/functions.js | 6 +++---
 .../ui/create-ui.yaml                                      | 2 ++
 .../ui/functions.js                                        | 6 +++---
 .../opskubedbcom-solropsrequest-editor/ui/create-ui.yaml   | 2 ++
 charts/opskubedbcom-solropsrequest-editor/ui/functions.js  | 7 ++++---
 .../ui/functions.js                                        | 6 +++---
 34 files changed, 86 insertions(+), 55 deletions(-)

diff --git a/charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml
index d98759b7c8..e135aad549 100644
--- a/charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml
@@ -757,6 +757,8 @@ step:
                   loader: fetchAliasOptions
                   disable: disableAlias
                   schema: alias
+                  validation:
+                    type: required
                 - type: input
                   label: Secret Name
                   schema: secretName
diff --git a/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js b/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js
index f4bb57780b..b1b00eecef 100644
--- a/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js
@@ -437,6 +437,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -849,7 +851,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -899,8 +901,6 @@ export const useFunc = (model) => {
     }
     const machine = parsedInstance[type] || 'custom'
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml
index 681424f9e5..75af7d1a63 100644
--- a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml
@@ -1412,6 +1412,8 @@ step:
                   loader: fetchAliasOptions
                   disable: disableAlias
                   schema: alias
+                  validation:
+                    type: required
                 - type: input
                   label: Secret Name
                   schema: secretName
diff --git a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js
index 422a3ef942..7159618f9b 100644
--- a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js
@@ -446,6 +446,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -901,7 +903,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -950,8 +952,6 @@ export const useFunc = (model) => {
     }
     const machine = parsedInstance[type] || 'custom'
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml
index 1a9f1664c2..54059172af 100644
--- a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml
@@ -381,6 +381,8 @@ step:
                   loader: fetchAliasOptions
                   disable: disableAlias
                   schema: alias
+                  validation:
+                    type: required
                 - type: input
                   label: Secret Name
                   schema: secretName
diff --git a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js
index 50a33d344e..a343e5204c 100644
--- a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js
@@ -409,6 +409,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -747,7 +749,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -789,8 +791,6 @@ export const useFunc = (model) => {
     }
     const machine = parsedInstance[type] || 'custom'
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml
index 44cf70a820..9f1ef8c5b6 100644
--- a/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml
@@ -713,6 +713,8 @@ step:
                   loader: fetchAliasOptions
                   disable: disableAlias
                   schema: alias
+                  validation:
+                    type: required
                 - type: input
                   label: Secret Name
                   schema: secretName
diff --git a/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js b/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js
index 93016227ef..8aae4b135c 100644
--- a/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js
@@ -412,6 +412,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -771,7 +773,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -816,8 +818,6 @@ export const useFunc = (model) => {
     }
     const machine = parsedInstance[type] || 'custom'
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml
index 06a39c15c8..7e1bea6d42 100644
--- a/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml
@@ -544,6 +544,8 @@ step:
                   loader: fetchAliasOptions
                   disable: disableAlias
                   schema: alias
+                  validation:
+                    type: required
                 - type: input
                   label: Secret Name
                   schema: secretName
diff --git a/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js
index 6a8a92b4a9..c2421bdfe4 100644
--- a/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js
@@ -411,6 +411,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -749,7 +751,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -780,8 +782,6 @@ export const useFunc = (model) => {
     const annotations = dbDetails?.metadata?.annotations || {}
     const machine = annotations['kubernetes.io/instance-type'] || 'custom'
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js b/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js
index 227897e072..693fd1ab94 100644
--- a/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js
@@ -407,6 +407,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -743,7 +745,7 @@ export const useFunc = (model) => {
     } else {
       arr = machineList
         .map((machine) => {
-          if (machine === 'custom') return { text: machine, value: { machine } }
+          if (machine === 'custom') return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
           const subtext = `CPU: ${machines[machine].resources.limits.cpu}, Memory: ${machines[machine].resources.limits.memory}`
           const text = machine
           return {
@@ -775,8 +777,6 @@ export const useFunc = (model) => {
     }
     const machine = parsedInstance || 'custom'
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml
index d0238881c5..37032d01db 100644
--- a/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml
@@ -1590,6 +1590,8 @@ step:
                   loader: fetchAliasOptions
                   disable: disableAlias
                   schema: alias
+                  validation:
+                    type: required
                 - type: input
                   label: Secret Name
                   schema: secretName
diff --git a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
index cd13e80162..b6fbcc13c2 100644
--- a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
@@ -793,7 +793,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
diff --git a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js
index 241f12ba08..652d233a56 100644
--- a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js
@@ -407,6 +407,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -733,7 +735,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -774,8 +776,6 @@ export const useFunc = (model) => {
     }
     const machine = parsedInstance || 'custom'
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml
index d1e7474af8..bad8bbc168 100644
--- a/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml
@@ -590,6 +590,8 @@ step:
                   loader: fetchAliasOptions
                   disable: disableAlias
                   schema: alias
+                  validation:
+                    type: required
                 - type: input
                   label: Secret Name
                   schema: secretName
diff --git a/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
index 045ebe7e3e..885c320ed7 100644
--- a/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
@@ -411,6 +411,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -758,7 +760,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -789,8 +791,6 @@ export const useFunc = (model) => {
     const annotations = dbDetails?.metadata?.annotations || {}
     const machine = annotations['kubernetes.io/instance-type'] || 'custom'
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml
index b7084be6f3..1097d346b8 100644
--- a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml
@@ -555,6 +555,8 @@ step:
                   loader: fetchAliasOptions
                   disable: disableAlias
                   schema: alias
+                  validation:
+                    type: required
                 - type: input
                   label: Secret Name
                   schema: secretName
diff --git a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js
index 685edbb25c..24afa5feed 100644
--- a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js
@@ -412,6 +412,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -735,7 +737,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -774,8 +776,6 @@ export const useFunc = (model) => {
     }
     const machine = parsedInstance || 'custom'
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js b/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js
index 285705fb78..4dac4d5656 100644
--- a/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js
@@ -407,6 +407,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -736,7 +738,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -775,8 +777,6 @@ export const useFunc = (model) => {
       machine = 'custom'
     }
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml
index 55a85054fb..172e99401a 100644
--- a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml
@@ -496,6 +496,8 @@ step:
                   loader: fetchAliasOptions
                   disable: disableAlias
                   schema: alias
+                  validation:
+                    type: required
                 - type: input
                   label: Secret Name
                   schema: secretName
diff --git a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js
index fdb8c15cde..91c70ec4ed 100644
--- a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js
@@ -413,6 +413,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -741,7 +743,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -783,8 +785,6 @@ export const useFunc = (model) => {
     }
     const machine = parsedInstance || 'custom'
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml
index 3dfcd784f7..21e1af2448 100644
--- a/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml
@@ -572,6 +572,8 @@ step:
                   loader: fetchAliasOptions
                   disable: disableAlias
                   schema: alias
+                  validation:
+                    type: required
                 - type: input
                   label: Secret Name
                   schema: secretName
diff --git a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js
index b36f3ea921..1d613966d3 100644
--- a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js
@@ -411,6 +411,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -742,7 +744,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -780,8 +782,6 @@ export const useFunc = (model) => {
       machine = 'custom'
     }
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml
index 337a3ec29c..fab8ad057e 100644
--- a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml
@@ -443,6 +443,8 @@ step:
                   loader: fetchAliasOptions
                   disable: disableAlias
                   schema: alias
+                  validation:
+                    type: required
                 - type: input
                   label: Secret Name
                   schema: secretName
diff --git a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js
index ac336feb84..b67f691bf5 100644
--- a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js
@@ -409,6 +409,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -729,7 +731,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -763,8 +765,6 @@ export const useFunc = (model) => {
     const annotations = dbDetails?.metadata?.annotations || {}
     const machine = annotations['kubernetes.io/instance-type'] || 'custom'
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml
index 4b402d61f6..1d4148c82a 100644
--- a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml
@@ -544,6 +544,8 @@ step:
                   loader: fetchAliasOptions
                   disable: disableAlias
                   schema: alias
+                  validation:
+                    type: required
                 - type: input
                   label: Secret Name
                   schema: secretName
diff --git a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js
index df433fb23f..64b6e1b956 100644
--- a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js
@@ -411,6 +411,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -739,7 +741,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -773,8 +775,6 @@ export const useFunc = (model) => {
     const annotations = dbDetails?.metadata?.annotations || {}
     const machine = annotations['kubernetes.io/instance-type'] || 'custom'
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml
index 1660fb86bc..42396fae3c 100644
--- a/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml
@@ -547,6 +547,8 @@ step:
                   loader: fetchAliasOptions
                   disable: disableAlias
                   schema: alias
+                  validation:
+                    type: required
                 - type: input
                   label: Secret Name
                   schema: secretName
diff --git a/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js b/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js
index b77935ffe1..80db59034e 100644
--- a/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js
@@ -411,6 +411,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -744,7 +746,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -775,8 +777,6 @@ export const useFunc = (model) => {
     const annotations = dbDetails?.metadata?.annotations || {}
     const machine = annotations['kubernetes.io/instance-type'] || 'custom'
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml
index 7d059555c7..34d5343dd2 100644
--- a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml
@@ -742,6 +742,8 @@ step:
                   loader: fetchAliasOptions
                   disable: disableAlias
                   schema: alias
+                  validation:
+                    type: required
                 - type: input
                   label: Secret Name
                   schema: secretName
diff --git a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js
index 6a9c71b894..e1a14235ca 100644
--- a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js
@@ -411,6 +411,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -747,7 +749,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -786,8 +788,6 @@ export const useFunc = (model) => {
     }
     const machine = parsedInstance[type] || 'custom'
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml
index 01903844ed..9d41031eb2 100644
--- a/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml
@@ -1343,6 +1343,8 @@ step:
                   loader: fetchAliasOptions
                   disable: disableAlias
                   schema: alias
+                  validation:
+                    type: required
                 - type: input
                   label: Secret Name
                   schema: secretName
diff --git a/charts/opskubedbcom-solropsrequest-editor/ui/functions.js b/charts/opskubedbcom-solropsrequest-editor/ui/functions.js
index 5c7be1b86a..fd8bd8b1fa 100644
--- a/charts/opskubedbcom-solropsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-solropsrequest-editor/ui/functions.js
@@ -415,6 +415,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -767,7 +769,8 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else
+            return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -812,8 +815,6 @@ export const useFunc = (model) => {
     }
     const machine = parsedInstance[type] || 'custom'
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {
diff --git a/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js b/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js
index d89c6f517b..ad582ea245 100644
--- a/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js
@@ -378,6 +378,8 @@ export const useFunc = (model) => {
   }
 
   async function getDbDetails() {
+    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
+
     const owner = storeGet('/route/params/user')
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
@@ -1412,7 +1414,7 @@ export const useFunc = (model) => {
                 memory: machineData.limits.memory,
               },
             }
-          } else return { text: machine, value: { machine } }
+          } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
         }
       })
     } else {
@@ -1444,8 +1446,6 @@ export const useFunc = (model) => {
     const annotations = dbDetails?.metadata?.annotations || {}
     const machine = annotations['kubernetes.io/instance-type'] || 'custom'
 
-    machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || []
-
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
       return {

From 5449587511e06dbda7874fd176404b35733c2516 Mon Sep 17 00:00:00 2001
From: sourav-roy <souravroy@appscode.com>
Date: Tue, 27 Jan 2026 14:52:36 +0600
Subject: [PATCH 6/6] Certificates block-layout showLabels on

Signed-off-by: sourav-roy <souravroy@appscode.com>
---
 charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml    | 1 +
 .../ui/create-ui.yaml                                           | 2 +-
 charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml | 2 +-
 charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml    | 2 +-
 charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml  | 2 +-
 charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml  | 2 +-
 charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml    | 2 +-
 .../ui/create-ui.yaml                                           | 2 +-
 charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml   | 2 +-
 charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml | 2 +-
 charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml | 2 +-
 charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml | 2 +-
 charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml    | 2 +-
 .../opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml | 2 +-
 charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml     | 2 +-
 15 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml
index e135aad549..e20b8792dd 100644
--- a/charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml
@@ -740,6 +740,7 @@ step:
                 schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name
           - type: block-layout
             label: Certificates
+            showLabels: false
             if:
               type: function
               name: showIssuerRefAndCertificates
diff --git a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml
index 75af7d1a63..244263ca7e 100644
--- a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml
@@ -1396,7 +1396,7 @@ step:
                 schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name
           - type: block-layout
             label: Certificates
-            showLabels: true
+            showLabels: false
             if:
               type: function
               name: showIssuerRefAndCertificates
diff --git a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml
index 54059172af..4ed9887acd 100644
--- a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml
@@ -365,7 +365,7 @@ step:
                 schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name
           - type: block-layout
             label: Certificates
-            showLabels: true
+            showLabels: false
             if:
               name: showIssuerRefAndCertificates
               type: function
diff --git a/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml
index 9f1ef8c5b6..1523e46af4 100644
--- a/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml
@@ -697,7 +697,7 @@ step:
                 schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name
           - type: block-layout
             label: Certificates
-            showLabels: true
+            showLabels: false
             if:
               name: showIssuerRefAndCertificates
               type: function
diff --git a/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml
index 7e1bea6d42..76e552167e 100644
--- a/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml
@@ -528,7 +528,7 @@ step:
                 schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name
           - type: block-layout
             label: Certificates
-            showLabels: true
+            showLabels: false
             if:
               name: showIssuerRefAndCertificates
               type: function
diff --git a/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml
index 37032d01db..6323f97243 100644
--- a/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml
@@ -1574,7 +1574,7 @@ step:
                 schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name
           - type: block-layout
             label: Certificates
-            showLabels: true
+            showLabels: false
             if:
               name: showIssuerRefAndCertificates
               type: function
diff --git a/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml
index bad8bbc168..f7496e1f88 100644
--- a/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml
@@ -574,7 +574,7 @@ step:
                 schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name
           - type: block-layout
             label: Certificates
-            showLabels: true
+            showLabels: false
             if:
               name: showIssuerRefAndCertificates
               type: function
diff --git a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml
index 1097d346b8..9017defae8 100644
--- a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml
@@ -539,7 +539,7 @@ step:
                 schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name
           - type: block-layout
             label: Certificates
-            showLabels: true
+            showLabels: false
             if:
               name: showIssuerRefAndCertificates
               type: function
diff --git a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml
index 172e99401a..d6bbe84454 100644
--- a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml
@@ -480,7 +480,7 @@ step:
                 schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name
           - type: block-layout
             label: Certificates
-            showLabels: true
+            showLabels: false
             if:
               name: showIssuerRefAndCertificates
               type: function
diff --git a/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml
index 21e1af2448..6b76dddab5 100644
--- a/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml
@@ -556,7 +556,7 @@ step:
                 schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name
           - type: block-layout
             label: Certificates
-            showLabels: true
+            showLabels: false
             if:
               name: showIssuerRefAndCertificates
               type: function
diff --git a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml
index fab8ad057e..1fafd684b2 100644
--- a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml
@@ -427,7 +427,7 @@ step:
                 schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name
           - type: block-layout
             label: Certificates
-            showLabels: true
+            showLabels: false
             if:
               name: showIssuerRefAndCertificates
               type: function
diff --git a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml
index 1d4148c82a..644c193ade 100644
--- a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml
@@ -528,7 +528,7 @@ step:
                 schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name
           - type: block-layout
             label: Certificates
-            showLabels: true
+            showLabels: false
             if:
               name: showIssuerRefAndCertificates
               type: function
diff --git a/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml
index 42396fae3c..1ff87ee479 100644
--- a/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml
@@ -531,7 +531,7 @@ step:
                 schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name
           - type: block-layout
             label: Certificates
-            showLabels: true
+            showLabels: false
             if:
               name: showIssuerRefAndCertificates
               type: function
diff --git a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml
index 34d5343dd2..e9ea07ff51 100644
--- a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml
@@ -726,7 +726,7 @@ step:
                 schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name
           - type: block-layout
             label: Certificates
-            showLabels: true
+            showLabels: false
             if:
               name: showIssuerRefAndCertificates
               type: function
diff --git a/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml
index 9d41031eb2..85251a8359 100644
--- a/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml
@@ -1327,7 +1327,7 @@ step:
                 schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name
           - type: block-layout
             label: Certificates
-            showLabels: true
+            showLabels: false
             if:
               name: showIssuerRefAndCertificates
               type: function