bfg-common 1.5.556 → 1.5.558

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/newNetwork/NewNetwork.vue

@@ -1,9 +1,9 @@
 <template>
   <common-vm-actions-common-customize-hardware-virtual-hardware-new-network-new
     v-if="isNewView"
-    v-model:selected-location="selectedLocation"
-    v-model:adapter-type="adapterType"
-    v-model:mac-address="macAddress"
+    v-model:selected-location="netBridge"
+    v-model:adapter-type="model"
+    v-model:mac-address="mac"
     v-model:mac-address-type="macAddressType"
     v-model:new-network-invalid="newNetworkInvalid"
     :index="props.index"
@@ -26,9 +26,9 @@
   />
   <common-vm-actions-common-customize-hardware-virtual-hardware-new-network-old
     v-else
-    v-model:selected-location="selectedLocation"
-    v-model:adapter-type="adapterType"
-    v-model:mac-address="macAddress"
+    v-model:selected-location="netBridge"
+    v-model:adapter-type="model"
+    v-model:mac-address="mac"
     v-model:mac-address-type="macAddressType"
     v-model:new-network-invalid="newNetworkInvalid"
     :index="props.index"
@@ -56,20 +56,45 @@ import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
 import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interfaces'
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
-import type { UI_I_SendDataNewNetwork } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
 import type { UI_T_NetworkType } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/types'
 import type {
   UI_I_Localization,
   UI_I_HTMLSelectElement,
 } 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 network = defineModel<UI_I_CreateVmData['network_devices'][0]['network']>(
+  'network',
+  { required: true }
+)
+const netBridge = defineModel<
+  UI_I_CreateVmData['network_devices'][0]['net_bridge']
+>('netBridge', { required: true })
+watch(netBridge, (newValue) => {
+  const selectedOption = locationOptions.value.find(
+    (option) => option.value === newValue
+  )
+  if (selectedOption) {
+    network.value = selectedOption.text
+  }
+})
+
+const mac = defineModel<UI_I_CreateVmData['network_devices'][0]['mac']>('mac', {
+  required: true,
+})
+const model = defineModel<UI_I_CreateVmData['network_devices'][0]['model']>(
+  'model',
+  {
+    required: true,
+  }
+)
 
 const props = withDefaults(
   defineProps<{
     project: UI_T_Project
     index: number
     type: UI_T_NetworkType
-    network: UI_I_SendDataNewNetwork
     networksTable: UI_I_NetworkTableItem[]
     errorValidationFields: UI_I_ErrorValidationField[]
     isEdit: boolean
@@ -80,7 +105,6 @@ const props = withDefaults(
   }
 )
 const emits = defineEmits<{
-  (event: 'send-data', value: UI_I_SendDataNewNetwork): void
   (event: 'invalid', value: boolean): void
   (event: 'remove'): void
   (event: 'remove-error-by-title', value: string): void
@@ -102,7 +126,7 @@ const isRemovable = computed<boolean>(() => {
   return (
     !props.isEdit ||
     !isRunning.value ||
-    (isRunning.value && adapterType.value === 'virtio')
+    (isRunning.value && model.value === 'virtio')
   )
 })
 
@@ -118,9 +142,15 @@ const label = computed<string>(() => {
 // }
 
 const selectedLocationOld = ref<string>('')
-const selectedLocation = ref<string>('')
 const locationOptions = ref<UI_I_OptionItem[]>([])
 
+if (netBridge.value) {
+  locationOptions.value = [
+    { text: network.value, value: netBridge.value },
+    { text: `${localization.value.common.browse}...`, value: '' },
+  ]
+}
+
 const getNetworks = (): void => {
   // if (props.networksTable.length) return // Из-за этого кода был баг. Открыть визард вм -> создать сеть -> открыть визард вм и в списке сетей нету новой сети
 
@@ -149,9 +179,8 @@ watch(
 watch(
   () => props.networksTable,
   (newValue) => {
-    const isExistValue = newValue.some(
-      (network) => network[valueProp] === selectedLocation.value
-    )
+    if (!newValue.length && props.type !== 'new') return
+
     if (!newValue.length) {
       locationOptions.value = [
         {
@@ -159,29 +188,33 @@ watch(
           value: 'noAvailableNetworks',
         },
       ]
-      selectedLocation.value = 'noAvailableNetworks'
+      netBridge.value = 'noAvailableNetworks'
       newNetworkInvalid.value = true
       return
     }
     newNetworkInvalid.value = false
 
+    const isExistValue = newValue.some(
+      (networkLocal) => networkLocal[valueProp] === netBridge.value
+    )
+
     if (props.type === 'edit' || isExistValue) return
 
     selectedLocationOld.value = newValue[0][valueProp] || ''
-    selectedLocation.value = newValue[0][valueProp] || ''
+    netBridge.value = newValue[0][valueProp] || ''
 
     locationOptions.value = [
       { text: newValue[0].name, value: newValue[0][valueProp] },
       { text: `${localization.value.common.browse}...`, value: '' },
     ]
   },
-  { immediate: true }
+  { immediate: true, deep: true }
 )
 
 const locationModalIsShow = ref<boolean>(false)
 const onHideLocationModal = (): void => {
   locationModalIsShow.value = false
-  selectedLocation.value = selectedLocationOld.value
+  netBridge.value = selectedLocationOld.value
 }
 const changeLocation = (event: UI_I_HTMLSelectElement): void => {
   const value = event.target.value
@@ -191,17 +224,16 @@ const changeLocation = (event: UI_I_HTMLSelectElement): void => {
   }
 
   selectedLocationOld.value = value
-  selectedLocation.value = value
-  // netBridge.value = value
+  netBridge.value = value
 }
-const onSelectLocation = (network: UI_I_NetworkTableItem): void => {
+const onSelectLocation = (networkLocal: UI_I_NetworkTableItem): void => {
   locationModalIsShow.value = false
 
-  selectedLocationOld.value = network[valueProp]
-  selectedLocation.value = network[valueProp]
+  selectedLocationOld.value = networkLocal[valueProp]
+  netBridge.value = networkLocal[valueProp]
 
   const hasNetwork = locationOptions.value.some(
-    (option) => option.value === network[valueProp]
+    (option) => option.value === networkLocal[valueProp]
   )
   if (hasNetwork) {
     return
@@ -209,65 +241,17 @@ const onSelectLocation = (network: UI_I_NetworkTableItem): void => {
 
   locationOptions.value = [
     ...locationOptions.value.slice(0, -1),
-    { text: network.name, value: network[valueProp] },
+    { text: networkLocal.name, value: networkLocal[valueProp] },
     locationOptions.value[locationOptions.value.length - 1],
   ]
 }
-
-const adapterType = ref<string>('rtl8139')
-
-const target = ref<string>('')
-
-const macAddress = ref<string>('')
 const macAddressType = ref<string>('automatic')
 
-watch(
-  [selectedLocation, adapterType, macAddress, macAddressType, locationOptions],
-  () => {
-    const option = locationOptions.value.find(
-      (option) => option.value === selectedLocation.value
-    )
-    if (!option) return
-
-    emits('send-data', {
-      network: option.text,
-      // net_bridge: props.project === 'procurator' ? option.value : '',
-      net_bridge: option.value,
-      target: target.value,
-      model: adapterType.value,
-      mac: macAddress.value,
-      boot_order: props.network.boot_order,
-    })
-  },
-  { immediate: true }
-)
-
-// Добавляем данные для редактирования
-watch(
-  () => props.network,
-  (newValue) => {
-    // if (props.type !== 'edit') return
-    if (props.type !== 'edit' && props.type !== 'clone') return
-
-    locationOptions.value = [
-      { text: newValue.network, value: newValue[valueProp] },
-      { text: `${localization.value.common.browse}...`, value: '' },
-    ]
-    selectedLocation.value = newValue[valueProp]
-
-    adapterType.value = newValue.model
-    target.value = newValue.target
-    // Сбрасываем mac address при клонировании
-    macAddress.value = props.type === 'clone' ? '' : newValue.mac
-  },
-  { immediate: true }
-)
-
 watch(
   isRunning,
   (newValue) => {
     if (newValue && props.type === 'new') {
-      adapterType.value = 'virtio'
+      model.value = 'virtio'
     }
   },
   { immediate: true }

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