bfg-common 1.5.869 → 1.5.871

package/components/common/diagramMain/modals/viewSettings/viewSettings/ViewSettingsNew.vue

@@ -119,6 +119,11 @@ const localization = computed<UI_I_Localization>(() => useLocal())
   height: auto;
   box-sizing: border-box;
 
+  .table-block {
+    display: grid;
+    grid-template-columns: 50% 50%;
+  }
+
   .settings-table {
     width: 100%;
     box-sizing: border-box;
@@ -128,7 +133,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
       span {
         font-size: 16px;
         font-weight: 500;
-        line-height: 19.36px;
+        line-height: 20px;
         color: var(--diagram-info-text);
       }
       td {
@@ -142,19 +147,19 @@ const localization = computed<UI_I_Localization>(() => useLocal())
       td {
         &.row-name-container {
           border-right: 16px solid transparent;
-          width: 256px;
-          min-width: 256px;
+          //width: 256px;
+          //min-width: 256px;
           color: var(--diagram-info-second-text);
           font-size: 13px;
           font-weight: 400;
-          line-height: 15.73px;
+          line-height: 16px;
           padding-bottom: 12px;
         }
         &.row-value-container {
           padding-bottom: 12px;
         }
 
-        width: 240px;
+        //width: 240px;
         white-space: normal;
         padding: 0;
         line-height: 18px;
@@ -164,11 +169,11 @@ const localization = computed<UI_I_Localization>(() => useLocal())
             display: inline-block;
             table-layout: auto;
             word-break: break-word;
-            width: 240px;
+            //width: 240px;
 
             font-size: 13px;
             font-weight: 400;
-            line-height: 15.73px;
+            line-height: 16px;
             color: var(--diagram-info-text);
 
             &.is-status-yes {
@@ -206,7 +211,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
     }
     tr td.row-name-container,
     tr td.row-value-container {
-      max-width: 240px;
+      //max-width: 240px;
       word-break: break-word;
     }
 

package/components/common/monitor/advanced/tools/chartOptionsModal/ChartOptionsModal.vue

@@ -187,7 +187,7 @@ const onUpdateCustomTimeTo = (value: string): void => {
 }
 
 const metricsItems = computed<UI_I_VerticalTabs[]>(() =>
-  metricsFunc(localization.value, props.type)
+  metricsFunc(localization.value, props.type, props.project)
 )
 const selectedMetricLocal = ref<UI_T_ChartHost | UI_T_ChartVm>(
   (props.selectedMetric || '' + metricsItems.value[0]?.value) as

package/components/common/monitor/advanced/tools/chartOptionsModal/metrics/lib/config/optionsMetrics.ts

@@ -1,11 +1,13 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_VerticalTabs } from '~/components/atoms/tabs/lib/models/interfaces'
 import type { UI_T_AdvancedType } from '~/components/common/monitor/advanced/lib/models/types'
 import type { UI_I_OptionData } from '~/components/common/monitor/advanced/lib/models/interfaces'
 
 export const metricsFunc = (
   localization: UI_I_Localization,
-  type: UI_T_AdvancedType
+  type: UI_T_AdvancedType,
+  project: UI_T_Project
 ): UI_I_VerticalTabs[] => {
   const metrics: UI_I_OptionData = {
     zone: [
@@ -184,5 +186,8 @@ export const metricsFunc = (
     ],
   }
 
+  if (project === 'sphere') {
+    metrics[type] = metrics[type].filter((item) => item.value !== 'datastore')
+  }
   return metrics[type]
 }

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/Cpu.vue

@@ -2,6 +2,7 @@
   <component
     :is="currentComponent"
     v-model="model"
+    v-model:vcpus="vcpus"
     v-model:reservation="reservation"
     v-model:reservation-type="reservationType"
     v-model:limit="limit"
@@ -56,7 +57,7 @@ const props = withDefaults(
   }>(),
   {
     state: undefined,
-    nums: null
+    nums: null,
   }
 )
 const emits = defineEmits<{
@@ -74,6 +75,10 @@ const currentComponent = computed(() =>
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const isRunning = computed<boolean>(() => {
+  return props.state === 2
+})
+
 // props.state === 2 => is run
 if (props.state !== 2) {
   model.value.cpu.max_vcpus = capabilities.value.maxCpus
@@ -83,9 +88,10 @@ const isDisabled = computed<boolean>(() => {
   return props.state === 2
 })
 
-const cpuOptions = computed<UI_I_OptionItem[]>(() =>
-  cpuOptionsFunc(localization.value, 1, model.value.cpu.max_vcpus)
-)
+const minCpu = isRunning.value ? model.value.cpu.vcpus : 1
+const cpuOptions = computed<UI_I_OptionItem[]>(() => {
+  return cpuOptionsFunc(localization.value, minCpu, model.value.cpu.max_vcpus)
+})
 
 // const enableCpuHotAdd = ref<boolean>(false)
 
@@ -218,6 +224,16 @@ watch(
   { immediate: true }
 )
 
+const vcpus = computed<number>({
+  get() {
+    return model.value.cpu.vcpus
+  },
+  set(newValue) {
+    const valueInt = +newValue
+    model.value.cpu.vcpus = isNaN(valueInt) ? 0 : valueInt
+  },
+})
+
 const reservation = ref<string>('1')
 const reservationType = ref<string>('mhz')
 if (model.value.cpu.reservation_mhz !== 1) {

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/New.vue

@@ -24,7 +24,7 @@
       <template #stackBlockContent>
         <div class="flex-align-center flex-space-between">
           <ui-combobox
-            v-model.number="model.cpu.vcpus"
+            v-model.number="vcpus"
             :items="props.cpuOptions"
             :disabled="props.isCpuDisabled"
             :error-text="props.vcpusLocalAndApiErrorsTexts"
@@ -157,6 +157,7 @@ import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/li
 
 const model = defineModel<UI_I_CreateVmData>({ required: true })
 
+const vcpus = defineModel<string>('vcpus', { required: true })
 const reservation = defineModel<string>('reservation', { required: true })
 const reservationType = defineModel<string>('reservationType', {
   required: true,

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/Old.vue

@@ -28,7 +28,7 @@
               <template #elem>
                 <atoms-combobox
                   id="vm-wizard-vcpus-field"
-                  v-model.number="model.cpu.vcpus"
+                  v-model.number="vcpus"
                   :items="props.cpuOptions"
                   :disabled="props.isCpuDisabled"
                   class="input-text-color"
@@ -136,6 +136,7 @@ import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/li
 
 const model = defineModel<UI_I_CreateVmData>({ required: true })
 
+const vcpus = defineModel<string>('vcpus', { required: true })
 const reservation = defineModel<string>('reservation', { required: true })
 const reservationType = defineModel<string>('reservationType', {
   required: true,
@@ -172,7 +173,7 @@ const props = withDefaults(
   }>(),
   {
     vmCpuHelpTextSecond: undefined,
-    nums: null
+    nums: null,
   }
 )
 const emits = defineEmits<{