bfg-common 1.5.554 → 1.5.555

package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardware.vue

@@ -1,6 +1,7 @@
 <template>
   <common-vm-actions-common-customize-hardware-virtual-hardware-new
     v-if="isNewView"
+    v-model="model"
     v-model:cpu-invalid="cpuInvalid"
     v-model:memory-invalid="memoryInvalid"
     v-model:video-card-invalid="videoCardInvalid"
@@ -9,7 +10,6 @@
     :is-edit="props.isEdit"
     :storage="props.storage"
     :project="props.project"
-    :max-cpus="props.maxCpus"
     :max-memory="props.maxMemory"
     :cpu-models="props.cpuModels"
     :datastore="props.datastore"
@@ -27,15 +27,12 @@
     :cd-dvd-drives-index="cdDvdDrivesIndex"
     :error-validation-fields="errorValidationFields"
     :get-datastore-table-func="getDatastoreTableFunc"
-    :cpu="cpu"
     :state="state"
-    :memory="memory"
     :networks="networksLocal"
     :hard-disks="hardDisksLocal"
     :video-card="videoCard"
     :pci-devices="pciDevicesLocal"
     :cd-dvd-drives="cdDvdDrivesLocal"
-    :usb-controller="usbController"
     :guest-machine-type="guestMachineType"
     :passthrough-devices="passthroughDevices"
     :mediated-devices="mediatedDevices"
@@ -55,22 +52,19 @@
     @remove-cd-dvd-drive="onRemoveCdDvdDrive(...$event)"
     @show-datastore-child="emits('show-datastore-child', $event)"
     @get-folders-or-files="emits('get-folders-or-files', $event)"
-    @send-data-cpu-method="onSendDataCpuMethod"
     @set-invalid-hard-disk="onSetInvalidHardDisk(...$event)"
     @remove-error-by-title="emits('remove-error-by-title', $event)"
     @roll-back-cd-dvd-drive="onRollBackCdDvdDrive"
     @set-invalid-pci-device="onSetInvalidPciDevice(...$event)"
     @get-active-device-child="emits('get-active-device-child', $event)"
-    @send-data-memory-method="onSendDataMemoryMethod"
-    @send-data-video-card-method="onSendDataVideoCardMethod"
     @send-data-new-network-method="sendDataNewNetworkMethod(...$event)"
     @send-data-pci-devices-method="onSendDataPciDevicesMethod(...$event)"
     @send-data-new-hard-disk-method="onSendDataNewHardDiskMethod(...$event)"
     @send-data-new-cd-dvd-drive-method="sendDataNewCdDvdDriveMethod(...$event)"
-    @send-data-new-usb-controller-method="onSendDataNewUsbControllerMethod"
   />
   <common-vm-actions-common-customize-hardware-virtual-hardware-old
     v-else
+    v-model="model"
     v-model:cpu-invalid="cpuInvalid"
     v-model:memory-invalid="memoryInvalid"
     v-model:video-card-invalid="videoCardInvalid"
@@ -79,7 +73,6 @@
     :is-edit="props.isEdit"
     :storage="props.storage"
     :project="props.project"
-    :max-cpus="props.maxCpus"
     :max-memory="props.maxMemory"
     :cpu-models="props.cpuModels"
     :datastore="props.datastore"
@@ -97,15 +90,12 @@
     :cd-dvd-drives-index="cdDvdDrivesIndex"
     :error-validation-fields="errorValidationFields"
     :get-datastore-table-func="getDatastoreTableFunc"
-    :cpu="cpu"
     :state="state"
-    :memory="memory"
     :networks="networksLocal"
     :hard-disks="hardDisksLocal"
     :video-card="videoCard"
     :pci-devices="pciDevicesLocal"
     :cd-dvd-drives="cdDvdDrivesLocal"
-    :usb-controller="usbController"
     :guest-machine-type="guestMachineType"
     :passthrough-devices="passthroughDevices"
     :mediated-devices="mediatedDevices"
@@ -124,19 +114,15 @@
     @remove-cd-dvd-drive="onRemoveCdDvdDrive(...$event)"
     @show-datastore-child="emits('show-datastore-child', $event)"
     @get-folders-or-files="emits('get-folders-or-files', $event)"
-    @send-data-cpu-method="onSendDataCpuMethod"
     @set-invalid-hard-disk="onSetInvalidHardDisk(...$event)"
     @remove-error-by-title="emits('remove-error-by-title', $event)"
     @roll-back-cd-dvd-drive="onRollBackCdDvdDrive"
     @set-invalid-pci-device="onSetInvalidPciDevice(...$event)"
     @get-active-device-child="emits('get-active-device-child', $event)"
-    @send-data-memory-method="onSendDataMemoryMethod"
-    @send-data-video-card-method="onSendDataVideoCardMethod"
     @send-data-new-network-method="sendDataNewNetworkMethod(...$event)"
     @send-data-pci-devices-method="onSendDataPciDevicesMethod(...$event)"
     @send-data-new-hard-disk-method="onSendDataNewHardDiskMethod(...$event)"
     @send-data-new-cd-dvd-drive-method="sendDataNewCdDvdDriveMethod(...$event)"
-    @send-data-new-usb-controller-method="onSendDataNewUsbControllerMethod"
   />
 </template>
 
@@ -148,13 +134,10 @@ import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
 import type { UI_I_FolderOrFileTreePayload } from '~/lib/models/store/storage/interfaces'
 import type { UI_I_FileTreeNode } from '~/components/lib/models/interfaces'
 import type {
-  UI_I_SendDataCpu,
-  UI_I_SendDataMemory,
   UI_I_SendDataNewHardDisk,
   UI_I_SendDataNewNetwork,
   UI_I_SendDataVideoCard,
   UI_I_InvalidKeys,
-  UI_I_SendDataVirtualHardware,
   UI_I_SendDataNewCdDvdDrive,
   // UI_I_HardDisk,
   UI_I_SendDataNewPciDevice,
@@ -172,23 +155,23 @@ import type {
 } from '~/components/atoms/dropdown/tree/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type {
-  API_UI_I_VmEditCpu,
-  API_UI_I_VmEditMemory,
   UI_I_MediatedDevice,
   UI_I_PciDevice,
 } from '~/lib/models/store/vm/interfaces'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
 import { dropdownItemsFunc } from './lib/config/dropdownItems'
 
+const model = defineModel<UI_I_CreateVmData>({ required: true })
+
 const props = withDefaults(
   defineProps<{
     storage: UI_I_DatastoreTableItem | null
     cpuModels: UI_I_OptionItem[]
-    maxCpus: number
     maxMemory: number
     isEdit: boolean
     isClone: boolean
-    errorValidationFields: UI_I_ErrorValidationField<string>[]
+    errorValidationFields: UI_I_ErrorValidationField[]
     nodes: UI_I_FileTreeNode[]
     files: UI_I_FileTreeNode[]
     networksTable: UI_I_NetworkTableItem[]
@@ -197,14 +180,11 @@ const props = withDefaults(
     isDatastoreLoading: boolean
     project: UI_T_Project
     state?: string | number
-    cpu?: API_UI_I_VmEditCpu
-    memory?: API_UI_I_VmEditMemory
     vmCpuHelpTextSecond?: string
     hardDisks?: UI_I_SendDataNewHardDisk[] | null
     cdDvdDrives?: UI_I_SendDataNewCdDvdDrive[] | null
     networks?: UI_I_SendDataNewNetwork[] | null
     videoCard?: UI_I_SendDataVideoCard
-    usbController?: string
     pciDevices?: UI_I_SendDataNewPciDevice[]
     passthroughDevices?: UI_I_PciDevice[]
     mediatedDevices?: UI_I_MediatedDevice[]
@@ -214,14 +194,11 @@ const props = withDefaults(
   }>(),
   {
     state: undefined,
-    cpu: undefined,
-    memory: undefined,
     vmCpuHelpTextSecond: undefined,
     hardDisks: undefined,
     cdDvdDrives: undefined,
     networks: undefined,
     videoCard: undefined,
-    usbController: undefined,
     pciDevices: undefined,
     passthroughDevices: undefined,
     mediatedDevices: undefined,
@@ -231,7 +208,6 @@ const props = withDefaults(
   }
 )
 const emits = defineEmits<{
-  (event: 'send-data', value: UI_I_SendDataVirtualHardware): void
   (event: 'invalid', value: string[]): void
   (event: 'get-storage', value: UI_I_TablePayload): void
   (event: 'get-folders-or-files', value: UI_I_FolderOrFileTreePayload): void
@@ -301,6 +277,18 @@ const addHardDisk = (
   let provisionType = 'thick'
   if (provisioned_type === 1) provisionType = 'thin'
 
+  model.value.disk_devices = [
+    ...model.value.disk_devices.filter((disk) => disk.device_type !== 'cdrom'),
+    {
+      create,
+      size,
+      source,
+      attach: true,
+      boot_order: 0, // Убираем галочку
+      provision_type: provisionType,
+    },
+    ...model.value.disk_devices.filter((disk) => disk.device_type === 'cdrom'),
+  ]
   hardDisksLocal.value.push({
     create,
     size,
@@ -309,7 +297,6 @@ const addHardDisk = (
     boot_order: 0, // Убираем галочку
     provision_type: provisionType,
   })
-  sendData()
 }
 const onAddExistHardDisk = (file: UI_I_FileTreeNode): void => {
   addHardDisk(
@@ -331,7 +318,6 @@ const onRemoveHardDisk = (
       if (key === removeIndex) return 'removed'
       return item
     })
-    sendData()
     return
   }
 
@@ -340,6 +326,11 @@ const onRemoveHardDisk = (
     (_item, key) => key !== removeIndex
   )
 
+  model.value.disk_devices = model.value.disk_devices.filter(
+    (_hardDisk, key: number) => {
+      return removeIndex !== key
+    }
+  )
   hardDisksLocal.value = hardDisksLocal.value.filter(
     (_hardDisk, key: number) => {
       return removeIndex !== key
@@ -347,8 +338,6 @@ const onRemoveHardDisk = (
   )
 
   delete newHardDiskInvalidKeys.value[index]
-  delete sendDataNewHardDisk.value[index]
-  sendData()
 }
 const onRollBackHardDisk = (index: number): void => {
   const removeIndex = hardDisksIndex.value.indexOf(index)
@@ -400,6 +389,10 @@ const addNetwork = (): void => {
   networksIndex.value.push(index)
   networksType.value.push('new')
 
+  model.value.network_devices.push({
+    ...useDeepCopy(defaultNetwork),
+    boot_order: 0, // Убираем галочку
+  })
   networksLocal.value.push({
     ...useDeepCopy(defaultNetwork),
     boot_order: 0, // Убираем галочку
@@ -411,13 +404,14 @@ const onRemoveNetwork = (index: number): void => {
   networksType.value = networksType.value.filter(
     (_item, key) => key !== removeIndex
   )
+  model.value.network_devices = model.value.network_devices.filter(
+    (_network, key: number) => removeIndex !== key
+  )
   networksLocal.value = networksLocal.value.filter(
     (_network, key: number) => removeIndex !== key
   )
 
   delete newNetworkInvalidKeys.value[index]
-  delete sendDataNewNetwork.value[index]
-  sendData()
 }
 
 const defaultCdDvdDriver: UI_I_SendDataNewCdDvdDrive = {
@@ -455,6 +449,11 @@ const addCdDvdDrive = (): void => {
   const value = (cdDvdDrivesIndex.value.at(-1) ?? -1) + 1
   cdDvdDrivesIndex.value.push(value)
   cdDvdDrivesType.value.push('new')
+  model.value.disk_devices.push({
+    ...useDeepCopy(defaultCdDvdDriver),
+    attach: true,
+    boot_order: 0, // Убираем галочку
+  })
   cdDvdDrivesLocal.value.push({
     ...useDeepCopy(defaultCdDvdDriver),
     attach: true,
@@ -473,7 +472,6 @@ const onRemoveCdDvdDrive = (
       if (key === removeIndex) return 'removed'
       return item
     })
-    sendData()
     return
   }
 
@@ -483,12 +481,12 @@ const onRemoveCdDvdDrive = (
   cdDvdDrivesType.value = cdDvdDrivesType.value.filter(
     (_item, key) => key !== index
   )
+  model.value.disk_devices = model.value.disk_devices.filter(
+    (_cdDvdDrive, key: number) => removeIndex !== key
+  )
   cdDvdDrivesLocal.value = cdDvdDrivesLocal.value.filter(
     (_cdDvdDrive, key: number) => removeIndex !== key
   )
-
-  delete sendDataNewCdDvdDrive.value[index]
-  sendData()
 }
 const onRollBackCdDvdDrive = (index: number): void => {
   const removeIndex = cdDvdDrivesIndex.value.indexOf(index)
@@ -530,6 +528,7 @@ const addPciDevice = (): void => {
   pciDevicesType.value.push('new')
 
   pciDevicesLocal.value.push(useDeepCopy(defaultPciDevice))
+  model.value.passthrough_pci_devices.push(useDeepCopy(defaultPciDevice))
 }
 const onRemovePciDevice = (index: number): void => {
   const removeIndex = pciDevicesIndex.value.indexOf(index)
@@ -538,6 +537,11 @@ const onRemovePciDevice = (index: number): void => {
     (_item, key) => key !== removeIndex
   )
 
+  model.value.passthrough_pci_devices = model.value.passthrough_pci_devices.filter(
+    (_pciDevice, key: number) => {
+      return removeIndex !== key
+    }
+  )
   pciDevicesLocal.value = pciDevicesLocal.value.filter(
     (_pciDevice, key: number) => {
       return removeIndex !== key
@@ -545,8 +549,6 @@ const onRemovePciDevice = (index: number): void => {
   )
 
   delete newPciDeviceInvalidKeys.value[index]
-  delete sendDataNewPciDevices.value[index]
-  sendData()
 }
 
 const isShowFileModal = ref<boolean>(false)
@@ -571,80 +573,44 @@ const onAddDevice = (item: UI_I_DropdownTreeItemChild): void => {
 }
 
 const cpuInvalid = ref<boolean>(false)
-const sendDataCpu = ref<UI_I_SendDataCpu | null>(null)
-const onSendDataCpuMethod = (data: UI_I_SendDataCpu): void => {
-  sendDataCpu.value = data
-  sendData()
-}
-const sendDataMemory = ref<UI_I_SendDataMemory | null>(null)
-const onSendDataMemoryMethod = (data: UI_I_SendDataMemory): void => {
-  sendDataMemory.value = data
-  sendData()
-}
-const sendDataNewHardDisk = ref<UI_I_SendDataNewHardDisk[]>([])
 const onSendDataNewHardDiskMethod = (
   data: UI_I_SendDataNewHardDisk,
   index: number
 ): void => {
-  sendDataNewHardDisk.value[index] = data
-  sendData()
+  model.value.disk_devices[index] = {
+    ...data,
+    boot_order: model.value.disk_devices[index]?.boot_order || 0,
+  }
 }
-const sendDataNewNetwork = ref<UI_I_SendDataNewNetwork[]>([])
 const sendDataNewNetworkMethod = (
   data: UI_I_SendDataNewNetwork,
   index: number
 ): void => {
-  sendDataNewNetwork.value[index] = data
-  sendData()
+  model.value.network_devices[index] = {
+    ...data,
+    boot_order: model.value.network_devices[index]?.boot_order || 0,
+  }
 }
-const sendDataNewCdDvdDrive = ref<UI_I_SendDataNewCdDvdDrive[]>([])
 const sendDataNewCdDvdDriveMethod = (
   data: UI_I_SendDataNewCdDvdDrive,
   index: number
 ): void => {
-  sendDataNewCdDvdDrive.value[index] = data
-  sendData()
-}
-const sendDataNewUsbController = ref<string | null>(null)
-const onSendDataNewUsbControllerMethod = (data: string): void => {
-  sendDataNewUsbController.value = data
-  sendData()
+  const cdromIndexStart = model.value.disk_devices.findIndex(
+    (disk) => disk.device_type === 'cdrom'
+  )
+  model.value.disk_devices[cdromIndexStart + index] = {
+    ...data,
+    boot_order:
+      model.value.disk_devices[cdromIndexStart + index]?.boot_order || 0,
+  }
 }
-const sendDataNewPciDevices = ref<UI_I_SendDataNewPciDevice[]>([])
 const onSendDataPciDevicesMethod = (
   data: UI_I_SendDataNewPciDevice,
   index: number
 ): void => {
-  sendDataNewPciDevices.value[index] = data
-  sendData()
-}
-const sendDataVideoCard = ref<UI_I_SendDataVideoCard | null>(null)
-const onSendDataVideoCardMethod = (data: UI_I_SendDataVideoCard): void => {
-  sendDataVideoCard.value = data
-  sendData()
-}
-
-const sendData = (): void => {
-  const cpu = sendDataCpu.value
-  const memory = sendDataMemory.value
-  const hardDisks = sendDataNewHardDisk.value.flat(2)
-  const networks = sendDataNewNetwork.value.flat(2)
-  const cdDvdDrives = sendDataNewCdDvdDrive.value.flat(2)
-  const pciDevices = sendDataNewPciDevices.value.flat()
-  const usbController = sendDataNewUsbController.value
-  const videoCard = sendDataVideoCard.value
-
-  const sendData: UI_I_SendDataVirtualHardware = {
-    cpu,
-    memory,
-    usbController,
-    pciDevices,
-    networks,
-    hardDisks,
-    cdDvdDrives,
-    videoCard,
+  model.value.passthrough_pci_devices[index] = {
+    ...data,
   }
-  emits('send-data', sendData)
 }
 
 const onSetInvalidHardDisk = (invalid: boolean, index: number): void => {

package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardwareNew.vue

@@ -34,24 +34,21 @@
     <div class="overflow-auto virtual-hardware-content-block">
       <div class="stack-view">
         <common-vm-actions-common-customize-hardware-virtual-hardware-cpu
-          :max-cpus="props.maxCpus"
+          v-model="model"
           :cpu-models="props.cpuModels"
-          :cpu="props.cpu"
           :is-edit="props.isEdit"
           :state="props.state"
           :error-validation-fields="props.errorValidationFields"
           :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
-          @send-data="emits('send-data-cpu-method', $event)"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
           @invalid="cpuInvalid = $event"
         />
         <common-vm-actions-common-customize-hardware-virtual-hardware-memory
+          v-model="model"
           :max-memory="props.maxMemory"
           :is-edit="props.isEdit"
-          :memory="props.memory"
           :state="props.state"
           :error-validation-fields="props.errorValidationFields"
-          @send-data="emits('send-data-memory-method', $event)"
           @invalid="memoryInvalid = $event"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
@@ -139,12 +136,13 @@
             ])
           "
         />
-        <common-vm-actions-common-customize-hardware-virtual-hardware-new-usb-controller
-          :usb-controller="props.usbController"
-          :is-edit="props.isEdit"
-          :state="props.state"
-          @send-data="emits('send-data-new-usb-controller-method', $event)"
-        />
+        <div v-for="(item, key) in model.usb_controllers" :key="key">
+          <common-vm-actions-common-customize-hardware-virtual-hardware-new-usb-controller
+            v-model="item.type"
+            :is-edit="props.isEdit"
+            :state="props.state"
+          />
+        </div>
         <template v-if="props.passthroughDevices || props.mediatedDevices">
           <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device
             v-for="(item, key) in props.pciDevices"
@@ -174,11 +172,11 @@
           />
         </template>
         <common-vm-actions-common-customize-hardware-virtual-hardware-video-card
+          v-model="model.video_card"
           :is-edit="props.isEdit"
           :video-card="props.videoCard"
           :error-validation-fields="props.errorValidationFields"
           :state="props.state"
-          @send-data="emits('send-data-video-card-method', $event)"
           @invalid="videoCardInvalid = $event"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
@@ -220,8 +218,6 @@ import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
 import type { UI_I_FolderOrFileTreePayload } from '~/lib/models/store/storage/interfaces'
 import type { UI_I_FileTreeNode } from '~/components/lib/models/interfaces'
 import type {
-  UI_I_SendDataCpu,
-  UI_I_SendDataMemory,
   UI_I_SendDataNewHardDisk,
   UI_I_SendDataNewNetwork,
   UI_I_SendDataVideoCard,
@@ -237,13 +233,15 @@ import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type {
   API_UI_I_VmEditCpu,
-  API_UI_I_VmEditMemory,
   UI_I_MediatedDevice,
   UI_I_PciDevice,
 } from '~/lib/models/store/vm/interfaces'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
 import { dropdownItemsNewFunc } from './lib/config/dropdownItems'
 
+const model = defineModel<UI_I_CreateVmData>({ required: true })
+
 const cpuInvalid = defineModel<boolean>('cpuInvalid', { required: true })
 const memoryInvalid = defineModel<boolean>('memoryInvalid', { required: true })
 const videoCardInvalid = defineModel<boolean>('videoCardInvalid', {
@@ -257,7 +255,6 @@ const props = withDefaults(
     isEdit: boolean
     storage: UI_I_DatastoreTableItem | null
     project: UI_T_Project
-    maxCpus: number
     maxMemory: number
     cpuModels: UI_I_OptionItem[]
     datastore: UI_I_DatastoreTableItem[]
@@ -277,13 +274,11 @@ const props = withDefaults(
     getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
     cpu?: API_UI_I_VmEditCpu
     state?: string | number
-    memory?: API_UI_I_VmEditMemory
     networks?: UI_I_SendDataNewNetwork[] | null
     hardDisks?: UI_I_SendDataNewHardDisk[] | null
     videoCard?: UI_I_SendDataVideoCard
     pciDevices?: UI_I_SendDataNewPciDevice[]
     cdDvdDrives?: UI_I_SendDataNewCdDvdDrive[] | null
-    usbController?: string
     guestMachineType?: UI_I_OptionItem | null
     passthroughDevices?: UI_I_PciDevice[]
     mediatedDevices?: UI_I_MediatedDevice[]
@@ -294,13 +289,11 @@ const props = withDefaults(
   {
     cpu: undefined,
     state: undefined,
-    memory: undefined,
     networks: undefined,
     hardDisks: undefined,
     videoCard: undefined,
     pciDevices: undefined,
     cdDvdDrives: undefined,
-    usbController: undefined,
     guestMachineType: undefined,
     passthroughDevices: undefined,
     mediatedDevices: undefined,
@@ -326,14 +319,11 @@ const emits = defineEmits<{
   ): void
   (event: 'show-datastore-child', value: UI_I_FileTreeNode): void
   (event: 'get-folders-or-files', value: UI_I_FolderOrFileTreePayload): void
-  (event: 'send-data-cpu-method', value: UI_I_SendDataCpu): void
   (event: 'set-invalid-hard-disk', value: [boolean, number]): void
   (event: 'remove-error-by-title', value: string): void
   (event: 'roll-back-cd-dvd-drive', value: number): void
   (event: 'set-invalid-pci-device', value: [boolean, number]): void
   (event: 'get-active-device-child', value: UI_I_FileTreeNode): void
-  (event: 'send-data-memory-method', value: UI_I_SendDataMemory): void
-  (event: 'send-data-video-card-method', value: UI_I_SendDataVideoCard): void
   (
     event: 'send-data-new-network-method',
     value: [UI_I_SendDataNewNetwork, number]
@@ -350,7 +340,6 @@ const emits = defineEmits<{
     event: 'send-data-new-cd-dvd-drive-method',
     value: [UI_I_SendDataNewCdDvdDrive, number]
   ): void
-  (event: 'send-data-new-usb-controller-method', value: string): void
 }>()
 
 const { $text } = useNuxtApp()