bfg-common 1.5.556 → 1.5.558

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

@@ -102,37 +102,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 +157,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.556",
+  "version": "1.5.558",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -17,8 +17,6 @@
     "@vueuse/nuxt": "10.1.2",
     "eslint-config-prettier": "^8.5.0",
     "nuxt": "3.11.2",
-    "@nuxt/kit": "3.11.2",
-    "@nuxt/schema": "3.11.2",
     "prettier": "2.7.1",
     "sass": "^1.54.9",
     "sass-loader": "^10.3.1",