bfg-common 1.5.682 → 1.5.684

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

@@ -118,12 +118,6 @@
               emits('remove-hard-disk', [props.hardDisksIndex[key], item])
             "
             @roll-back="emits('roll-back-hard-disk', props.hardDisksIndex[key])"
-            @send-data="
-              emits('send-data-new-hard-disk-method', [
-                $event,
-                props.hardDisksIndex[key],
-              ])
-            "
             @invalid="
               emits('set-invalid-hard-disk', [
                 $event,
@@ -267,10 +261,15 @@
         </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"
+            v-for="(item, key) in model.passthrough_pci_devices"
+            v-model:address="item.address"
+            v-model:vendor_name="item.vendor_name"
+            v-model:class_name="item.class_name"
+            v-model:device_name="item.device_name"
+            v-model:mediated_device="item.mediated_device"
+            v-model:mediated_device_uuid="item.mediated_device_uuid"
             :key="props.pciDevicesIndex[key]"
             :index="props.pciDevicesIndex[key]"
-            :pci-device="item"
             :error-validation-fields="props.errorValidationFields"
             :passthrough-devices="props.passthroughDevices"
             :mediated-devices="props.mediatedDevices"
@@ -278,12 +277,6 @@
             :is-edit="props.isEdit"
             :state="props.state"
             @remove="emits('remove-pci-device', props.pciDevicesIndex[key])"
-            @send-data="
-              emits('send-data-pci-devices-method', [
-                $event,
-                props.pciDevicesIndex[key],
-              ])
-            "
             @invalid="
               emits('set-invalid-pci-device', [
                 $event,
@@ -399,7 +392,6 @@ const props = withDefaults(
     state?: string | number
     // hardDisks?: UI_I_SendDataNewHardDisk[] | null
     videoCard?: UI_I_SendDataVideoCard
-    pciDevices?: UI_I_SendDataNewPciDevice[]
     // cdDvdDrives?: UI_I_SendDataNewCdDvdDrive[] | null
     guestMachineType?: UI_I_OptionItem | null
     passthroughDevices?: UI_I_PciDevice[]
@@ -412,7 +404,6 @@ const props = withDefaults(
     cpu: undefined,
     state: undefined,
     videoCard: undefined,
-    pciDevices: undefined,
     guestMachineType: undefined,
     passthroughDevices: undefined,
     mediatedDevices: undefined,
@@ -443,14 +434,6 @@ const emits = defineEmits<{
   (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-pci-devices-method',
-    value: [UI_I_SendDataNewPciDevice, number]
-  ): void
-  (
-    event: 'send-data-new-hard-disk-method',
-    value: [UI_I_SendDataNewHardDisk, number]
-  ): void
   (
     event: 'send-data-new-cd-dvd-drive-method',
     value: [UI_I_SendDataNewCdDvdDrive, number]
@@ -475,7 +458,7 @@ const deviceCount = computed<number>(
     // (props.pciDevices?.length || 0) +
     (model.value.disk_devices?.length || 0) +
     (model.value.network_devices?.length || 0) +
-    (props.pciDevices?.length || 0) +
+    (model.value.passthrough_pci_devices?.length || 0) +
     6
 )
 const deviceCountText = computed<string>(() =>

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

@@ -98,12 +98,6 @@
               emits('remove-hard-disk', [props.hardDisksIndex[key], item])
             "
             @roll-back="emits('roll-back-hard-disk', props.hardDisksIndex[key])"
-            @send-data="
-              emits('send-data-new-hard-disk-method', [
-                $event,
-                props.hardDisksIndex[key],
-              ])
-            "
             @invalid="
               emits('set-invalid-hard-disk', [
                 $event,
@@ -247,10 +241,15 @@
         </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"
+            v-for="(item, key) in model.passthrough_pci_devices"
+            v-model:address="item.address"
+            v-model:vendor-name="item.vendor_name"
+            v-model:class-name="item.class_name"
+            v-model:device-name="item.device_name"
+            v-model:mediated-device="item.mediated_device"
+            v-model:mediated-device-uuid="item.mediated_device_uuid"
             :key="props.pciDevicesIndex[key]"
             :index="props.pciDevicesIndex[key]"
-            :pci-device="item"
             :error-validation-fields="props.errorValidationFields"
             :passthrough-devices="props.passthroughDevices"
             :mediated-devices="props.mediatedDevices"
@@ -258,12 +257,6 @@
             :is-edit="props.isEdit"
             :state="props.state"
             @remove="emits('remove-pci-device', props.pciDevicesIndex[key])"
-            @send-data="
-              emits('send-data-pci-devices-method', [
-                $event,
-                props.pciDevicesIndex[key],
-              ])
-            "
             @invalid="
               emits('set-invalid-pci-device', [
                 $event,
@@ -373,7 +366,6 @@ const props = withDefaults(
     cpu?: API_UI_I_VmEditCpu
     state?: string | number
     videoCard?: UI_I_SendDataVideoCard
-    pciDevices?: UI_I_SendDataNewPciDevice[]
     guestMachineType?: UI_I_OptionItem | null
     passthroughDevices?: UI_I_PciDevice[]
     mediatedDevices?: UI_I_MediatedDevice[]
@@ -384,7 +376,6 @@ const props = withDefaults(
     cpu: undefined,
     state: undefined,
     videoCard: undefined,
-    pciDevices: undefined,
     guestMachineType: undefined,
     passthroughDevices: undefined,
     mediatedDevices: undefined,
@@ -414,14 +405,6 @@ const emits = defineEmits<{
   (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-pci-devices-method',
-    value: [UI_I_SendDataNewPciDevice, number]
-  ): void
-  (
-    event: 'send-data-new-hard-disk-method',
-    value: [UI_I_SendDataNewHardDisk, number]
-  ): void
   (
     event: 'send-data-new-cd-dvd-drive-method',
     value: [UI_I_SendDataNewCdDvdDrive, number]

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

@@ -30,7 +30,6 @@
     :get-datastore-table-func="getDatastoreTableFunc"
     :state="state"
     :video-card="videoCard"
-    :pci-devices="pciDevicesLocal"
     :guest-machine-type="guestMachineType"
     :passthrough-devices="passthroughDevices"
     :mediated-devices="mediatedDevices"
@@ -56,7 +55,6 @@
     @roll-back-cd-dvd-drive="onRollBackCdDvdDrive"
     @set-invalid-pci-device="onSetInvalidPciDevice(...$event)"
     @get-active-device-child="emits('get-active-device-child', $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)"
   />
@@ -119,7 +117,7 @@ const props = withDefaults(
     hardDisks?: UI_I_SendDataNewHardDisk[] | null
     cdDvdDrives?: UI_I_SendDataNewCdDvdDrive[] | null
     videoCard?: UI_I_SendDataVideoCard
-    pciDevices?: UI_I_SendDataNewPciDevice[]
+    // pciDevices?: UI_I_SendDataNewPciDevice[]
     passthroughDevices?: UI_I_PciDevice[]
     mediatedDevices?: UI_I_MediatedDevice[]
     guestMachineType?: UI_I_OptionItem | null
@@ -132,7 +130,7 @@ const props = withDefaults(
     hardDisks: undefined,
     cdDvdDrives: undefined,
     videoCard: undefined,
-    pciDevices: undefined,
+    // pciDevices: undefined,
     passthroughDevices: undefined,
     mediatedDevices: undefined,
     guestMachineType: undefined,
@@ -221,10 +219,12 @@ if (!model.value.disk_devices?.length) {
 // )
 
 const getDisksSize = (): number => {
-  return model.value.disk_devices.reduce(
-    (acum, disk) => (acum += disk.size || 0),
-    0
-  ) || 0
+  return (
+    model.value.disk_devices.reduce(
+      (acum, disk) => (acum += disk.size || 0),
+      0
+    ) || 0
+  )
 }
 const initialDisksSize = getDisksSize()
 const storageFree = computed<number>(() => {
@@ -518,30 +518,46 @@ const defaultPciDevice: UI_I_SendDataNewPciDevice = {
 }
 const pciDevicesIndex = ref<number[]>([0])
 const pciDevicesType = ref<('new' | 'edit' | 'removed')[]>(['new'])
-const pciDevicesLocal = ref<UI_I_SendDataNewPciDevice[]>([])
-watch(
-  () => props.pciDevices,
-  (newValue) => {
-    if ((!props.isEdit && !props.isClone) || !newValue) return
+// const pciDevicesLocal = ref<UI_I_SendDataNewPciDevice[]>([])
+if (!model.value.passthrough_pci_devices?.length) {
+  pciDevicesIndex.value = []
+  pciDevicesType.value = []
+} else {
+  model.value.passthrough_pci_devices.forEach((_disk, _index, array) => {
+    if (!props.isEdit && !props.isClone) return
 
-    const count = newValue?.length || 0
+    const count = array.length
     pciDevicesIndex.value = [...Array(count).keys()]
-    pciDevicesLocal.value = newValue || []
     if (props.isEdit) {
       pciDevicesType.value = Array(count).fill('edit')
     } else if (props.isClone) {
-      pciDevicesType.value = Array(count).fill('new')
+      pciDevicesType.value = Array(count).fill('clone') // before been new
     }
-  },
-  { immediate: true }
-)
+  })
+}
+// watch(
+//   () => props.pciDevices,
+//   (newValue) => {
+//     if ((!props.isEdit && !props.isClone) || !newValue) return
+//
+//     const count = newValue?.length || 0
+//     pciDevicesIndex.value = [...Array(count).keys()]
+//     pciDevicesLocal.value = newValue || []
+//     if (props.isEdit) {
+//       pciDevicesType.value = Array(count).fill('edit')
+//     } else if (props.isClone) {
+//       pciDevicesType.value = Array(count).fill('new')
+//     }
+//   },
+//   { immediate: true }
+// )
 
 const addPciDevice = (): void => {
   const newIndex = (pciDevicesIndex.value.at(-1) ?? -1) + 1
   pciDevicesIndex.value.push(newIndex)
   pciDevicesType.value.push('new')
 
-  pciDevicesLocal.value.push(useDeepCopy(defaultPciDevice))
+  // pciDevicesLocal.value.push(useDeepCopy(defaultPciDevice))
   model.value.passthrough_pci_devices.push(useDeepCopy(defaultPciDevice))
 }
 const onRemovePciDevice = (index: number): void => {
@@ -555,11 +571,11 @@ const onRemovePciDevice = (index: number): void => {
     model.value.passthrough_pci_devices.filter((_pciDevice, key: number) => {
       return removeIndex !== key
     })
-  pciDevicesLocal.value = pciDevicesLocal.value.filter(
-    (_pciDevice, key: number) => {
-      return removeIndex !== key
-    }
-  )
+  // pciDevicesLocal.value = pciDevicesLocal.value.filter(
+  //   (_pciDevice, key: number) => {
+  //     return removeIndex !== key
+  //   }
+  // )
 
   delete newPciDeviceInvalidKeys.value[index]
 }
@@ -608,14 +624,6 @@ const sendDataNewCdDvdDriveMethod = (
       model.value.disk_devices[cdromIndexStart + index]?.boot_order || 0,
   }
 }
-const onSendDataPciDevicesMethod = (
-  data: UI_I_SendDataNewPciDevice,
-  index: number
-): void => {
-  model.value.passthrough_pci_devices[index] = {
-    ...data,
-  }
-}
 
 const onSetInvalidHardDisk = (invalid: boolean, index: number): void => {
   newHardDiskInvalidKeys.value[index] = invalid