bfg-common 1.5.574 → 1.5.575

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

@@ -1,88 +1,88 @@
-<template>
-  <div class="skeleton-wrap">
-    <div class="tabs">
-      <ui-skeleton-item width="64px" height="16px" />
-      <ui-skeleton-item width="64px" height="16px" />
-    </div>
-    <div class="actions">
-      <ui-skeleton-item width="80px" height="16px" />
-      <ui-skeleton-item width="152px" height="32px" border-radius="6px" />
-    </div>
-    <div class="stack-block-wrap">
-      <div class="stack-block">
-        <div class="stack-label flex-1">
-          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
-          <ui-skeleton-item height="16px" />
-        </div>
-        <div class="stack-value flex-1">
-          <ui-skeleton-item width="102px" height="32px" border-radius="8px" />
-        </div>
-      </div>
-
-      <div v-for="item in 2" :key="item" class="stack-block">
-        <div class="stack-label flex-1">
-          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
-          <ui-skeleton-item height="16px" />
-        </div>
-        <div class="stack-value flex-1">
-          <ui-skeleton-item width="102px" height="32px" border-radius="8px" />
-          <ui-skeleton-item width="80px" height="32px" border-radius="8px" />
-        </div>
-      </div>
-
-      <div v-for="item in 5" :key="item" class="stack-block">
-        <div class="stack-label flex-1">
-          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
-          <ui-skeleton-item height="16px" />
-        </div>
-        <div class="stack-value flex-1">
-          <ui-skeleton-item width="196px" height="32px" border-radius="8px" />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts"></script>
-
-<style scoped lang="scss">
-.skeleton-wrap {
-  padding: 0 32px;
-
-  .tabs {
-    display: flex;
-    align-items: center;
-    gap: 32px;
-    padding: 8px 0 12px;
-    border-bottom: 1px solid var(--divider-color);
-  }
-
-  .actions {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 12px 0;
-  }
-
-  .stack-block-wrap {
-    display: grid;
-    grid-gap: 12px;
-
-    .stack-block {
-      display: flex;
-      align-items: center;
-      gap: 12px;
-      padding: 8px 12px;
-      background: var(--stack-block-bg-color);
-      border-radius: 6px;
-
-      .stack-label,
-      .stack-value {
-        display: flex;
-        align-items: center;
-        gap: 8px;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div class="skeleton-wrap">
+    <div class="tabs">
+      <ui-skeleton-item width="64px" height="16px" />
+      <ui-skeleton-item width="64px" height="16px" />
+    </div>
+    <div class="actions">
+      <ui-skeleton-item width="80px" height="16px" />
+      <ui-skeleton-item width="152px" height="32px" border-radius="6px" />
+    </div>
+    <div class="stack-block-wrap">
+      <div class="stack-block">
+        <div class="stack-label flex-1">
+          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
+          <ui-skeleton-item height="16px" />
+        </div>
+        <div class="stack-value flex-1">
+          <ui-skeleton-item width="102px" height="32px" border-radius="8px" />
+        </div>
+      </div>
+
+      <div v-for="item in 2" :key="item" class="stack-block">
+        <div class="stack-label flex-1">
+          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
+          <ui-skeleton-item height="16px" />
+        </div>
+        <div class="stack-value flex-1">
+          <ui-skeleton-item width="102px" height="32px" border-radius="8px" />
+          <ui-skeleton-item width="80px" height="32px" border-radius="8px" />
+        </div>
+      </div>
+
+      <div v-for="item in 5" :key="item" class="stack-block">
+        <div class="stack-label flex-1">
+          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
+          <ui-skeleton-item height="16px" />
+        </div>
+        <div class="stack-value flex-1">
+          <ui-skeleton-item width="196px" height="32px" border-radius="8px" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss">
+.skeleton-wrap {
+  padding: 0 32px;
+
+  .tabs {
+    display: flex;
+    align-items: center;
+    gap: 32px;
+    padding: 8px 0 12px;
+    border-bottom: 1px solid var(--divider-color);
+  }
+
+  .actions {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 12px 0;
+  }
+
+  .stack-block-wrap {
+    display: grid;
+    grid-gap: 12px;
+
+    .stack-block {
+      display: flex;
+      align-items: center;
+      gap: 12px;
+      padding: 8px 12px;
+      background: var(--stack-block-bg-color);
+      border-radius: 6px;
+
+      .stack-label,
+      .stack-value {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+      }
+    }
+  }
+}
+</style>

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

@@ -77,25 +77,6 @@ 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) {
@@ -105,16 +86,12 @@ 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]
@@ -125,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,
@@ -180,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',
+      },
+    ],
   }
 }