bfg-common 1.5.581 → 1.5.583

package/components/common/vm/actions/editSettings/new/New.vue

@@ -20,29 +20,19 @@
 
         <div v-else class="vm-context px-8">
           <common-vm-actions-common-customize-hardware
-            v-model:vm-name="vmName"
-            v-model:guest-machine-type="vmSettings.guestMachineType"
-            v-model:guest-os-family="vmSettings.guestOsFamily"
-            v-model:guest-os-version="vmSettings.guestOsVersion"
+            v-model="vmSettings"
             :project="props.project"
             :storage="vmSettings.storage"
-            :hard-disks-for-boot-options="props.virtualHardwareHardDisks"
-            :cd-dvd-drives-for-boot-options="props.virtualHardwareCdDvdDrives"
-            :networks-for-boot-options="props.virtualHardwareNetworks"
-            :cd-dvd-drives="vmSettings.cdDvdDrives"
-            :hard-disks="vmSettings.hardDisks"
-            :networks="vmSettings.networks"
-            :max-cpus="vmSettings.maxCpus"
-            :max-memory="vmSettings.maxMemory"
-            :cpu-models="vmSettings.cpuModels"
-            :cpu="vmSettings.cpu"
-            :memory="vmSettings.memory"
-            :video-card="vmSettings.videoCard"
-            :usb-controller="vmSettings.usbController"
-            :pci-devices="vmSettings.pciDevices"
-            :selected-nav-item="props.selectedNavItem"
-            :hard-disks-for-edit="vmSettings.hardDisks"
+            :cd-dvd-drives="vmSettings.disk_devices.filter((disk) => disk.device_type === 'cdrom')"
+            :hard-disks="vmSettings.disk_devices.filter((disk) => disk.device_type !== 'cdrom')"
+            :max-memory="props.maxMemory"
+            :cpu-models="props.cpuModels"
+            :video-card="vmSettings.video_card"
+            :usb-controller="vmSettings.usb_controllers"
+            :pci-devices="vmSettings.passthrough_pci_devices"
+            :hard-disks-for-edit="vmSettings.disk_devices.filter((disk) => disk.device_type !== 'cdrom')"
             :options="vmSettings.options"
+            :selected-nav-item="props.selectedNavItem"
             :nodes="props.nodes"
             :files="props.files"
             :networks-table="props.networksTable"
@@ -63,8 +53,6 @@
             @show-datastore-child="emits('show-datastore-child', $event)"
             @get-networks-table="emits('get-networks-table', $event)"
             @get-pci-devices="emits('get-pci-devices')"
-            @change-boot-order="emits('change-boot-order', $event)"
-            @send-data="emits('change-customize-hardware', $event)"
           />
         </div>
       </template>
@@ -84,12 +72,6 @@ import type {
   UI_I_VmSettings,
 } from '~/lib/models/store/vm/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_SendDataCustomizeHardware } from '~/components/common/vm/actions/common/customizeHardware/lib/models/interfaces'
-import type {
-  UI_I_SendDataNewCdDvdDrive,
-  UI_I_SendDataNewHardDisk,
-  UI_I_SendDataNewNetwork,
-} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
 import type { UI_T_SelectedNavItem } from '~/components/common/vm/actions/common/lib/models/types'
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
 import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
@@ -97,11 +79,9 @@ import type {
   UI_I_DatastoreTableItem,
   UI_I_FolderOrFileTreePayload,
 } from '~/lib/models/store/storage/interfaces'
-import type { UI_T_ChangeBootOrder } from '~/components/common/vm/actions/lib/models/types'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import { modalTexts } from '~/components/common/vm/actions/editSettings/lib/config/modal'
 
-const vmName = defineModel<string>('vmName', { required: true })
-
 const vmSettings = defineModel<UI_I_VmSettings | null>('vmSettings', {
   required: true,
 })
@@ -117,10 +97,9 @@ const props = withDefaults(
     networksTable: UI_I_NetworkTableItem[]
     selectedNavItem: UI_T_SelectedNavItem
     vmCpuHelpTextSecond: string
-    errorValidationFields: UI_I_ErrorValidationField<string>[]
-    virtualHardwareNetworks: UI_I_SendDataNewNetwork[] | null
-    virtualHardwareHardDisks: UI_I_SendDataNewHardDisk[] | null
-    virtualHardwareCdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null
+    errorValidationFields: UI_I_ErrorValidationField[]
+    maxMemory: number
+    cpuModels: UI_I_OptionItem[]
     state?: string | number
     vmNameOld?: string
     passthroughDevices?: UI_I_PciDevice[]
@@ -143,18 +122,12 @@ const props = withDefaults(
 const emits = defineEmits<{
   (event: 'hide'): void
   (event: 'validate'): void
-  (event: 'update-vm'): void
   (event: 'get-storage', value: UI_I_TablePayload): void
   (event: 'get-pci-devices'): void
-  (event: 'change-boot-order', value: UI_T_ChangeBootOrder): void
   (event: 'get-networks-table', value: UI_I_TablePayload): void
   (event: 'get-folders-or-files', value: UI_I_FolderOrFileTreePayload): void
   (event: 'show-datastore-child', value: UI_I_FileTreeNode): void
   (event: 'get-active-device-child', value: UI_I_FileTreeNode): void
-  (
-    event: 'change-customize-hardware',
-    value: UI_I_SendDataCustomizeHardware
-  ): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

package/components/common/vm/actions/lib/models/interfaces.ts

@@ -1,40 +1,15 @@
-import type { UI_I_ErrorMessage } from '~/components/common/vm/actions/common/lib/models/interfaces'
-import type { UI_I_VmSettings } from '~/lib/models/store/vm/interfaces'
 import type {
-  UI_I_CreateVmDataCdDvdDevice,
-  UI_I_CreateVmDataExistDiskDevice,
-  UI_I_CreateVmDataNewDiskDevice,
-  UI_I_VmForm,
+  UI_I_CreateVmData,
+  UI_I_ErrorMessage,
 } from '~/components/common/vm/actions/common/lib/models/interfaces'
-import type {
-  UI_I_SendDataCpu,
-  UI_I_SendDataMemory,
-  UI_I_SendDataNewNetwork,
-  UI_I_SendDataNewPciDevice,
-  UI_I_SendDataVideoCard,
-} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
 
 export interface UI_I_ConstructErrorMessagesData {
   fields: string[]
   messages: UI_I_ErrorMessage[]
 }
 
-export interface UI_I_VmConstructData<T> {
-  options: T,
-  name: string,
-  vmData: UI_I_VmSettings | UI_I_VmForm,
-  videoCard: UI_I_SendDataVideoCard,
-  diskDevices: (
-    | UI_I_CreateVmDataNewDiskDevice
-    | UI_I_CreateVmDataExistDiskDevice
-    | UI_I_CreateVmDataCdDvdDevice
-    )[],
-  networks: UI_I_SendDataNewNetwork[],
-  storageId: string,
-  cpu: UI_I_SendDataCpu,
-  memory: UI_I_SendDataMemory,
-  usbController: string,
-  pciDevices: UI_I_SendDataNewPciDevice[]
+export interface UI_I_VmConstructData {
+  form: UI_I_CreateVmData
   // Sphere
   uuid: string
 }

package/components/common/vm/actions/lib/utils.ts

@@ -77,6 +77,25 @@ export const constructDiskDevicesFunc = (
           limit_iops: hardDisk.limit_iops ?? 0,
         }
       }
+      // TODO refactoring
+      if (hardDisk.hasOwnProperty('target')) {
+        result.target = hardDisk.target
+      }
+      if (hardDisk.hasOwnProperty('read_only')) {
+        result.read_only = hardDisk.read_only
+      }
+      if (hardDisk.hasOwnProperty('discard')) {
+        result.discard = hardDisk.discard
+      }
+      if (hardDisk.hasOwnProperty('attach')) {
+        result.attach = hardDisk.attach
+      }
+      if (hardDisk.hasOwnProperty('detach')) {
+        result.detach = hardDisk.detach
+      }
+      if (hardDisk.hasOwnProperty('remove')) {
+        result.remove = hardDisk.remove
+      }
       return result
     }) || []
   if (virtualHardwareCdDvdDrives) {
@@ -86,12 +105,16 @@ export const constructDiskDevicesFunc = (
           cdDvdDrive: UI_I_SendDataNewCdDvdDrive
         ): UI_I_CreateVmDataCdDvdDevice => {
           return {
+            ...cdDvdDrive,
             create: false,
-            device_type: cdDvdDrive.device_type,
-            bus: cdDvdDrive.bus,
-            source: cdDvdDrive.source,
-            boot_order: cdDvdDrive.boot_order,
           }
+          // return {
+          //   create: false,
+          //   device_type: cdDvdDrive.device_type,
+          //   bus: cdDvdDrive.bus,
+          //   source: cdDvdDrive.source,
+          //   boot_order: cdDvdDrive.boot_order,
+          // }
         }
       ) || []
     diskDevices = [...diskDevices, ...cdDvdDrives]
@@ -102,37 +125,53 @@ export const constructDiskDevicesFunc = (
 export const constructSendDataForm = (
   data: UI_I_VmConstructData
 ): UI_I_CreateVmData => {
+  const { form, uuid = '' } = data
+
   const {
-    options,
     name,
-    vmData,
-    videoCard,
-    diskDevices,
-    networks,
+    options,
     storage,
+    compatibility,
+    guest_os_family,
+    guest_os_version,
+    machine_type,
+    video_card,
+    disk_devices,
+    network_devices,
+    passthrough_pci_devices,
     cpu,
     memory,
-    usbController,
-    pciDevices,
-    uuid = '',
-  } = data
+    usb_controllers,
+    input_devices,
+  } = form
+
+  const diskDevices: (
+    | UI_I_CreateVmDataNewDiskDevice
+    | UI_I_CreateVmDataExistDiskDevice
+    | UI_I_CreateVmDataCdDvdDevice
+  )[] = constructDiskDevicesFunc(
+    disk_devices.filter((disk) => disk.device_type !== 'cdrom'),
+    disk_devices.filter((disk) => disk.device_type === 'cdrom')
+  )
 
   return {
-    options,
-    name,
     uuid,
-    compatibility: vmData.compatibility,
-    guest_os_family: vmData.guestOsFamily?.value,
-    guest_os_version: vmData.guestOsVersion?.value,
-    machine_type: vmData.guestMachineType?.value,
-    video_card: videoCard,
+    name,
+    options,
+    compatibility,
+    usb_controllers,
+    input_devices,
+    storage: { id: storage?.id || '' },
+    guest_os_family: guest_os_family?.value,
+    guest_os_version: guest_os_version?.value,
+    machine_type: machine_type?.value,
+    video_card: video_card,
     disk_devices: diskDevices,
-    network_devices: networks,
-    passthrough_pci_devices: pciDevices,
-    storage,
+    network_devices: network_devices,
+    passthrough_pci_devices: passthrough_pci_devices,
     cpu: {
       vcpus: cpu.vcpus,
-      max_vcpus: cpu.max_vcpus,
+      max_vcpus: cpu.hotplug ? cpu.max_vcpus : 0,
       core_per_socket: cpu.core_per_socket,
       model: cpu.model,
       reservation_mhz: cpu.reservation_mhz,
@@ -141,22 +180,11 @@ export const constructSendDataForm = (
       hotplug: cpu.hotplug,
     },
     memory: {
-      size_mb: +memory.memory,
+      size_mb: +memory.size_mb,
       hotplug: memory.hotplug,
       reservation_mb: +memory.reservation_mb,
       limit_mb: +memory.limit_mb,
     },
-    usb_controllers: [
-      {
-        type: usbController,
-      },
-    ],
-    input_devices: [
-      {
-        type: 'keyboard',
-        bus: 'usb',
-      },
-    ],
   }
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.581",
+  "version": "1.5.583",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",