bfg-common 1.5.572 → 1.5.573

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

@@ -1,10 +1,7 @@
 <template>
   <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-new
     v-if="isNewView"
-    v-model:selected-cpu="selectedCpu"
-    v-model:selected-core-per-socket="selectedCorePerSocket"
-    v-model:enable-cpu-hot-add="enableCpuHotAdd"
-    v-model:selected-max-cpu="selectedMaxCpu"
+    v-model="model"
     v-model:reservation="reservation"
     v-model:reservation-type="reservationType"
     v-model:limit="limit"
@@ -14,7 +11,6 @@
     v-model:cpu-model="cpuModel"
     v-model:passthrough-host-cpu="passthroughHostCpu"
     v-model:host-model-cpu="hostModelCpu"
-    :max-cpus="props.maxCpus"
     :cpu-models="props.cpuModels"
     :is-edit="props.isEdit"
     :error-validation-fields="props.errorValidationFields"
@@ -36,10 +32,7 @@
   />
   <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-old
     v-else
-    v-model:selected-cpu="selectedCpu"
-    v-model:selected-core-per-socket="selectedCorePerSocket"
-    v-model:enable-cpu-hot-add="enableCpuHotAdd"
-    v-model:selected-max-cpu="selectedMaxCpu"
+    v-model="model"
     v-model:reservation="reservation"
     v-model:reservation-type="reservationType"
     v-model:limit="limit"
@@ -49,7 +42,6 @@
     v-model:cpu-model="cpuModel"
     v-model:passthrough-host-cpu="passthroughHostCpu"
     v-model:host-model-cpu="hostModelCpu"
-    :max-cpus="props.maxCpus"
     :cpu-models="props.cpuModels"
     :is-edit="props.isEdit"
     :error-validation-fields="props.errorValidationFields"
@@ -72,30 +64,27 @@
 </template>
 
 <script setup lang="ts">
-import type { UI_I_SendDataCpu } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { API_UI_I_VmEditCpu } from '~/lib/models/store/vm/interfaces'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
 import { cpuOptionsFunc } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/lib/config/cpuOptions'
 
+const model = defineModel<UI_I_CreateVmData>({ required: true })
+
 const props = withDefaults(
   defineProps<{
-    maxCpus: number
     cpuModels: UI_I_OptionItem[]
     isEdit: boolean
-    errorValidationFields: UI_I_ErrorValidationField<string>[]
+    errorValidationFields: UI_I_ErrorValidationField[]
     vmCpuHelpTextSecond?: string
     state?: string | number
-    cpu?: API_UI_I_VmEditCpu
   }>(),
   {
     state: undefined,
-    cpu: undefined,
   }
 )
 const emits = defineEmits<{
-  (event: 'send-data', value: UI_I_SendDataCpu): void
   (event: 'invalid', value: boolean): void
   (event: 'remove-error-by-title', value: string): void
 }>()
@@ -110,74 +99,85 @@ const isDisabled = computed<boolean>(() => {
 })
 
 const cpuOptions = computed<UI_I_OptionItem[]>(() =>
-  cpuOptionsFunc(localization.value, 1, props.maxCpus)
+  cpuOptionsFunc(localization.value, 1, model.value.cpu.max_vcpus)
 )
 
-const enableCpuHotAdd = ref<boolean>(false)
+// const enableCpuHotAdd = ref<boolean>(false)
+
 const enableCpuHotAddDisabled = computed<boolean>(
-  // () => selectedCpu.value >= props.maxCpus || isDisabled.value
+  // () => model.value.cpu.vcpus >= model.value.cpu.max_vcpus || isDisabled.value
   () => isDisabled.value // pc-1766
 )
-watch(enableCpuHotAdd, (newValue) => {
-  if (newValue) {
-    selectedMaxCpu.value = Math.max(selectedCpu.value, selectedMaxCpu.value)
-    return
+watch(
+  () => model.value.cpu.hotplug,
+  (newValue) => {
+    if (newValue) {
+      model.value.cpu.max_vcpus = Math.max(
+        model.value.cpu.vcpus,
+        model.value.cpu.max_vcpus
+      )
+      return
+    }
+
+    maxCpuInvalid.value = false
+    model.value.cpu.max_vcpus = 1
   }
+)
 
-  maxCpuInvalid.value = false
-  selectedMaxCpu.value = 1
-})
+// const selectedCpu = ref<number>(
+//   isDisabled.value && model.value.cpu.hotplug ? model.value.cpu.max_vcpus : 2
+// )
+model.value.cpu.vcpus =
+  isDisabled.value && model.value.cpu.hotplug ? model.value.cpu.max_vcpus : 2
 
-const selectedCpu = ref<number>(
-  isDisabled.value && enableCpuHotAdd.value ? props.maxCpus : 2
-)
 const isCpuDisabled = computed<boolean>(
-  () => isDisabled.value && !enableCpuHotAdd.value
+  () => isDisabled.value && !model.value.cpu.hotplug
 )
-watch(selectedCpu, (newValue) => {
-  selectedCpu.value = Math.floor(+newValue)
-  if (!(selectedCpu.value % selectedCorePerSocket.value) || isDisabled.value)
-    return
-  selectedCorePerSocket.value = 1
-})
-// watch(selectedCpu, (newValue) => {
-// if (enableCpuHotAdd.value && enableCpuHotAddDisabled.value) return
-
-// if (newValue >= props.maxCpus) { // pc-1766
-//   enableCpuHotAdd.value = false
-// }
-// selectedMaxCpu.value =
-//   selectedMaxCpu.value <= newValue ? newValue + 1 : selectedMaxCpu.value
-// if (selectedMaxCpu.value > props.maxCpus) selectedMaxCpu.value = props.maxCpus
-// })
-const maxCpuOptions = computed<UI_I_OptionItem[]>(() =>
-  cpuOptionsFunc(localization.value, selectedCpu.value, props.maxCpus)
-)
-const selectedMaxCpu = ref<number>(1)
 watch(
-  () => props.maxCpus,
+  () => model.value.cpu.vcpus,
   (newValue) => {
-    selectedMaxCpu.value = newValue
+    model.value.cpu.vcpus = Math.floor(+newValue)
+    if (
+      !(model.value.cpu.vcpus % model.value.cpu.core_per_socket) ||
+      isDisabled.value
+    )
+      return
+    model.value.cpu.core_per_socket = 1
   }
 )
 
+const maxCpuOptions = computed<UI_I_OptionItem[]>(() =>
+  cpuOptionsFunc(
+    localization.value,
+    model.value.cpu.vcpus,
+    model.value.cpu.max_vcpus
+  )
+)
+// const selectedMaxCpu = ref<number>(1)
+// watch(
+//   () => props.maxCpus,
+//   (newValue) => {
+//     model.value.cpu.max_vcpus = newValue
+//   }
+// )
+
 const selectedCpus = computed<number[]>(() =>
-  enableCpuHotAdd.value
-    ? [selectedCpu.value, selectedMaxCpu.value]
-    : [selectedCpu.value]
+  model.value.cpu.hotplug
+    ? [model.value.cpu.vcpus, model.value.cpu.max_vcpus]
+    : [model.value.cpu.vcpus]
 )
 
-const selectedCorePerSocket = ref<number>(1)
+// const selectedCorePerSocket = ref<number>(1)
 
 const cpuErrorLocalText = computed<string>(() => {
-  const validValue = /^\d+(\.\d+)?$/.test(selectedCpu.value + '')
+  const validValue = /^\d+(\.\d+)?$/.test(model.value.cpu.vcpus + '')
   if (!validValue) {
     return localization.value.common.inputContainsInvalidCharacters
   }
 
   const min = cpuOptions.value[0].value
   const max = cpuOptions.value[1].value
-  if (selectedCpu.value < min || selectedCpu.value > max) {
+  if (model.value.cpu.vcpus < min || model.value.cpu.vcpus > max) {
     return localization.value.vmWizard.cpuMustBe
       .replace('{0}', min)
       .replace('{1}', max)
@@ -216,8 +216,8 @@ const cpuInvalid = computed<boolean>(
     reservationInvalid.value ||
     limitInvalid.value ||
     sharesInvalid.value ||
-    (enableCpuHotAdd.value &&
-      // selectedCpu.value < props.maxCpus && // pc-1766
+    (model.value.cpu.hotplug &&
+      // model.value.cpu.vcpus < model.value.cpu.max_vcpus && // pc-1766
       maxCpuInvalid.value)
 )
 watch(
@@ -230,12 +230,65 @@ watch(
 
 const reservation = ref<string>('1')
 const reservationType = ref<string>('mhz')
+if (model.value.cpu.reservation_mhz !== 1) {
+  const reservationInGhz = $binary.mhzToGhz(model.value.cpu.reservation_mhz)
+  if (reservationInGhz < 1) {
+    reservation.value = model.value.cpu.reservation_mhz.toString()
+    reservationType.value = 'mhz'
+  } else {
+    reservation.value = reservationInGhz
+    reservationType.value = 'ghz'
+  }
+}
+watch(
+  [reservation, reservationType],
+  () => {
+    model.value.cpu.reservation_mhz =
+      reservationType.value === 'ghz'
+        ? $binary.ghzToMhz(+reservation.value)
+        : +reservation.value
+  },
+  { deep: true, immediate: true }
+)
 
 const limit = ref<string>('Unlimited')
 const limitType = ref<string>('mhz')
+if (model.value.cpu.limit_mhz !== null) {
+  if (typeof model.value.cpu.limit_mhz === 'string')
+    limit.value = model.value.cpu.limit_mhz
+  else {
+    const limitInGhz = $binary.mhzToGhz(model.value.cpu.limit_mhz)
+    if (limitInGhz < 1) {
+      limit.value = model.value.cpu.limit_mhz.toString()
+      limitType.value = 'mhz'
+    } else {
+      limit.value = limitInGhz
+      limitType.value = 'ghz'
+    }
+  }
+}
+watch(
+  [limit, limitType],
+  () => {
+    model.value.cpu.limit_mhz =
+      limit.value === 'Unlimited'
+        ? limit.value
+        : limitType.value === 'ghz'
+        ? $binary.ghzToMhz(+limit.value)
+        : +limit.value
+  },
+  { deep: true, immediate: true }
+)
 
-const shares = ref<string>('2000')
-const sharesType = ref<string>('2000')
+const shares = ref<string>(model.value.cpu.shares + '' || '2000')
+const sharesType = ref<string>(model.value.cpu.shares + '' || '2000') // TODO check
+watch(
+  shares,
+  () => {
+    model.value.cpu.shares = +shares.value
+  },
+  { deep: true, immediate: true }
+)
 
 // const hardwareVirtualization = ref<boolean>(false)
 //
@@ -254,111 +307,38 @@ watch(
   }
 )
 const passthroughHostCpu = ref<boolean>(false)
-const hostModelCpu = ref<boolean>(true)
-
-// const isShowCpuHelp = ref<boolean>(false)
-
+const hostModelCpu = ref<boolean>(false)
+if (model.value.cpu.model) {
+  switch (model.value.cpu.model) {
+    case 'host-passthrough':
+      passthroughHostCpu.value = true
+      hostModelCpu.value = false
+      cpuModel.value = ''
+      break
+    case 'host-model':
+      passthroughHostCpu.value = false
+      hostModelCpu.value = true
+      cpuModel.value = ''
+      break
+    default:
+      cpuModel.value =
+        props.cpuModels.find((model) => model.value === model.value.cpu.model)
+          ?.value || cpuModel.value
+  }
+}
 watch(
-  [
-    reservation,
-    reservationType,
-    limit,
-    limitType,
-    shares,
-    selectedCpu,
-    selectedMaxCpu,
-    selectedCorePerSocket,
-    enableCpuHotAdd,
-    cpuModel,
-    passthroughHostCpu,
-    hostModelCpu,
-  ],
+  [cpuModel, passthroughHostCpu, hostModelCpu],
   () => {
-    const reservationInMhz =
-      reservationType.value === 'ghz'
-        ? $binary.ghzToMhz(+reservation.value)
-        : +reservation.value
-    const limitInMhz =
-      limit.value === 'Unlimited'
-        ? limit.value
-        : limitType.value === 'ghz'
-        ? $binary.ghzToMhz(+limit.value)
-        : +limit.value
-    const model = passthroughHostCpu.value
+    model.value.cpu.model = passthroughHostCpu.value
       ? 'host-passthrough'
       : hostModelCpu.value
       ? 'host-model'
       : cpuModel.value
-
-    emits('send-data', {
-      model,
-      vcpus: selectedCpu.value,
-      max_vcpus: enableCpuHotAdd.value ? selectedMaxCpu.value : 0,
-      core_per_socket: selectedCorePerSocket.value,
-      reservation_mhz: reservationInMhz,
-      limit_mhz: limitInMhz,
-      shares: +shares.value,
-      hotplug: enableCpuHotAdd.value,
-    })
   },
-  {
-    immediate: true,
-  }
+  { deep: true, immediate: true }
 )
 
-// Добавляем данные для редактирования
-watch(
-  () => props.cpu,
-  (newValue) => {
-    if (!newValue) return
-
-    enableCpuHotAdd.value = newValue.hotplug
-    selectedCpu.value = newValue.vcpus
-    selectedMaxCpu.value = newValue.hotplug ? newValue.max_vcpus : 1
-    selectedCorePerSocket.value = newValue.core_per_socket
-    shares.value = '' + newValue.shares
-    sharesType.value = '' + newValue.shares
-
-    const reservationInGhz = $binary.mhzToGhz(newValue.reservation_mhz)
-    if (reservationInGhz < 1) {
-      reservation.value = newValue.reservation_mhz.toString()
-      reservationType.value = 'mhz'
-    } else {
-      reservation.value = reservationInGhz
-      reservationType.value = 'ghz'
-    }
-
-    if (typeof newValue.limit_mhz === 'string') limit.value = newValue.limit_mhz
-    else {
-      const limitInGhz = $binary.mhzToGhz(newValue.limit_mhz)
-      if (limitInGhz < 1) {
-        limit.value = newValue.limit_mhz.toString()
-        limitType.value = 'mhz'
-      } else {
-        limit.value = limitInGhz
-        limitType.value = 'ghz'
-      }
-    }
-
-    switch (newValue.model) {
-      case 'host-passthrough':
-        passthroughHostCpu.value = true
-        hostModelCpu.value = false
-        cpuModel.value = ''
-        break
-      case 'host-model':
-        passthroughHostCpu.value = false
-        hostModelCpu.value = true
-        cpuModel.value = ''
-        break
-      default:
-        cpuModel.value =
-          props.cpuModels.find((model) => model.value === newValue.model)
-            ?.value || cpuModel.value
-    }
-  },
-  { immediate: true }
-)
+// const isShowCpuHelp = ref<boolean>(false)
 
 const onRemoveValidationError = (): void => {
   emits('remove-error-by-title', 'cpu.vcpus')

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

@@ -24,7 +24,7 @@
       <template #stackBlockContent>
         <div class="flex-align-center flex-space-between">
           <ui-combobox
-            v-model.number="selectedCpu"
+            v-model.number="model.cpu.vcpus"
             :items="props.cpuOptions"
             :disabled="props.isCpuDisabled"
             :error-text="props.vcpusLocalAndApiErrorsTexts"
@@ -70,7 +70,7 @@
       </template>
       <template #stackChildren>
         <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-cores-per-socket
-          v-model:selected-core-per-socket="selectedCorePerSocket"
+          v-model:selected-core-per-socket="model.cpu.core_per_socket"
           :selected-cpus="props.selectedCpus"
           :cpu-options="props.cpuOptions"
           :is-edit="props.isEdit"
@@ -79,12 +79,12 @@
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
         <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-hot-plug
-          v-model:enable-cpu-hot-add="enableCpuHotAdd"
+          v-model:enable-cpu-hot-add="model.cpu.hotplug"
           :disabled="props.enableCpuHotAddDisabled"
         />
         <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-max-cpu
-          v-show="enableCpuHotAdd"
-          v-model:selected-max-cpu.number="selectedMaxCpu"
+          v-show="model.cpu.hotplug"
+          v-model:selected-max-cpu.number="model.cpu.max_vcpus"
           :cpu-options="props.maxCpuOptions"
           :error-validation-fields="props.errorValidationFields"
           :disabled="props.isDisabled"
@@ -150,17 +150,10 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
+
+const model = defineModel<UI_I_CreateVmData>({ required: true })
 
-const selectedCpu = defineModel<number>('selectedCpu', { required: true })
-const selectedCorePerSocket = defineModel<number>('selectedCorePerSocket', {
-  required: true,
-})
-const enableCpuHotAdd = defineModel<boolean>('enableCpuHotAdd', {
-  required: true,
-})
-const selectedMaxCpu = defineModel<number>('selectedMaxCpu', {
-  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/CpuOld.vue

@@ -28,7 +28,7 @@
               <template #elem>
                 <atoms-combobox
                   id="vm-wizard-vcpus-field"
-                  v-model.number="selectedCpu"
+                  v-model.number="model.cpu.vcpus"
                   :items="props.cpuOptions"
                   :disabled="props.isCpuDisabled"
                   class="input-text-color"
@@ -48,7 +48,7 @@
       </template>
       <template #stackChildren>
         <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-cores-per-socket
-          v-model:selected-core-per-socket="selectedCorePerSocket"
+          v-model:selected-core-per-socket="model.cpu.core_per_socket"
           :selected-cpus="props.selectedCpus"
           :cpu-options="props.cpuOptions"
           :is-edit="props.isEdit"
@@ -57,12 +57,12 @@
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
         <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-hot-plug
-          v-model:enable-cpu-hot-add="enableCpuHotAdd"
+          v-model:enable-cpu-hot-add="model.cpu.hotplug"
           :disabled="props.enableCpuHotAddDisabled"
         />
         <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-max-cpu
-          v-show="enableCpuHotAdd"
-          v-model:selected-max-cpu.number="selectedMaxCpu"
+          v-show="model.cpu.hotplug"
+          v-model:selected-max-cpu.number="model.cpu.max_vcpus"
           :cpu-options="props.maxCpuOptions"
           :error-validation-fields="props.errorValidationFields"
           :disabled="props.isDisabled"
@@ -129,15 +129,10 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
+
+const model = defineModel<UI_I_CreateVmData>({ required: true })
 
-const selectedCpu = defineModel<number>('selectedCpu', { required: true })
-const selectedCorePerSocket = defineModel<number>('selectedCorePerSocket', {
-  required: true,
-})
-const enableCpuHotAdd = defineModel<boolean>('enableCpuHotAdd', {
-  required: true,
-})
-const selectedMaxCpu = defineModel<number>('selectedMaxCpu', { required: true })
 const reservation = defineModel<string>('reservation', { required: true })
 const reservationType = defineModel<string>('reservationType', {
   required: true,