bfg-common 1.5.558 → 1.5.559

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

@@ -34,21 +34,24 @@
     <div class="overflow-auto virtual-hardware-content-block">
       <div class="stack-view">
         <common-vm-actions-common-customize-hardware-virtual-hardware-cpu
-          v-model="model"
+          :max-cpus="props.maxCpus"
           :cpu-models="props.cpuModels"
+          :cpu="props.cpu"
           :is-edit="props.isEdit"
           :state="props.state"
           :error-validation-fields="props.errorValidationFields"
           :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
+          @send-data="emits('send-data-cpu-method', $event)"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
           @invalid="cpuInvalid = $event"
         />
         <common-vm-actions-common-customize-hardware-virtual-hardware-memory
-          v-model="model"
           :max-memory="props.maxMemory"
           :is-edit="props.isEdit"
+          :memory="props.memory"
           :state="props.state"
           :error-validation-fields="props.errorValidationFields"
+          @send-data="emits('send-data-memory-method', $event)"
           @invalid="memoryInvalid = $event"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
@@ -80,54 +83,30 @@
           "
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
-        <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-new-network-->
-        <!--          v-for="(item, key) in props.networks"-->
-        <!--          :key="props.networksIndex[key]"-->
-        <!--          :index="props.networksIndex[key]"-->
-        <!--          :type="props.networksType[key]"-->
-        <!--          :network="item"-->
-        <!--          :networks-table="props.networksTable"-->
-        <!--          :error-validation-fields="props.errorValidationFields"-->
-        <!--          :is-edit="props.isEdit"-->
-        <!--          :state="props.state"-->
-        <!--          :project="props.project"-->
-        <!--          @remove="emits('remove-network', props.networksIndex[key])"-->
-        <!--          @send-data="-->
-        <!--            emits('send-data-new-network-method', [-->
-        <!--              $event,-->
-        <!--              props.networksIndex[key],-->
-        <!--            ])-->
-        <!--          "-->
-        <!--          @invalid="-->
-        <!--            emits('set-invalid-network', [$event, props.networksIndex[key]])-->
-        <!--          "-->
-        <!--          @remove-error-by-title="emits('remove-error-by-title', $event)"-->
-        <!--          @get-networks-table="emits('get-networks-table', $event)"-->
-        <!--        />-->
-        <div
-          v-for="(item, key) in model.network_devices"
+        <common-vm-actions-common-customize-hardware-virtual-hardware-new-network
+          v-for="(item, key) in props.networks"
           :key="props.networksIndex[key]"
-        >
-          <common-vm-actions-common-customize-hardware-virtual-hardware-new-network
-            v-model:network="item.network"
-            v-model:net-bridge="item.net_bridge"
-            v-model:mac="item.mac"
-            v-model:model="item.model"
-            :index="props.networksIndex[key]"
-            :type="props.networksType[key]"
-            :networks-table="props.networksTable"
-            :error-validation-fields="props.errorValidationFields"
-            :is-edit="props.isEdit"
-            :state="props.state"
-            :project="props.project"
-            @remove="emits('remove-network', props.networksIndex[key])"
-            @invalid="
-              emits('set-invalid-network', [$event, props.networksIndex[key]])
-            "
-            @remove-error-by-title="emits('remove-error-by-title', $event)"
-            @get-networks-table="emits('get-networks-table', $event)"
-          />
-        </div>
+          :index="props.networksIndex[key]"
+          :type="props.networksType[key]"
+          :network="item"
+          :networks-table="props.networksTable"
+          :error-validation-fields="props.errorValidationFields"
+          :is-edit="props.isEdit"
+          :state="props.state"
+          :project="props.project"
+          @remove="emits('remove-network', props.networksIndex[key])"
+          @send-data="
+            emits('send-data-new-network-method', [
+              $event,
+              props.networksIndex[key],
+            ])
+          "
+          @invalid="
+            emits('set-invalid-network', [$event, props.networksIndex[key]])
+          "
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+          @get-networks-table="emits('get-networks-table', $event)"
+        />
         <common-vm-actions-common-customize-hardware-virtual-hardware-cd-dvd-drive
           v-for="(item, key) in props.cdDvdDrives"
           :key="props.cdDvdDrivesIndex[key]"
@@ -160,13 +139,12 @@
             ])
           "
         />
-        <div v-for="(item, key) in model.usb_controllers" :key="key">
-          <common-vm-actions-common-customize-hardware-virtual-hardware-new-usb-controller
-            v-model="item.type"
-            :is-edit="props.isEdit"
-            :state="props.state"
-          />
-        </div>
+        <common-vm-actions-common-customize-hardware-virtual-hardware-new-usb-controller
+          :usb-controller="props.usbController"
+          :is-edit="props.isEdit"
+          :state="props.state"
+          @send-data="emits('send-data-new-usb-controller-method', $event)"
+        />
         <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"
@@ -196,11 +174,11 @@
           />
         </template>
         <common-vm-actions-common-customize-hardware-virtual-hardware-video-card
-          v-model="model.video_card"
           :is-edit="props.isEdit"
           :video-card="props.videoCard"
           :error-validation-fields="props.errorValidationFields"
           :state="props.state"
+          @send-data="emits('send-data-video-card-method', $event)"
           @invalid="videoCardInvalid = $event"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
@@ -242,7 +220,10 @@ import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
 import type { UI_I_FolderOrFileTreePayload } from '~/lib/models/store/storage/interfaces'
 import type { UI_I_FileTreeNode } from '~/components/lib/models/interfaces'
 import type {
+  UI_I_SendDataCpu,
+  UI_I_SendDataMemory,
   UI_I_SendDataNewHardDisk,
+  UI_I_SendDataNewNetwork,
   UI_I_SendDataVideoCard,
   UI_I_SendDataNewCdDvdDrive,
   UI_I_SendDataNewPciDevice,
@@ -256,15 +237,13 @@ import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type {
   API_UI_I_VmEditCpu,
+  API_UI_I_VmEditMemory,
   UI_I_MediatedDevice,
   UI_I_PciDevice,
 } from '~/lib/models/store/vm/interfaces'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
 import { dropdownItemsNewFunc } from './lib/config/dropdownItems'
 
-const model = defineModel<UI_I_CreateVmData>({ required: true })
-
 const cpuInvalid = defineModel<boolean>('cpuInvalid', { required: true })
 const memoryInvalid = defineModel<boolean>('memoryInvalid', { required: true })
 const videoCardInvalid = defineModel<boolean>('videoCardInvalid', {
@@ -278,6 +257,7 @@ const props = withDefaults(
     isEdit: boolean
     storage: UI_I_DatastoreTableItem | null
     project: UI_T_Project
+    maxCpus: number
     maxMemory: number
     cpuModels: UI_I_OptionItem[]
     datastore: UI_I_DatastoreTableItem[]
@@ -297,10 +277,13 @@ const props = withDefaults(
     getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
     cpu?: API_UI_I_VmEditCpu
     state?: string | number
+    memory?: API_UI_I_VmEditMemory
+    networks?: UI_I_SendDataNewNetwork[] | null
     hardDisks?: UI_I_SendDataNewHardDisk[] | null
     videoCard?: UI_I_SendDataVideoCard
     pciDevices?: UI_I_SendDataNewPciDevice[]
     cdDvdDrives?: UI_I_SendDataNewCdDvdDrive[] | null
+    usbController?: string
     guestMachineType?: UI_I_OptionItem | null
     passthroughDevices?: UI_I_PciDevice[]
     mediatedDevices?: UI_I_MediatedDevice[]
@@ -311,10 +294,13 @@ const props = withDefaults(
   {
     cpu: undefined,
     state: undefined,
+    memory: undefined,
+    networks: undefined,
     hardDisks: undefined,
     videoCard: undefined,
     pciDevices: undefined,
     cdDvdDrives: undefined,
+    usbController: undefined,
     guestMachineType: undefined,
     passthroughDevices: undefined,
     mediatedDevices: undefined,
@@ -340,11 +326,18 @@ const emits = defineEmits<{
   ): void
   (event: 'show-datastore-child', value: UI_I_FileTreeNode): void
   (event: 'get-folders-or-files', value: UI_I_FolderOrFileTreePayload): void
+  (event: 'send-data-cpu-method', value: UI_I_SendDataCpu): void
   (event: 'set-invalid-hard-disk', value: [boolean, number]): void
   (event: 'remove-error-by-title', value: string): void
   (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-memory-method', value: UI_I_SendDataMemory): void
+  (event: 'send-data-video-card-method', value: UI_I_SendDataVideoCard): void
+  (
+    event: 'send-data-new-network-method',
+    value: [UI_I_SendDataNewNetwork, number]
+  ): void
   (
     event: 'send-data-pci-devices-method',
     value: [UI_I_SendDataNewPciDevice, number]
@@ -357,6 +350,7 @@ const emits = defineEmits<{
     event: 'send-data-new-cd-dvd-drive-method',
     value: [UI_I_SendDataNewCdDvdDrive, number]
   ): void
+  (event: 'send-data-new-usb-controller-method', value: string): void
 }>()
 
 const { $text } = useNuxtApp()

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

@@ -12,21 +12,24 @@
     <div class="clr-component">
       <div class="stack-view">
         <common-vm-actions-common-customize-hardware-virtual-hardware-cpu
-          v-model="model"
+          :max-cpus="props.maxCpus"
           :cpu-models="props.cpuModels"
+          :cpu="props.cpu"
           :is-edit="props.isEdit"
           :state="props.state"
           :error-validation-fields="props.errorValidationFields"
           :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
+          @send-data="emits('send-data-cpu-method', $event)"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
           @invalid="cpuInvalid = $event"
         />
         <common-vm-actions-common-customize-hardware-virtual-hardware-memory
-          v-model="model"
           :max-memory="props.maxMemory"
           :is-edit="props.isEdit"
+          :memory="props.memory"
           :state="props.state"
           :error-validation-fields="props.errorValidationFields"
+          @send-data="emits('send-data-memory-method', $event)"
           @invalid="memoryInvalid = $event"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
@@ -58,54 +61,30 @@
           "
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
-        <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-new-network-->
-        <!--          v-for="(item, key) in props.networks"-->
-        <!--          :key="props.networksIndex[key]"-->
-        <!--          :index="props.networksIndex[key]"-->
-        <!--          :type="props.networksType[key]"-->
-        <!--          :network="item"-->
-        <!--          :networks-table="props.networksTable"-->
-        <!--          :error-validation-fields="props.errorValidationFields"-->
-        <!--          :is-edit="props.isEdit"-->
-        <!--          :state="props.state"-->
-        <!--          :project="props.project"-->
-        <!--          @remove="emits('remove-network', props.networksIndex[key])"-->
-        <!--          @send-data="-->
-        <!--            emits('send-data-new-network-method', [-->
-        <!--              $event,-->
-        <!--              props.networksIndex[key],-->
-        <!--            ])-->
-        <!--          "-->
-        <!--          @invalid="-->
-        <!--            emits('set-invalid-network', [$event, props.networksIndex[key]])-->
-        <!--          "-->
-        <!--          @remove-error-by-title="emits('remove-error-by-title', $event)"-->
-        <!--          @get-networks-table="emits('get-networks-table', $event)"-->
-        <!--        />-->
-        <div
-          v-for="(item, key) in model.network_devices"
+        <common-vm-actions-common-customize-hardware-virtual-hardware-new-network
+          v-for="(item, key) in props.networks"
           :key="props.networksIndex[key]"
-        >
-          <common-vm-actions-common-customize-hardware-virtual-hardware-new-network
-            v-model:network="item.network"
-            v-model:net-bridge="item.net_bridge"
-            v-model:mac="item.mac"
-            v-model:model="item.model"
-            :index="props.networksIndex[key]"
-            :type="props.networksType[key]"
-            :networks-table="props.networksTable"
-            :error-validation-fields="props.errorValidationFields"
-            :is-edit="props.isEdit"
-            :state="props.state"
-            :project="props.project"
-            @remove="emits('remove-network', props.networksIndex[key])"
-            @invalid="
-              emits('set-invalid-network', [$event, props.networksIndex[key]])
-            "
-            @remove-error-by-title="emits('remove-error-by-title', $event)"
-            @get-networks-table="emits('get-networks-table', $event)"
-          />
-        </div>
+          :index="props.networksIndex[key]"
+          :type="props.networksType[key]"
+          :network="item"
+          :networks-table="props.networksTable"
+          :error-validation-fields="props.errorValidationFields"
+          :is-edit="props.isEdit"
+          :state="props.state"
+          :project="props.project"
+          @remove="emits('remove-network', props.networksIndex[key])"
+          @send-data="
+            emits('send-data-new-network-method', [
+              $event,
+              props.networksIndex[key],
+            ])
+          "
+          @invalid="
+            emits('set-invalid-network', [$event, props.networksIndex[key]])
+          "
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+          @get-networks-table="emits('get-networks-table', $event)"
+        />
         <common-vm-actions-common-customize-hardware-virtual-hardware-cd-dvd-drive
           v-for="(item, key) in props.cdDvdDrives"
           :key="props.cdDvdDrivesIndex[key]"
@@ -138,13 +117,12 @@
             ])
           "
         />
-        <div v-for="(item, key) in model.usb_controllers" :key="key">
-          <common-vm-actions-common-customize-hardware-virtual-hardware-new-usb-controller
-            v-model="item.type"
-            :is-edit="props.isEdit"
-            :state="props.state"
-          />
-        </div>
+        <common-vm-actions-common-customize-hardware-virtual-hardware-new-usb-controller
+          :usb-controller="props.usbController"
+          :is-edit="props.isEdit"
+          :state="props.state"
+          @send-data="emits('send-data-new-usb-controller-method', $event)"
+        />
         <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"
@@ -174,11 +152,11 @@
           />
         </template>
         <common-vm-actions-common-customize-hardware-virtual-hardware-video-card
-          v-model="model.video_card"
           :is-edit="props.isEdit"
           :video-card="props.videoCard"
           :error-validation-fields="props.errorValidationFields"
           :state="props.state"
+          @send-data="emits('send-data-video-card-method', $event)"
           @invalid="videoCardInvalid = $event"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
@@ -211,7 +189,10 @@ import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
 import type { UI_I_FolderOrFileTreePayload } from '~/lib/models/store/storage/interfaces'
 import type { UI_I_FileTreeNode } from '~/components/lib/models/interfaces'
 import type {
+  UI_I_SendDataCpu,
+  UI_I_SendDataMemory,
   UI_I_SendDataNewHardDisk,
+  UI_I_SendDataNewNetwork,
   UI_I_SendDataVideoCard,
   UI_I_SendDataNewCdDvdDrive,
   // UI_I_HardDisk,
@@ -230,13 +211,11 @@ import type {
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type {
   API_UI_I_VmEditCpu,
+  API_UI_I_VmEditMemory,
   UI_I_MediatedDevice,
   UI_I_PciDevice,
 } from '~/lib/models/store/vm/interfaces'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
-
-const model = defineModel<UI_I_CreateVmData>({ required: true })
 
 const cpuInvalid = defineModel<boolean>('cpuInvalid', { required: true })
 const memoryInvalid = defineModel<boolean>('memoryInvalid', { required: true })
@@ -251,6 +230,7 @@ const props = withDefaults(
     isEdit: boolean
     storage: UI_I_DatastoreTableItem | null
     project: UI_T_Project
+    maxCpus: number
     maxMemory: number
     cpuModels: UI_I_OptionItem[]
     datastore: UI_I_DatastoreTableItem[]
@@ -266,14 +246,17 @@ const props = withDefaults(
     pciDevicesIndex: number[]
     cdDvdDrivesType: UI_T_NetworkType[]
     cdDvdDrivesIndex: number[]
-    errorValidationFields: UI_I_ErrorValidationField[]
+    errorValidationFields: UI_I_ErrorValidationField<string>[]
     getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
     cpu?: API_UI_I_VmEditCpu
     state?: string | number
+    memory?: API_UI_I_VmEditMemory
+    networks?: UI_I_SendDataNewNetwork[] | null
     hardDisks?: UI_I_SendDataNewHardDisk[] | null
     videoCard?: UI_I_SendDataVideoCard
     pciDevices?: UI_I_SendDataNewPciDevice[]
     cdDvdDrives?: UI_I_SendDataNewCdDvdDrive[] | null
+    usbController?: string
     guestMachineType?: UI_I_OptionItem | null
     passthroughDevices?: UI_I_PciDevice[]
     mediatedDevices?: UI_I_MediatedDevice[]
@@ -283,10 +266,13 @@ const props = withDefaults(
   {
     cpu: undefined,
     state: undefined,
+    memory: undefined,
+    networks: undefined,
     hardDisks: undefined,
     videoCard: undefined,
     pciDevices: undefined,
     cdDvdDrives: undefined,
+    usbController: undefined,
     guestMachineType: undefined,
     passthroughDevices: undefined,
     mediatedDevices: undefined,
@@ -311,11 +297,18 @@ const emits = defineEmits<{
   ): void
   (event: 'show-datastore-child', value: UI_I_FileTreeNode): void
   (event: 'get-folders-or-files', value: UI_I_FolderOrFileTreePayload): void
+  (event: 'send-data-cpu-method', value: UI_I_SendDataCpu): void
   (event: 'set-invalid-hard-disk', value: [boolean, number]): void
   (event: 'remove-error-by-title', value: string): void
   (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-memory-method', value: UI_I_SendDataMemory): void
+  (event: 'send-data-video-card-method', value: UI_I_SendDataVideoCard): void
+  (
+    event: 'send-data-new-network-method',
+    value: [UI_I_SendDataNewNetwork, number]
+  ): void
   (
     event: 'send-data-pci-devices-method',
     value: [UI_I_SendDataNewPciDevice, number]
@@ -328,6 +321,7 @@ const emits = defineEmits<{
     event: 'send-data-new-cd-dvd-drive-method',
     value: [UI_I_SendDataNewCdDvdDrive, number]
   ): void
+  (event: 'send-data-new-usb-controller-method', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())