bfg-common 1.5.577 → 1.5.578

package/components/common/vm/actions/add/New.vue

@@ -66,7 +66,7 @@
         </template>
         <template #content>
           <common-wizards-common-steps-name
-            v-model:name="vmForm.name"
+            v-model:name="model.name"
             v-model:location="location"
             :show="
               selectedStep.id === dynamicSteps.selectName ||
@@ -118,7 +118,7 @@
           <common-wizards-common-steps-compute-resource
             v-if="props.isSphere"
             v-show="selectedStep.id === dynamicSteps.selectComputeResource"
-            v-model="vmForm.computeResource"
+            v-model="computeResource"
             :node="computeResourceTreeLocal"
             :alert-messages="props.computeResourceAlert"
             :is-loading="props.isLoadingComputeTree"
@@ -228,9 +228,9 @@
         <template #content>
           <div class="select-block-wrap overflow-auto pb-4">
             <common-vm-actions-common-select-os
-              v-model:machine-type="vmForm.guestMachineType"
-              v-model:guest-os-family="vmForm.guestOsFamily"
-              v-model:guest-os-version="vmForm.guestOsVersion"
+              v-model:guest-os-family="model.guest_os_family"
+              v-model:guest-os-version="model.guest_os_version"
+              v-model:machine-type="model.machine_type"
               :families-options="props.guestOsFamilies"
               :versions-options="props.guestOsVersions"
               :machine-types-options="props.machineTypes"
@@ -251,21 +251,11 @@
         <template #content>
           <div class="select-block-wrap customize-hardware flex flex-col">
             <common-vm-actions-common-customize-hardware
+              v-model="model"
               :project="props.project"
               :is-vmt="props.isVmt"
-              :vm-name="vmForm.name"
-              :guest-machine-type="vmForm.guestMachineType"
-              :guest-os-family="vmForm.guestOsFamily"
-              :guest-os-version="vmForm.guestOsVersion"
-              :storage="vmForm.storage"
-              :hard-disks-for-boot-options="props.virtualHardwareHardDisksLocal"
-              :cd-dvd-drives-for-boot-options="
-                props.virtualHardwareCdDvdDrivesLocal
-              "
-              :networks-for-boot-options="props.virtualHardwareNetworksLocal"
-              :cd-dvd-drives="props.virtualHardwareCdDvdDrivesLocal"
+              :storage="model.storage"
               :customize-hardware-submit="props.customizeHardwareSubmit"
-              :max-cpus="props.maxCpus"
               :max-memory="props.maxMemory"
               :cpu-models="props.cpuModels"
               :selected-nav-item="props.selectedNavItem"
@@ -279,10 +269,8 @@
               :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
               :passthrough-devices="props.passthroughDevices"
               :mediated-devices="props.mediatedDevices"
-              :compute-resource="vmForm.computeResource"
+              :compute-resource="computeResource"
               :compatibility-info="props.compatibilityInfo"
-              @change-boot-order="emits('change-boot-order', $event)"
-              @send-data="emits('change-customize-hardware', $event)"
               @get-storage="emits('get-storage', $event)"
               @get-folders-or-files="emits('get-folders-or-files', $event)"
               @get-active-device-child="
@@ -314,31 +302,19 @@
             class="select-block-wrap overflow-auto h-full flex flex-col pr-8"
           >
             <common-vm-actions-common-customize-hardware
+              v-model="model"
               :project="props.project"
               :is-vmt="props.isVmt"
-              :vm-name="vmForm.name"
-              :guest-machine-type="vmForm.guestMachineType"
-              :guest-os-family="vmForm.guestOsFamily"
-              :guest-os-version="vmForm.guestOsVersion"
-              :storage="vmForm.storage"
-              :hard-disks-for-boot-options="props.virtualHardwareHardDisksLocal"
-              :cd-dvd-drives-for-boot-options="
-                props.virtualHardwareCdDvdDrivesLocal
-              "
-              :networks-for-boot-options="props.virtualHardwareNetworksLocal"
+              :storage="model.storage"
               :cd-dvd-drives="props.vmtSettings.cdDvdDrives || []"
               :hard-disks="props.vmtSettings.hardDisks || []"
               :networks="props.vmtSettings.networks || []"
               :customize-hardware-submit="
                 props.customizeHardwareForTemplateSubmit
               "
-              :max-cpus="props.maxCpus"
               :max-memory="props.maxMemory"
               :cpu-models="props.cpuModels"
-              :cpu="props.vmtSettings.cpu"
-              :memory="props.vmtSettings.memory"
               :video-card="props.vmtSettings.videoCard"
-              :usb-controller="props.vmtSettings.usbController"
               :pci-devices="props.vmtSettings.pciDevices"
               :hard-disks-for-edit="props.vmtSettings.hardDisks || []"
               :options="props.vmtSettings.options"
@@ -353,11 +329,9 @@
               :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
               :passthrough-devices="props.passthroughDevices"
               :mediated-devices="props.mediatedDevices"
-              :compute-resource="vmForm.computeResource"
+              :compute-resource="computeResource"
               :compatibility-info="props.compatibilityInfo"
               is-clone
-              @change-boot-order="emits('change-boot-order', $event)"
-              @send-data="emits('change-customize-hardware', $event)"
               @get-storage="emits('get-storage', $event)"
               @get-folders-or-files="emits('get-folders-or-files', $event)"
               @get-active-device-child="
@@ -445,17 +419,11 @@ import type {
 } from '~/components/common/vm/actions/common/lib/models/types'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 import type {
+  UI_I_CreateVmData,
   // UI_I_Capabilities,
   UI_I_VmForm,
 } from '~/components/common/vm/actions/common/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_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_T_ChangeBootOrder } from '~/components/common/vm/actions/lib/models/types'
 import type {
   UI_I_MediatedDevice,
   UI_I_PciDevice,
@@ -465,7 +433,10 @@ import type { UI_I_NameTestIds } from '~/components/common/wizards/common/steps/
 import type { UI_T_CompatibilityStatus } from '~/components/common/wizards/common/compatibility/lib/models/types'
 import { dynamicSteps } from '~/components/common/vm/actions/add/lib/config/steps'
 
-const vmForm = defineModel<UI_I_VmForm>('vmForm', {
+const model = defineModel<UI_I_CreateVmData>({
+  required: true,
+})
+const computeResource = defineModel<UI_I_TreeNode | null>('computeResource', {
   required: true,
 })
 const selectedCreateType = defineModel<string>('selectedCreateType', {
@@ -504,10 +475,6 @@ const props = withDefaults(
     guestOsFamilies: UI_I_OptionItem[]
     guestOsVersions: UI_I_ArbitraryObject<UI_I_OptionItem[]>
     machineTypes: UI_I_OptionItem[]
-    virtualHardwareHardDisksLocal: UI_I_SendDataNewHardDisk[] | null
-    virtualHardwareCdDvdDrivesLocal: UI_I_SendDataNewCdDvdDrive[] | null
-    virtualHardwareNetworksLocal: UI_I_SendDataNewNetwork[] | null
-    maxCpus: number
     maxMemory: number
     cpuModels: UI_I_OptionItem[]
     selectedNavItem: UI_T_SelectedNavItem
@@ -561,11 +528,6 @@ const emits = defineEmits<{
   (event: 'change-select-options', value: string[]): void
   (event: 'change-clone-count', value: number): void
   (event: 'change-compatibility', value: UI_I_OptionItem): void
-  (event: 'change-boot-order', value: UI_T_ChangeBootOrder): void
-  (
-    event: 'change-customize-hardware',
-    value: UI_I_SendDataCustomizeHardware
-  ): void
   (event: 'hide'): void
 }>()
 

package/components/common/vm/actions/add/Old.vue

@@ -34,7 +34,7 @@
               selectedStep.id === dynamicSteps.selectName ||
               selectedStep.id === dynamicSteps.selectNameFolder
             "
-            v-model:name="vmForm.name"
+            v-model:name="model.name"
             v-model:location="location"
             :show="
               selectedStep.id === dynamicSteps.selectName ||
@@ -55,7 +55,7 @@
           <common-wizards-common-steps-compute-resource
             v-if="props.isSphere"
             v-show="selectedStep.id === dynamicSteps.selectComputeResource"
-            v-model="vmForm.computeResource"
+            v-model="computeResource"
             :node="computeResourceTreeLocal"
             :alert-messages="props.computeResourceAlert"
             :is-loading="props.isLoadingComputeTree"
@@ -91,9 +91,9 @@
               selectedStep.id === dynamicSteps.selectGuestOSMachineType ||
               selectedStep.id === dynamicSteps.selectGuestOS
             "
-            v-model:machine-type="vmForm.guestMachineType"
-            v-model:guest-os-family="vmForm.guestOsFamily"
-            v-model:guest-os-version="vmForm.guestOsVersion"
+            v-model:guest-os-family="model.guest_os_family"
+            v-model:guest-os-version="model.guest_os_version"
+            v-model:machine-type="model.machine_type"
             :families-options="props.guestOsFamilies"
             :versions-options="props.guestOsVersions"
             :machine-types-options="props.machineTypes"
@@ -102,21 +102,11 @@
           />
           <common-vm-actions-common-customize-hardware
             v-show="selectedStep.id === dynamicSteps.customizeHardware"
+            v-model="model"
             :project="props.project"
             :is-vmt="props.isVmt"
-            :vm-name="vmForm.name"
-            :guest-machine-type="vmForm.guestMachineType"
-            :guest-os-family="vmForm.guestOsFamily"
-            :guest-os-version="vmForm.guestOsVersion"
-            :storage="vmForm.storage"
-            :hard-disks-for-boot-options="props.virtualHardwareHardDisksLocal"
-            :cd-dvd-drives-for-boot-options="
-              props.virtualHardwareCdDvdDrivesLocal
-            "
-            :networks-for-boot-options="props.virtualHardwareNetworksLocal"
-            :cd-dvd-drives="props.virtualHardwareCdDvdDrivesLocal"
+            :storage="model.storage"
             :customize-hardware-submit="props.customizeHardwareSubmit"
-            :max-cpus="props.maxCpus"
             :max-memory="props.maxMemory"
             :cpu-models="props.cpuModels"
             :selected-nav-item="props.selectedNavItem"
@@ -130,9 +120,7 @@
             :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
             :passthrough-devices="props.passthroughDevices"
             :mediated-devices="props.mediatedDevices"
-            :compute-resource="vmForm.computeResource"
-            @change-boot-order="emits('change-boot-order', $event)"
-            @send-data="emits('change-customize-hardware', $event)"
+            :compute-resource="computeResource"
             @get-storage="emits('get-storage', $event)"
             @get-folders-or-files="emits('get-folders-or-files', $event)"
             @get-active-device-child="emits('get-active-device-child', $event)"
@@ -144,34 +132,21 @@
           <common-vm-actions-common-customize-hardware
             v-if="props.vmtSettings"
             v-show="selectedStep.id === dynamicSteps.customizeHardwareTemplate"
+            v-model="model"
             :is-vmt="props.isVmt"
             :project="props.project"
-            :vm-name="vmForm.name"
-            :guest-machine-type="vmForm.guestMachineType"
-            :guest-os-family="vmForm.guestOsFamily"
-            :guest-os-version="vmForm.guestOsVersion"
-            :storage="vmForm.storage"
-            :hard-disks-for-boot-options="props.virtualHardwareHardDisksLocal"
-            :cd-dvd-drives-for-boot-options="
-              props.virtualHardwareCdDvdDrivesLocal
-            "
-            :networks-for-boot-options="props.virtualHardwareNetworksLocal"
+            :storage="model.storage"
             :cd-dvd-drives="props.vmtSettings.cdDvdDrives || []"
             :hard-disks="props.vmtSettings.hardDisks || []"
             :networks="props.vmtSettings.networks || []"
             :customize-hardware-submit="
               props.customizeHardwareForTemplateSubmit
             "
-            :max-cpus="props.maxCpus"
             :max-memory="props.maxMemory"
             :cpu-models="props.cpuModels"
-            :cpu="props.vmtSettings.cpu"
-            :memory="props.vmtSettings.memory"
             :video-card="props.vmtSettings.videoCard"
-            :usb-controller="props.vmtSettings.usbController"
             :pci-devices="props.vmtSettings.pciDevices"
             :hard-disks-for-edit="props.vmtSettings.hardDisks || []"
-            :options="props.vmtSettings.options"
             :selected-nav-item="props.selectedNavItem"
             :nodes="props.nodes"
             :files="props.files"
@@ -183,10 +158,8 @@
             :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
             :passthrough-devices="props.passthroughDevices"
             :mediated-devices="props.mediatedDevices"
-            :compute-resource="vmForm.computeResource"
+            :compute-resource="computeResource"
             is-clone
-            @change-boot-order="emits('change-boot-order', $event)"
-            @send-data="emits('change-customize-hardware', $event)"
             @get-storage="emits('get-storage', $event)"
             @get-folders-or-files="emits('get-folders-or-files', $event)"
             @get-active-device-child="emits('get-active-device-child', $event)"
@@ -247,17 +220,11 @@ import type {
 } from '~/components/common/vm/actions/common/lib/models/types'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 import type {
+  UI_I_CreateVmData,
   // UI_I_Capabilities,
   UI_I_VmForm,
 } from '~/components/common/vm/actions/common/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_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_T_ChangeBootOrder } from '~/components/common/vm/actions/lib/models/types'
 import type {
   UI_I_MediatedDevice,
   UI_I_PciDevice,
@@ -267,7 +234,10 @@ import type { UI_I_NameTestIds } from '~/components/common/wizards/common/steps/
 import type { UI_T_CompatibilityStatus } from '~/components/common/wizards/common/compatibility/lib/models/types'
 import { dynamicSteps } from '~/components/common/vm/actions/add/lib/config/steps'
 
-const vmForm = defineModel<UI_I_VmForm>('vmForm', {
+const model = defineModel<UI_I_CreateVmData>({
+  required: true,
+})
+const computeResource = defineModel<UI_I_TreeNode | null>('computeResource', {
   required: true,
 })
 const selectedCreateType = defineModel<string>('selectedCreateType', {
@@ -306,10 +276,6 @@ const props = withDefaults(
     guestOsFamilies: UI_I_OptionItem[]
     guestOsVersions: UI_I_ArbitraryObject<UI_I_OptionItem[]>
     machineTypes: UI_I_OptionItem[]
-    virtualHardwareHardDisksLocal: UI_I_SendDataNewHardDisk[] | null
-    virtualHardwareCdDvdDrivesLocal: UI_I_SendDataNewCdDvdDrive[] | null
-    virtualHardwareNetworksLocal: UI_I_SendDataNewNetwork[] | null
-    maxCpus: number
     maxMemory: number
     cpuModels: UI_I_OptionItem[]
     selectedNavItem: UI_T_SelectedNavItem
@@ -360,11 +326,6 @@ const emits = defineEmits<{
   (event: 'change-select-options', value: string[]): void
   (event: 'change-clone-count', value: number): void
   (event: 'change-compatibility', value: UI_I_OptionItem): void
-  (event: 'change-boot-order', value: UI_T_ChangeBootOrder): void
-  (
-    event: 'change-customize-hardware',
-    value: UI_I_SendDataCustomizeHardware
-  ): void
   (event: 'hide'): void
 }>()