bfg-common 1.5.555 → 1.5.557

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

@@ -20,15 +20,23 @@
 
         <div v-else class="vm-context px-8">
           <common-vm-actions-common-customize-hardware
-            v-model="vmSettings"
+            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"
             :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"
@@ -55,6 +63,8 @@
             @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>
@@ -74,6 +84,12 @@ 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'
@@ -81,8 +97,11 @@ 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 { 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,
 })
@@ -98,7 +117,10 @@ const props = withDefaults(
     networksTable: UI_I_NetworkTableItem[]
     selectedNavItem: UI_T_SelectedNavItem
     vmCpuHelpTextSecond: string
-    errorValidationFields: UI_I_ErrorValidationField[]
+    errorValidationFields: UI_I_ErrorValidationField<string>[]
+    virtualHardwareNetworks: UI_I_SendDataNewNetwork[] | null
+    virtualHardwareHardDisks: UI_I_SendDataNewHardDisk[] | null
+    virtualHardwareCdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null
     state?: string | number
     vmNameOld?: string
     passthroughDevices?: UI_I_PciDevice[]
@@ -121,12 +143,18 @@ 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,15 +1,40 @@
+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_CreateVmData,
-  UI_I_ErrorMessage,
+  UI_I_CreateVmDataCdDvdDevice,
+  UI_I_CreateVmDataExistDiskDevice,
+  UI_I_CreateVmDataNewDiskDevice,
+  UI_I_VmForm,
 } 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 {
-  form: UI_I_CreateVmData
+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[]
   // Sphere
   uuid: string
 }

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

@@ -102,53 +102,37 @@ export const constructDiskDevicesFunc = (
 export const constructSendDataForm = (
   data: UI_I_VmConstructData
 ): UI_I_CreateVmData => {
-  const { form, uuid = '' } = data
-
   const {
-    name,
     options,
+    name,
+    vmData,
+    videoCard,
+    diskDevices,
+    networks,
     storage,
-    compatibility,
-    guest_os_family,
-    guest_os_version,
-    machine_type,
-    video_card,
-    disk_devices,
-    network_devices,
-    passthrough_pci_devices,
     cpu,
     memory,
-    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')
-  )
+    usbController,
+    pciDevices,
+    uuid = '',
+  } = data
 
   return {
-    uuid,
-    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,
+    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,
     disk_devices: diskDevices,
-    network_devices: network_devices,
-    passthrough_pci_devices: passthrough_pci_devices,
+    network_devices: networks,
+    passthrough_pci_devices: pciDevices,
+    storage,
     cpu: {
       vcpus: cpu.vcpus,
-      max_vcpus: cpu.hotplug ? cpu.max_vcpus : 0,
+      max_vcpus: cpu.max_vcpus,
       core_per_socket: cpu.core_per_socket,
       model: cpu.model,
       reservation_mhz: cpu.reservation_mhz,
@@ -157,11 +141,22 @@ export const constructSendDataForm = (
       hotplug: cpu.hotplug,
     },
     memory: {
-      size_mb: +memory.size_mb,
+      size_mb: +memory.memory,
       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.555",
+  "version": "1.5.557",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -17,6 +17,8 @@
     "@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",

package/store/tasks/mappers/recentTasks.ts

@@ -45,6 +45,10 @@ export const recentTasks = (
           execution = '--'
           queuedFor = 0
           startTime = Date.now() / 1000 + ''
+          // Обрабатываем данные когда задачка в работе
+        } else if (task.status === 1) {
+          completion = '--'
+          execution = '--'
         }
 
         const { upd_operations } = task.extra