fixed some issues in solr db and added subtext for compute autoscaling

charts/kubedbcom-clickhouse-editor/ui/functions.js

@@ -261,8 +261,10 @@ export const useFunc = (model) => {
 
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,

charts/kubedbcom-druid-editor/ui/functions.js

@@ -1602,8 +1602,10 @@ export const useFunc = (model) => {
     // Return array with text and value object (expected format for machine-compare loader)
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,

charts/kubedbcom-elasticsearch-editor/ui/functions.js

@@ -853,8 +853,10 @@ export const useFunc = (model) => {
     // Return array with text and value object (expected format for machine-compare loader)
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,

charts/kubedbcom-ferretdb-editor/ui/functions.js

@@ -298,8 +298,10 @@ export const useFunc = (model) => {
     // Return array with text and value object (expected format for machine-compare loader)
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,

charts/kubedbcom-kafka-editor/ui/functions.js

@@ -275,8 +275,10 @@ export const useFunc = (model) => {
     // Return array with text and value object (expected format for machine-compare loader)
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,

charts/kubedbcom-mariadb-editor/ui/functions.js

@@ -1003,8 +1003,10 @@ export const useFunc = (model) => {
     // Return array with text and value object (expected format for machine-compare loader)
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,

charts/kubedbcom-memcached-editor/ui/edit-ui.yaml

@@ -100,7 +100,6 @@ step:
               name: returnFalse
           - type: block-layout
             showLabels: false
-            # schema: schema/properties/resources/properties/monitoringCoreosComServiceMonitor/properties/spec/properties/selector
             if: 
               type: function
               name: returnFalse
@@ -114,7 +113,6 @@ step:
           if:
             type: function
             name: isEqualToModelPathValue|prometheus.io|/resources/kubedbComMemcached/spec/monitor/agent
-          # individualItemDisabilityCheck: disableLableChecker
         - type: label-element
           label: Exporter Configuration
           schema: ''
@@ -163,7 +161,6 @@ step:
               element:
                 type: input
                 label: Args
-                # isSubsection: true
             - type: block-layout
               label: Metadata
               showLabels: false
@@ -265,8 +262,8 @@ step:
     elements:
       - type: block-layout
         if:
-         type: function
-         name: isConsole
+          type: function
+          name: isConsole
         elements:
           - type: input
             label: Name
@@ -322,7 +319,6 @@ step:
           - type: block-layout
             label: Memcached
             showLabels: true
-            # schema: schema/properties/resources/properties/autoscalingKubedbComMemcachedAutoscaler/properties/spec/properties/compute/properties/memcached
             elements:
               - type: select
                 label: Trigger
@@ -422,7 +418,6 @@ step:
               type: function
               name: hasNoAnnotations
             showLabels: true
-            # schema: schema/properties/resources/properties/autoscalingKubedbComMemcachedAutoscaler/properties/spec/properties/compute/properties/nodeTopology
             elements:
               - type: select
                 label: Select Node Topology
@@ -447,7 +442,6 @@ step:
             if:
               type: function
               name: showOpsRequestOptions
-            # schema: schema/properties/resources/properties/autoscalingKubedbComMemcachedAutoscaler/properties/spec/properties/opsRequestOptions
             elements:
               - type: select
                 label: Timeout
@@ -477,4 +471,4 @@ step:
                     value: IfReady
                   - text: Always (OpsRequest will always be applied)
                     value: Always
-                schema: schema/properties/resources/properties/autoscalingKubedbComMemcachedAutoscaler/properties/spec/properties/opsRequestOptions/properties/apply
+                schema: schema/properties/resources/properties/autoscalingKubedbComMemcachedAutoscaler/properties/spec/properties/opsRequestOptions/properties/apply

charts/kubedbcom-memcached-editor/ui/functions.js

@@ -275,8 +275,10 @@ export const useFunc = (model) => {
 
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,

charts/kubedbcom-mongodb-editor/ui/functions.js

@@ -3165,8 +3165,10 @@ export const useFunc = (model) => {
     // Return array with text and value object (expected format for machine-compare loader)
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,

charts/kubedbcom-mssqlserver-editor/ui/edit-ui.yaml

@@ -182,142 +182,6 @@ step:
               func: initMetadata
               paths:
                 - schema/properties/resources/properties/autoscalingKubedbComMSSQLServerAutoscaler/properties/spec/properties/databaseRef/properties/name
-
-      - type: radio
-        label: Schedule a Backup?
-        schema: temp/properties/scheduleBackup
-        isHorizontal: true
-        options:
-          - text: 'Yes'
-            value: 'yes'
-          - text: 'No'
-            value: 'no'
-        if:
-          type: function
-          name: showScheduleBackup
-        init:
-          type: func
-          value: initScheduleBackupForEdit
-        watcher:
-          func: onScheduleBackupChange
-          paths:
-            - temp/properties/scheduleBackup
-      - type: block-layout
-        label: Backup Form
-        showLabels: false
-        loader: initBackupData
-        if:
-          type: function
-          name: showBackupForm
-        elements:
-          - type: radio
-            label: Select Backup Type
-            schema: temp/properties/backupType
-            isHorizontal: true
-            options:
-              - text: BackupConfig
-                value: BackupConfig
-                description: 'Create, Delete or Modify BackupConfig'
-              - text: BackupBlueprint
-                value: BackupBlueprint
-                description: Enable/Disable BackupBlueprint
-            if:
-              type: function
-              name: isBackupDataLoadedTrue
-            init:
-              type: func
-              value: setBackupType
-            loader: getTypes
-            watcher:
-              func: onBackupTypeChange
-              paths:
-                - temp/properties/backupType
-          - type: block-layout
-            label: Config
-            if:
-              type: function
-              name: isBackupType|BackupConfig
-            elements:
-              - type: select
-                label: Select Context
-                schema: temp/properties/backupConfigContext
-                validation:
-                  type: required
-                loader: getContext
-                watcher:
-                  func: onContextChange
-                  paths:
-                    - temp/properties/backupConfigContext
-              - type: select
-                label: Select BackupConfig
-                schema: temp/properties/config
-                validation:
-                  type: required
-                if:
-                  type: function
-                  name: showConfigList
-                loader: getConfigList
-                watcher:
-                  func: onConfigChange
-                  paths:
-                    - temp/properties/config
-              - type: input
-                label: Schedule
-                schema: temp/properties/schedule
-                validation:
-                  type: required
-                if:
-                  type: function
-                  name: showSchedule
-                loader:
-                  name: getDefaultSchedule|/resources/coreKubestashComBackupConfiguration/spec/sessions
-                  watchPaths:
-                    - temp/properties/config
-                watcher:
-                  func: onInputChangeSchedule|/resources/coreKubestashComBackupConfiguration/spec/sessions|schedule
-                  paths:
-                    - temp/properties/schedule
-              - type: switch
-                label: Paused
-                schema: schema/properties/resources/properties/coreKubestashComBackupConfiguration/properties/spec/properties/paused
-                if:
-                  type: function
-                  name: showPause
-          - type: block-layout
-            label: Blueprint
-            if:
-              type: function
-              name: isBackupType|BackupBlueprint
-            elements:
-              - type: switch
-                label: Enable Backup Blueprint
-                fullwidth: true
-                subtitle: Use a backup blueprint template to automatically configure backups for similar databases
-                schema: temp/properties/blueprintEnabled
-                init:
-                  type: func
-                  value: setBlueprintSwitch
-                watcher:
-                  func: onBlueprintChange
-                  paths:
-                    - temp/properties/blueprintEnabled
-          - type: block-layout
-            label: Archiver
-            if:
-              type: function
-              name: isBackupType|Archiver
-            elements:
-              - type: switch
-                label: Enable Archiver
-                schema: temp/properties/archiverEnabled
-                init:
-                  type: func
-                  value: setArchiverSwitch
-                watcher:
-                  func: onArchiverChange
-                  paths:
-                    - temp/properties/archiverEnabled
-
   - type: single-step-form
     id: monitoring
     loader: initMonitoring

charts/kubedbcom-mssqlserver-editor/ui/functions.js

@@ -847,8 +847,10 @@ export const useFunc = (model) => {
     // Return array with text and value object (expected format for machine-compare loader)
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,

charts/kubedbcom-mysql-editor/ui/functions.js

@@ -756,8 +756,10 @@ export const useFunc = (model) => {
     // Return array with text and value object (expected format for machine-compare loader)
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,

charts/kubedbcom-perconaxtradb-editor/ui/functions.js

@@ -326,8 +326,10 @@ export const useFunc = (model) => {
 
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,

charts/kubedbcom-pgbouncer-editor/ui/functions.js

@@ -292,8 +292,10 @@ export const useFunc = (model) => {
 
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,

charts/kubedbcom-pgpool-editor/ui/functions.js

@@ -342,8 +342,10 @@ export const useFunc = (model) => {
     // Return array with text and value object (expected format for machine-compare loader)
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,

charts/kubedbcom-postgres-editor/ui/functions.js

@@ -859,8 +859,10 @@ export const useFunc = (model) => {
     // Return array with text and value object (expected format for machine-compare loader)
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,

charts/kubedbcom-proxysql-editor/ui/functions.js

@@ -324,8 +324,10 @@ export const useFunc = (model) => {
     // Return array with text and value object (expected format for machine-compare loader)
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,

charts/kubedbcom-rabbitmq-editor/ui/functions.js

@@ -784,8 +784,10 @@ export const useFunc = (model) => {
     // Return array with text and value object (expected format for machine-compare loader)
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,

charts/kubedbcom-redis-editor/ui/functions.js

@@ -820,8 +820,10 @@ export const useFunc = (model) => {
     // Return array with text and value object (expected format for machine-compare loader)
     const machines = nodeGroups?.map((item) => {
       const text = item.topologyValue
+      const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
       return {
         text,
+        subtext,
         value: {
           machine: item.topologyValue,
           cpu: item.allocatable?.cpu,