bfg-common 1.5.554 → 1.5.555

package/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/Memory.vue

@@ -10,7 +10,7 @@
     v-model:limit="limit"
     v-model:limit-type="limitType"
     v-model:limit-invalid="limitInvalid"
-    v-model:memory-hot-plug="memoryHotPlug"
+    v-model:memory-hot-plug="model.memory.hotplug"
     :error-validation-fields="props.errorValidationFields"
     :memory-invalid="memoryInvalid"
     :error-text="memorySizeLocalAndApiErrorsTexts"
@@ -35,7 +35,7 @@
     v-model:limit="limit"
     v-model:limit-type="limitType"
     v-model:limit-invalid="limitInvalid"
-    v-model:memory-hot-plug="memoryHotPlug"
+    v-model:memory-hot-plug="model.memory.hotplug"
     :error-validation-fields="props.errorValidationFields"
     :memory-invalid="memoryInvalid"
     :error-text="memorySizeLocalAndApiErrorsTexts"
@@ -52,31 +52,29 @@
 </template>
 
 <script setup lang="ts">
-import type { API_UI_I_VmEditMemory } from '~/lib/models/store/vm/interfaces'
-import type { UI_I_SendDataMemory } 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 { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
 import {
   memoryOptionsFunc,
   memoryTypeOptionsFunc,
 } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/lib/config/memoryOptions'
 
+const model = defineModel<UI_I_CreateVmData>({ required: true })
+
 const props = withDefaults(
   defineProps<{
     maxMemory: number
     isEdit: boolean
     errorValidationFields: UI_I_ErrorValidationField[]
     state?: string | number
-    memory?: API_UI_I_VmEditMemory
   }>(),
   {
     state: undefined,
-    memory: undefined,
   }
 )
 const emits = defineEmits<{
-  (event: 'send-data', value: UI_I_SendDataMemory): void
   (event: 'invalid', value: boolean): void
   (event: 'remove-error-by-title', value: string): void
 }>()
@@ -103,7 +101,7 @@ const isDisabled = computed<boolean>(() => {
 })
 
 const isMemoryDisabled = computed<boolean>(
-  () => isDisabled.value && !memoryHotPlug.value
+  () => isDisabled.value && !model.value.memory.hotplug
 )
 
 const selectedMemory = ref<number>(4)
@@ -122,6 +120,18 @@ const memoryInMb = computed<number>(() => {
 
   return $binary.universalFromTo(+selectedMemory.value, memoryType.value, 'mb')
 })
+watch(memoryInMb, (newValue) => {
+  model.value.memory.size_mb = newValue
+})
+if (model.value.memory.size_mb !== 4096) {
+  const sizeInGb = $binary.mbToGb(model.value.memory.size_mb)
+  if (sizeInGb < 1) {
+    selectedMemory.value = model.value.memory.size_mb
+    memoryType.value = 'mb'
+  } else {
+    selectedMemory.value = sizeInGb
+  }
+}
 
 const memoryOptions = ref<UI_I_OptionItem[]>(
   memoryOptionsFunc(localization.value, minMemoryInMb, props.maxMemory)
@@ -211,6 +221,26 @@ watch(reservation, (newValue) => {
 })
 const reservationType = ref<string>('mb')
 const reserveGuestMemory = ref<boolean>(false)
+if (model.value.memory.reservation_mb !== 2) {
+  const reservationInGb = $binary.mbToGb(model.value.memory.reservation_mb)
+  if (reservationInGb < 1) {
+    reservation.value = model.value.memory.reservation_mb.toString()
+    reservationType.value = 'mb'
+  } else {
+    reservation.value = reservationInGb
+    reservationType.value = 'gb'
+  }
+}
+watch(
+  [reservation, reservationType],
+  () => {
+    model.value.memory.reservation_mb =
+      reservationType.value === 'gb'
+        ? $binary.gbToMb(+reservation.value)
+        : +reservation.value
+  },
+  { deep: true, immediate: true }
+)
 
 const limit = ref<string>('Unlimited')
 watch(limit, (newValue) => {
@@ -220,90 +250,47 @@ watch(limit, (newValue) => {
 })
 const limitType = ref<string>('mb')
 const limitOptions = computed<UI_I_OptionItem[] | undefined>(() => {
-  if (memoryHotPlug.value)
+  if (model.value.memory.hotplug)
     return memoryOptionsFunc(
       localization.value,
       memoryInMb.value,
       props.maxMemory
     )
 })
-
-const memoryHotPlug = ref<boolean>(false)
-const isDisabledMemoryHotPlug = computed<boolean>(
-  () => memoryInMb.value >= props.maxMemory || isDisabled.value
-)
-watch(isDisabledMemoryHotPlug, (newValue) => {
-  if (newValue) memoryHotPlug.value = false
-})
-
+if (model.value.memory.limit_mb !== null) {
+  if (typeof model.value.memory.limit_mb === 'string')
+    limit.value = model.value.memory.limit_mb
+  else {
+    const limitInGb = $binary.mbToGb(model.value.memory.limit_mb)
+    if (limitInGb < 1) {
+      limit.value = model.value.memory.limit_mb.toString()
+      limitType.value = 'mb'
+    } else {
+      limit.value = limitInGb
+      limitType.value = 'gb'
+    }
+  }
+}
 watch(
-  [memoryInMb, memoryHotPlug, reservation, reservationType, limit, limitType],
+  [limit, limitType],
   () => {
-    const reservationInMb =
-      reservationType.value === 'mb'
-        ? reservation.value
-        : '' +
-          $binary.universalFromTo(
-            reservation.value,
-            reservationType.value,
-            'mb',
-            12
-          )
-    const limitInMb =
+    model.value.memory.limit_mb =
       limit.value === 'Unlimited'
         ? limit.value
         : limitType.value === 'gb'
         ? $binary.gbToMb(+limit.value)
         : +limit.value
-    emits('send-data', {
-      memory: '' + memoryInMb.value,
-      hotplug: memoryHotPlug.value,
-      reservation_mb: reservationInMb,
-      limit_mb: limitInMb,
-    })
   },
-  { immediate: true }
+  { deep: true, immediate: true }
 )
 
-// Добавляем данные для редактирования
-watch(
-  () => props.memory,
-  (newValue) => {
-    if (!newValue) return
-
-    const sizeInGb = $binary.mbToGb(newValue.size_mb)
-    if (sizeInGb < 1) {
-      selectedMemory.value = newValue.size_mb
-      memoryType.value = 'mb'
-    } else {
-      selectedMemory.value = sizeInGb
-    }
-
-    const reservationInGb = $binary.mbToGb(newValue.reservation_mb)
-    if (reservationInGb < 1) {
-      reservation.value = newValue.reservation_mb
-      reservationType.value = 'mb'
-    } else {
-      reservation.value = reservationInGb
-      reservationType.value = 'gb'
-    }
-
-    if (typeof newValue.limit_mb === 'string') limit.value = newValue.limit_mb
-    else {
-      const limitInGb = $binary.mbToGb(newValue.limit_mb)
-      if (limitInGb < 1) {
-        limit.value = newValue.limit_mb
-        limitType.value = 'mb'
-      } else {
-        limit.value = limitInGb
-        limitType.value = 'gb'
-      }
-    }
-
-    memoryHotPlug.value = newValue.hotplug
-  },
-  { immediate: true }
+// const memoryHotPlug = ref<boolean>(false)
+const isDisabledMemoryHotPlug = computed<boolean>(
+  () => memoryInMb.value >= props.maxMemory || isDisabled.value
 )
+watch(isDisabledMemoryHotPlug, (newValue) => {
+  if (newValue) model.value.memory.hotplug = false
+})
 
 const onRemoveValidationError = (): void => {
   emits('remove-error-by-title', 'memory.size_mb')

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newUsbController/NewUsbController.vue

@@ -1,14 +1,14 @@
 <template>
   <common-vm-actions-common-customize-hardware-virtual-hardware-new-usb-controller-new
     v-if="isNewView"
-    v-model:selected-usb-controller="selectedUsbController"
+    v-model="model"
     :is-edit="props.isEdit"
     :selected-usb-controller-text="selectedUsbControllerText"
     :usb-controller-options="usbControllerOptions"
   />
   <common-vm-actions-common-customize-hardware-virtual-hardware-new-usb-controller-old
     v-else
-    v-model:selected-usb-controller="selectedUsbController"
+    v-model="model"
     :is-edit="props.isEdit"
     :selected-usb-controller-text="selectedUsbControllerText"
     :usb-controller-options="usbControllerOptions"
@@ -17,42 +17,31 @@
 
 <script setup lang="ts">
 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'
 import { usbControllerOptionsConfig } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/newUsbController/lib/config/options'
 
+const model = defineModel<UI_I_CreateVmData['usb_controllers'][0]['type']>({ required: true })
+
 const props = withDefaults(
   defineProps<{
-    usbController: string
     isEdit: boolean
     state?: string | number
   }>(),
   {
-    usbController: 'usb2',
     state: undefined,
   }
 )
-const emits = defineEmits<{
-  (event: 'send-data', value: string): void
-}>()
 
 const { $store }: any = useNuxtApp()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const usbControllerOptions = ref<UI_I_OptionItem[]>(usbControllerOptionsConfig)
-const selectedUsbController = ref<string>(props.usbController)
 const selectedUsbControllerText = computed<string>(
   () =>
     usbControllerOptions.value.find(
-      (option) => option.value === selectedUsbController.value
+      (option) => option.value === model.value
     )?.text || ''
 )
-
-watch(
-  selectedUsbController,
-  (newValue) => {
-    emits('send-data', newValue)
-  },
-  { immediate: true }
-)
 </script>
 
 <style scoped lang="scss"></style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newUsbController/NewUsbControllerNew.vue

@@ -21,7 +21,7 @@
       <ui-select
         v-else
         id="usb-controller-select"
-        v-model="selectedUsbController"
+        v-model="model"
         :items="props.usbControllerOptions"
         :disabled="props.isEdit"
         width="auto"
@@ -33,10 +33,13 @@
 </template>
 
 <script setup lang="ts">
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/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 selectedUsbController = defineModel<string>('selectedUsbController')
+const model = defineModel<UI_I_CreateVmData['usb_controllers'][0]['type']>({
+  required: true,
+})
 
 const props = defineProps<{
   isEdit: boolean

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newUsbController/NewUsbControllerOld.vue

@@ -20,7 +20,7 @@
         <div v-else class="select">
           <select
             id="usb-controller-select"
-            v-model="selectedUsbController"
+            v-model="model"
             :disabled="props.isEdit"
             data-id="usb-controller-select"
             @click.stop
@@ -40,10 +40,13 @@
 </template>
 
 <script setup lang="ts">
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/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 selectedUsbController = defineModel<string>('selectedUsbController')
+const model = defineModel<UI_I_CreateVmData['usb_controllers'][0]['type']>({
+  required: true,
+})
 
 const props = defineProps<{
   isEdit: boolean

package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCard.vue

@@ -1,9 +1,8 @@
 <template>
   <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-new
     v-if="isNewView"
+    v-model="model"
     v-model:invalid="invalid"
-    v-model:number-displays="numberDisplays"
-    v-model:video-card-model="videoCardModel"
     :is-edit="props.isEdit"
     :error-validation-fields="props.errorValidationFields"
     :video-card-model-name="videoCardModelName"
@@ -18,9 +17,8 @@
   />
   <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-old
     v-else
+    v-model="model"
     v-model:invalid="invalid"
-    v-model:number-displays="numberDisplays"
-    v-model:video-card-model="videoCardModel"
     :is-edit="props.isEdit"
     :error-validation-fields="props.errorValidationFields"
     :video-card-model-name="videoCardModelName"
@@ -40,9 +38,12 @@ import type { UI_I_SendDataVideoCard } from '~/components/common/vm/actions/comm
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
 import type { UI_I_Localization } from '~/lib/models/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'
 import { videoCardModelOptionsConfigFunc } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/model/lib/config/options'
 import { numberDisplaysOptionsFunc } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/lib/config/options'
 
+const model = defineModel<UI_I_CreateVmData['video_card']>({ required: true })
+
 const props = withDefaults(
   defineProps<{
     isEdit: boolean
@@ -56,7 +57,6 @@ const props = withDefaults(
   }
 )
 const emits = defineEmits<{
-  (event: 'send-data', value: UI_I_SendDataVideoCard): void
   (event: 'invalid', value: boolean): void
   (event: 'remove-error-by-title', value: string): void
 }>()
@@ -68,32 +68,30 @@ const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const isDisabled = computed<boolean>(() => props.isEdit && props.state !== 1)
 const isDisabledNumberDisplays = computed<boolean>(
-  () => videoCardModel.value === 'none'
+  () => model.value.adapter === 'none'
 )
 watch(isDisabled, (newValue) => {
   if (!newValue) {
     return
   }
 
-  numberDisplays.value = '1'
+  model.value.displays = 1
 })
 
-const videoCardModel = ref<string>('qxl')
 const videoCardModelOptions = computed<UI_I_OptionItem[]>(() =>
   videoCardModelOptionsConfigFunc(localization.value)
 )
 const videoCardModelName = computed<string>(
   () =>
     videoCardModelOptions.value.find(
-      (videoCard) => videoCard.value === videoCardModel.value
+      (videoCard) => videoCard.value === model.value.adapter
     )?.text || ''
 )
 
-const numberDisplays = ref<string>('1')
 const numberDisplaysOptions = computed<UI_I_OptionItem[]>(() => {
   const result = numberDisplaysOptionsFunc()
-  if (videoCardModel.value === 'none') {
-    result.unshift({ text: '0', value: '0' })
+  if (model.value.adapter === 'none') {
+    result.unshift({ text: '0', value: 0 })
   }
   return result
 })
@@ -110,37 +108,17 @@ watch(
 
 // const graphics = ref(false)
 
-const changeNumberDisplays = (model: any): void => {
-  if (model === 'none') {
-    numberDisplays.value = '0'
-  } else if (numberDisplays.value === '0') {
-    numberDisplays.value = '1'
+const changeNumberDisplays = (modelLocal: string): void => {
+  if (modelLocal === 'none') {
+    model.value.displays = 0
+  } else if (model.value.displays === 0) {
+    model.value.displays = 1
   }
 }
 watch(
-  // [numberDisplays, totalVideoMemory, videoCardModel],
-  [numberDisplays, videoCardModel],
-  ([_newValue1, newValue2]) => {
-    changeNumberDisplays(newValue2)
-
-    emits('send-data', {
-      adapter: videoCardModel.value,
-      displays: +numberDisplays.value,
-      // memory_mb: totalVideoMemory.value,
-    })
-  },
-  { immediate: true }
-)
-
-// Добавляем данные для редактирования
-watch(
-  () => props.videoCard,
+  () => model.value.adapter,
   (newValue) => {
-    if (!newValue) return
-
-    videoCardModel.value = newValue.adapter
-    numberDisplays.value = '' + newValue.displays
-    // totalVideoMemory.value = newValue.memory_mb
+    changeNumberDisplays(newValue)
   },
   { immediate: true }
 )

package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCardNew.vue

@@ -26,7 +26,7 @@
     <template #stackBlockContent>
       <ui-select
         id="vm-wizard-video-card"
-        v-model="videoCardModel"
+        v-model="model.adapter"
         :items="props.videoCardModelOptions"
         :disabled="props.isEdit && props.state !== 1"
         :error-text="props.errorText"
@@ -38,7 +38,7 @@
     </template>
     <template #stackChildren>
       <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-number-displays
-        v-model:number-displays="numberDisplays"
+        v-model:number-displays="model.displays"
         :number-displays-options="props.numberDisplaysOptions"
         :disabled="props.isDisabled || props.isDisabledNumberDisplays"
         :error-validation-fields="props.errorValidationFields"
@@ -56,7 +56,7 @@
       <!--          v-models:graphics="graphics"-->
       <!--        />-->
       <!--      <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-model-->
-      <!--        v-model:video-card-model="videoCardModel"-->
+      <!--        v-model:video-card-model="model.adapter"-->
       <!--        :disabled="props.isDisabled"-->
       <!--      />-->
     </template>
@@ -67,13 +67,14 @@
 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['video_card']>({ required: true })
 
 const invalid = defineModel<boolean>('invalid', { required: true })
-const numberDisplays = defineModel<string>('numberDisplays', { required: true })
 // const totalVideoMemory = defineModel<number>('totalVideoMemory', {
 //   required: true,
 // })
-const videoCardModel = defineModel<string>('videoCardModel', { required: true })
 
 const props = withDefaults(
   defineProps<{

package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCardOld.vue

@@ -30,7 +30,7 @@
             <div class="select">
               <select
                 id="vm-wizard-video-card"
-                v-model="videoCardModel"
+                v-model="model.adapter"
                 :disabled="props.isEdit && props.state !== 1"
                 data-id="vm-wizard-video-card-select"
                 class="vm-wizard-video-card input-text-color"
@@ -51,7 +51,7 @@
       </template>
       <template #stackChildren>
         <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-number-displays
-          v-model:number-displays="numberDisplays"
+          v-model:number-displays="model.displays"
           :number-displays-options="props.numberDisplaysOptions"
           :disabled="props.isDisabled || props.isDisabledNumberDisplays"
           :error-validation-fields="props.errorValidationFields"
@@ -69,7 +69,7 @@
         <!--          v-models:graphics="graphics"-->
         <!--        />-->
         <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-model-->
-        <!--          v-model:video-card-model="videoCardModel"-->
+        <!--          v-model:video-card-model="model.adapter"-->
         <!--          :disabled="props.isDisabled"-->
         <!--        />-->
       </template>
@@ -81,13 +81,14 @@
 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['video_card']>({ required: true })
 
 const invalid = defineModel<boolean>('invalid', { required: true })
-const numberDisplays = defineModel<string>('numberDisplays', { required: true })
 // const totalVideoMemory = defineModel<number>('totalVideoMemory', {
 //   required: true,
 // })
-const videoCardModel = defineModel<string>('videoCardModel', { required: true })
 
 const props = withDefaults(
   defineProps<{

package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/lib/config/options.ts

@@ -1,10 +1,10 @@
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 
 export const numberDisplaysOptionsFunc = (): UI_I_OptionItem[] => [
-    { text: '1', value: '1' },
-    { text: '2', value: '2' },
-    { text: '3', value: '3' },
-    { text: '4', value: '4' },
+    { text: '1', value: 1 },
+    { text: '2', value: 2 },
+    { text: '3', value: 3 },
+    { text: '4', value: 4 },
     // { text: '5', value: '5' },
     // { text: '6', value: '6' },
     // { text: '7', value: '7' },