bfg-common 1.5.572 → 1.5.573

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (81) hide show
  1. package/assets/localization/local_be.json +6 -29
  2. package/assets/localization/local_en.json +6 -29
  3. package/assets/localization/local_hy.json +6 -29
  4. package/assets/localization/local_kk.json +6 -29
  5. package/assets/localization/local_ru.json +6 -29
  6. package/assets/localization/local_zh.json +7 -30
  7. package/components/common/diagramMain/DiagramMain.vue +1 -1
  8. package/components/common/modals/confirmByInput/ConfirmByInput.vue +1 -9
  9. package/components/common/modals/confirmByInput/ConfirmByInputNew.vue +2 -7
  10. package/components/common/monitor/overview/filters/lib/config/filterOptions.ts +0 -1
  11. package/components/common/pages/backups/modals/createBackup/CreateBackup.vue +1 -1
  12. package/components/common/pages/backups/modals/createBackup/New.vue +2 -8
  13. package/components/common/pages/backups/modals/createBackup/lib/config/steps.ts +1 -2
  14. package/components/common/pages/backups/modals/restore/Restore.vue +5 -9
  15. package/components/common/pages/backups/modals/restore/RestoreNew.vue +3 -13
  16. package/components/common/pages/backups/modals/restore/RestoreOld.vue +18 -6
  17. package/components/common/pages/scheduledTasks/table/Table.vue +1 -1
  18. package/components/common/vm/actions/add/Add.vue +52 -127
  19. package/components/common/vm/actions/add/New.vue +16 -54
  20. package/components/common/vm/actions/add/Old.vue +16 -55
  21. package/components/common/vm/actions/clone/Clone.vue +48 -121
  22. package/components/common/vm/actions/clone/new/New.vue +14 -50
  23. package/components/common/vm/actions/clone/old/Old.vue +16 -52
  24. package/components/common/vm/actions/common/customizeHardware/CustomizeHardware.vue +14 -81
  25. package/components/common/vm/actions/common/customizeHardware/CustomizeHardwareNew.vue +7 -56
  26. package/components/common/vm/actions/common/customizeHardware/CustomizeHardwareOld.vue +8 -56
  27. package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardware.vue +208 -206
  28. package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardwareNew.vue +223 -120
  29. package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardwareOld.vue +218 -118
  30. package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/CdDvdDrive.vue +66 -53
  31. package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/lib/config/options.ts +1 -1
  32. package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/Cpu.vue +139 -159
  33. package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/CpuNew.vue +8 -15
  34. package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/CpuOld.vue +8 -13
  35. package/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/Memory.vue +62 -75
  36. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDisk.vue +241 -149
  37. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDiskNew.vue +3 -4
  38. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDiskOld.vue +2 -3
  39. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newNetwork/NewNetwork.vue +58 -96
  40. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newUsbController/NewUsbController.vue +6 -17
  41. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newUsbController/NewUsbControllerNew.vue +6 -3
  42. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newUsbController/NewUsbControllerOld.vue +6 -3
  43. package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCard.vue +17 -39
  44. package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCardNew.vue +6 -5
  45. package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCardOld.vue +6 -5
  46. package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/lib/config/options.ts +4 -4
  47. package/components/common/vm/actions/common/customizeHardware/vmoptions/Vmoptions.vue +6 -93
  48. package/components/common/vm/actions/common/customizeHardware/vmoptions/VmoptionsNew.vue +8 -62
  49. package/components/common/vm/actions/common/customizeHardware/vmoptions/VmoptionsOld.vue +8 -60
  50. package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/BootOptions.vue +5 -69
  51. package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/BootOptionsNew.vue +12 -32
  52. package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/BootOptionsOld.vue +12 -33
  53. package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/Order.vue +114 -132
  54. package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/OrderNew.vue +41 -6
  55. package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/OrderOld.vue +44 -6
  56. package/components/common/vm/actions/common/customizeHardware/vmoptions/generalOptions/GeneralOptions.vue +8 -23
  57. package/components/common/vm/actions/common/customizeHardware/vmoptions/generalOptions/GeneralOptionsNew.vue +21 -31
  58. package/components/common/vm/actions/common/customizeHardware/vmoptions/generalOptions/GeneralOptionsOld.vue +26 -34
  59. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/New.vue +28 -34
  60. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/Old.vue +24 -30
  61. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/RemoteConsoleOptions.vue +8 -112
  62. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/keymap/Keymap.vue +3 -3
  63. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/keymap/{KeymapNew.vue → New.vue} +6 -6
  64. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/keymap/{KeymapOld.vue → Old.vue} +5 -5
  65. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/password/Password.vue +6 -7
  66. package/components/common/vm/actions/common/customizeHardware/vmoptions/tools/Tools.vue +4 -38
  67. package/components/common/vm/actions/common/customizeHardware/vmoptions/tools/ToolsNew.vue +7 -26
  68. package/components/common/vm/actions/common/customizeHardware/vmoptions/tools/ToolsOld.vue +24 -50
  69. package/components/common/vm/actions/common/lib/models/interfaces.ts +57 -25
  70. package/components/common/vm/actions/common/select/os/New.vue +0 -19
  71. package/components/common/vm/actions/common/select/os/Old.vue +0 -34
  72. package/components/common/vm/actions/common/select/os/Os.vue +0 -25
  73. package/components/common/vm/actions/editSettings/EditSettings.vue +32 -90
  74. package/components/common/vm/actions/editSettings/EditSettingsOld.vue +14 -41
  75. package/components/common/vm/actions/editSettings/new/New.vue +14 -41
  76. package/components/common/vm/actions/lib/models/interfaces.ts +4 -29
  77. package/components/common/vm/actions/lib/utils.ts +64 -36
  78. package/package.json +1 -3
  79. package/store/tasks/mappers/recentTasks.ts +0 -4
  80. /package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/password/{PasswordNew.vue → New.vue} +0 -0
  81. /package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/password/{PasswordOld.vue → Old.vue} +0 -0
@@ -1,7 +1,8 @@
1
1
  <template>
2
2
  <common-vm-actions-add-new
3
3
  v-if="isNewView"
4
- v-model:vm-form="vmForm"
4
+ v-model="model"
5
+ v-model:computed-resource="computeResource"
5
6
  v-model:selected-create-type="selectedCreateType"
6
7
  v-model:is-power-on-by-default="isPowerOnByDefault"
7
8
  :project="props.project"
@@ -31,10 +32,6 @@
31
32
  :guestOsFamilies="guestOsFamilies"
32
33
  :guestOsVersions="guestOsVersions"
33
34
  :machineTypes="machineTypes"
34
- :virtual-hardware-hard-disks-local="virtualHardwareHardDisksLocal"
35
- :virtual-hardware-cd-dvd-drives-local="virtualHardwareCdDvdDrivesLocal"
36
- :virtual-hardware-networks-local="virtualHardwareNetworksLocal"
37
- :max-cpus="maxCpus"
38
35
  :max-memory="maxMemory"
39
36
  :cpu-models="cpuModels"
40
37
  :selected-nav-item="selectedNavItem"
@@ -72,14 +69,13 @@
72
69
  @change-storage="onChangeStorage"
73
70
  @change-select-options="onChangeSelectOptions"
74
71
  @change-compatibility="onChangeCompatibility"
75
- @change-boot-order="onChangeBootOrder"
76
- @change-customize-hardware="onChangeCustomizeHardware"
77
72
  @finish="onFinish"
78
73
  @hide="onHideModal"
79
74
  />
80
75
  <common-vm-actions-add-old
81
76
  v-else
82
- v-model:vm-form="vmForm"
77
+ v-model="model"
78
+ v-model:compute-resource="computeResource"
83
79
  v-model:selected-create-type="selectedCreateType"
84
80
  v-model:is-power-on-by-default="isPowerOnByDefault"
85
81
  :project="props.project"
@@ -109,10 +105,6 @@
109
105
  :guestOsFamilies="guestOsFamilies"
110
106
  :guestOsVersions="guestOsVersions"
111
107
  :machineTypes="machineTypes"
112
- :virtual-hardware-hard-disks-local="virtualHardwareHardDisksLocal"
113
- :virtual-hardware-cd-dvd-drives-local="virtualHardwareCdDvdDrivesLocal"
114
- :virtual-hardware-networks-local="virtualHardwareNetworksLocal"
115
- :max-cpus="maxCpus"
116
108
  :max-memory="maxMemory"
117
109
  :cpu-models="cpuModels"
118
110
  :selected-nav-item="selectedNavItem"
@@ -148,8 +140,6 @@
148
140
  @change-storage="onChangeStorage"
149
141
  @change-select-options="onChangeSelectOptions"
150
142
  @change-compatibility="onChangeCompatibility"
151
- @change-boot-order="onChangeBootOrder"
152
- @change-customize-hardware="onChangeCustomizeHardware"
153
143
  @finish="onFinish"
154
144
  @hide="onHideModal"
155
145
  />
@@ -185,19 +175,11 @@ import type {
185
175
  import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
186
176
  import type {
187
177
  UI_I_Capabilities,
178
+ UI_I_CreateVmData,
188
179
  UI_I_VmForm,
189
- UI_I_VmFormCash,
180
+ // UI_I_VmFormCash,
190
181
  } from '~/components/common/vm/actions/common/lib/models/interfaces'
191
- import type { UI_I_SendDataCustomizeHardware } from '~/components/common/vm/actions/common/customizeHardware/lib/models/interfaces'
192
- import type {
193
- UI_I_SendDataCpu,
194
- UI_I_SendDataMemory,
195
- UI_I_SendDataNewCdDvdDrive,
196
- UI_I_SendDataNewHardDisk,
197
- UI_I_SendDataNewNetwork,
198
- } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
199
182
  import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
200
- import type { UI_T_ChangeBootOrder } from '~/components/common/vm/actions/lib/models/types'
201
183
  import type {
202
184
  UI_I_MediatedDevice,
203
185
  UI_I_PciDevice,
@@ -213,6 +195,8 @@ import {
213
195
  } from '~/components/common/vm/actions/add/lib/config/steps'
214
196
  import { mapCapabilities } from '~/components/common/vm/actions/common/lib/utils/capabilities'
215
197
 
198
+ const model = defineModel<UI_I_CreateVmData>({ required: true })
199
+
216
200
  const props = withDefaults(
217
201
  defineProps<{
218
202
  project: UI_T_Project
@@ -267,7 +251,6 @@ const emits = defineEmits<{
267
251
  (event: 'remove-error-by-title', value: string): void
268
252
  (event: 'get-networks-table', value: UI_I_TablePayload): void
269
253
  (event: 'get-pci-devices'): void
270
- (event: 'get-pci-devices'): void
271
254
  (event: 'hide'): void
272
255
  (event: 'select-template', value: string): void
273
256
  (
@@ -512,9 +495,7 @@ const onCheckName = async (
512
495
  })
513
496
  }
514
497
  const compatibilityText = computed<[UI_T_CompatibilityStatus, string]>(() => {
515
- const { computeResource } = vmForm.value
516
-
517
- if (!computeResource)
498
+ if (!computeResource.value)
518
499
  return [
519
500
  'none',
520
501
  localization.value.vmWizard.noDestinationComputeResourceSelected,
@@ -525,21 +506,23 @@ const compatibilityText = computed<[UI_T_CompatibilityStatus, string]>(() => {
525
506
  localization.value.common.compatibilityChecksSucceeded,
526
507
  ]
527
508
 
528
- if (!['cluster', 'host', 'resource_pool'].includes(computeResource?.type)) {
509
+ if (
510
+ !['cluster', 'host', 'resource_pool'].includes(computeResource.value?.type)
511
+ ) {
529
512
  res = [
530
513
  'error',
531
514
  localization.value.common.selectValidClusterOrHostDestination,
532
515
  ]
533
516
  }
534
- if (computeResource?.type === 'cluster') {
535
- const hasHost = !!computeResource.nodes.length
517
+ if (computeResource.value?.type === 'cluster') {
518
+ const hasHost = !!computeResource.value.nodes.length
536
519
  if (!hasHost) {
537
520
  res = ['error', localization.value.common.clusterNotContainAnyHosts]
538
521
  }
539
522
  }
540
523
 
541
- if (computeResource?.type === 'host') {
542
- if (computeResource.state === 'Error') {
524
+ if (computeResource.value?.type === 'host') {
525
+ if (computeResource.value.state === 'Error') {
543
526
  // TODO check Maintenance Mode
544
527
  res = [
545
528
  'error',
@@ -556,14 +539,13 @@ const checkComputeResource = (
556
539
  ): UI_I_ValidationReturn => {
557
540
  let stepHasError = false
558
541
 
559
- const { computeResource } = vmForm.value
560
-
561
542
  if (
562
- !computeResource ||
543
+ !computeResource.value ||
563
544
  // compatibilityText.value[0] !== 1 ||
564
- computeResource.type === 'datacenter' ||
565
- computeResource.type === 'folder' ||
566
- (computeResource.type === 'cluster' && !computeResource.nodes.length)
545
+ computeResource.value.type === 'datacenter' ||
546
+ computeResource.value.type === 'folder' ||
547
+ (computeResource.value.type === 'cluster' &&
548
+ !computeResource.value.nodes.length)
567
549
  ) {
568
550
  computeResourceAlert.value = [
569
551
  localization.value.common.specifyValidClusterOrHostDestination,
@@ -704,22 +686,15 @@ const checkCustomizeHardwareForTemplate = async (
704
686
  })
705
687
  }
706
688
 
707
- const storageIdCash = ref<string | null>(null)
689
+ const computeResource = ref<UI_I_TreeNode | null>(props.computeResource)
708
690
  const vmForm = ref<UI_I_VmForm>({
709
- name: '',
710
- compatibility: '',
711
- guestMachineType: null,
712
- guestOsFamily: null,
713
- guestOsVersion: null,
714
- computeResource: props.computeResource,
715
- storage: null,
716
691
  locationPath: '',
717
692
  dataCenter: null,
718
693
  })
719
694
 
720
695
  const isLoadingComputeTree = ref<boolean>(false)
721
- const onChangeName = (name: string, node: UI_I_TreeNode | null): void => {
722
- vmForm.value.name = name // TODO уже нету смысла
696
+ const onChangeName = (_name: string, node: UI_I_TreeNode | null): void => {
697
+ // vmForm.value.name = name // TODO уже нету смысла
723
698
  if (isSphere.value) {
724
699
  vmForm.value.locationPath = node.id
725
700
  vmForm.value.dataCenter = $recursion.findParentByValue(
@@ -737,75 +712,43 @@ const onChangeName = (name: string, node: UI_I_TreeNode | null): void => {
737
712
  })
738
713
  }
739
714
  }
740
- // Для сферы
715
+ // // Для сферы
741
716
  const computeResourcePath = ref<string>('')
742
- const onSelectComputeResourceTree = (node: UI_I_TreeNode): void => {
743
- emits('select-compute-resource-tree', node)
744
- computeResourcePath.value = node.id
745
- }
746
717
  watch(
747
- () => vmForm.value.computeResource,
718
+ computeResource,
748
719
  (newValue, oldValue) => {
749
720
  if (newValue && newValue.id !== oldValue?.id) {
750
721
  onSelectComputeResourceTree(newValue)
751
722
  }
752
723
  },
753
- { deep: true, immediate: true }
724
+ { deep: true }
754
725
  )
755
-
726
+ const onSelectComputeResourceTree = (node: UI_I_TreeNode): void => {
727
+ emits('select-compute-resource-tree', node)
728
+ computeResourcePath.value = node.id
729
+ }
756
730
  const onChangeStorage = (storage: UI_I_DatastoreTableItem | null): void => {
757
731
  if (!storage) return
758
732
 
759
- vmForm.value.storage = storage
760
- storageIdCash.value = storage.id
733
+ // vmForm.value.storage = storage
734
+ model.value.storage = storage
761
735
  }
762
736
  const compatibilityInfo = ref<string>('')
763
737
  const onChangeCompatibility = (compatibility: UI_I_OptionItem): void => {
764
- vmForm.value.compatibility = compatibility.value
738
+ // vmForm.value.compatibility = compatibility.value
739
+ model.value.compatibility = compatibility.value
765
740
 
766
741
  const version = compatibility.value.split('-')[1]
767
742
  compatibilityInfo.value = `${localization.value.common.compatibility}: ${compatibility.text} (${localization.value.common.vmVersion} ${version})`
768
743
  }
769
- const customizeHardware = ref<UI_I_SendDataCustomizeHardware | null>(null)
770
- const onChangeCustomizeHardware = (
771
- data: UI_I_SendDataCustomizeHardware
772
- ): void => {
773
- customizeHardware.value = data
774
- }
775
-
776
- const virtualHardwareHardDisksLocal = computed<
777
- UI_I_SendDataNewHardDisk[] | null
778
- >(() => customizeHardware.value?.virtualHardware?.hardDisks || null)
779
- const virtualHardwareNetworksLocal = computed<UI_I_SendDataNewNetwork[] | null>(
780
- () => customizeHardware.value?.virtualHardware?.networks || null
781
- )
782
- const virtualHardwareCdDvdDrivesLocal = computed<
783
- UI_I_SendDataNewCdDvdDrive[] | null
784
- >(() => customizeHardware.value?.virtualHardware?.cdDvdDrives || null)
785
-
786
- const virtualHardwareCpu = computed<UI_I_SendDataCpu | null>(
787
- () => customizeHardware.value?.virtualHardware?.cpu || null
788
- )
789
- const virtualHardwareMemory = computed<UI_I_SendDataMemory | null>(
790
- () => customizeHardware.value?.virtualHardware?.memory || null
791
- )
792
- const virtualHardwareHardDisks = ref<UI_I_SendDataNewHardDisk[] | null>(null)
793
- const virtualHardwareCdDvdDrives = ref<UI_I_SendDataNewCdDvdDrive[] | null>(
794
- null
795
- )
796
- const virtualHardwareNetworks = ref<UI_I_SendDataNewNetwork[] | null>(null)
797
- const onChangeBootOrder = (data: UI_T_ChangeBootOrder): void => {
798
- virtualHardwareHardDisks.value = data[0]
799
- virtualHardwareCdDvdDrives.value = data[1]
800
- virtualHardwareNetworks.value = data[2]
801
- }
802
744
 
803
745
  const isPowerOnByDefault = ref<boolean>(true)
804
746
 
805
747
  watch(
806
748
  () => props.vmNameInWizard,
807
749
  (newValue) => {
808
- vmForm.value.name = newValue
750
+ // vmForm.value.name = newValue
751
+ model.value.name = newValue
809
752
  }
810
753
  )
811
754
 
@@ -817,13 +760,7 @@ const validateSendData = async (
817
760
  isLoading.value = true
818
761
 
819
762
  const data = await props.validateSendDataFunc(
820
- vmForm.value,
821
- virtualHardwareCpu.value,
822
- virtualHardwareMemory.value,
823
- customizeHardware.value,
824
- virtualHardwareNetworks.value,
825
- virtualHardwareHardDisks.value,
826
- virtualHardwareCdDvdDrives.value,
763
+ model.value,
827
764
  isPowerOnByDefault.value,
828
765
  localization.value,
829
766
  vmForm.value.locationPath, // для сферы
@@ -850,13 +787,7 @@ const onFinish = (): void => {
850
787
  wizard.setLoader(false)
851
788
  props
852
789
  .finishFunc(
853
- vmForm.value,
854
- virtualHardwareCpu.value,
855
- virtualHardwareMemory.value,
856
- customizeHardware.value,
857
- virtualHardwareNetworks.value,
858
- virtualHardwareHardDisks.value,
859
- virtualHardwareCdDvdDrives.value,
790
+ model.value,
860
791
  isPowerOnByDefault.value,
861
792
  localization.value,
862
793
  vmForm.value.locationPath, // для сферы
@@ -888,7 +819,7 @@ const guestOsVersions = ref<UI_I_ArbitraryObject<UI_I_OptionItem[]>>(
888
819
  )
889
820
  const machineTypes = ref<UI_I_OptionItem[]>(capabilities.value.machineTypes)
890
821
  const cpuModels = ref<UI_I_OptionItem[]>(capabilities.value.cpuModels)
891
- const maxCpus = ref<number>(capabilities.value.maxCpus)
822
+ model.value.cpu.max_vcpus = capabilities.value.maxCpus
892
823
  const maxMemory = ref<number>(capabilities.value.maxMemory)
893
824
 
894
825
  const selectedTemplate = ref<string>('')
@@ -923,24 +854,18 @@ watch(
923
854
  () => props.vmtSettings,
924
855
  (newValue) => {
925
856
  if (newValue) {
926
- vmForm.value.name = newValue.name
927
- vmForm.value.compatibility =
928
- newValue.compatibility || vmForm.value.compatibility
929
- vmForm.value.storage = newValue.storage
930
- if (customizeHardware.value?.virtualHardware) {
931
- customizeHardware.value.virtualHardware.cdDvdDrives =
932
- newValue.cdDvdDrives
933
- customizeHardware.value.virtualHardware.hardDisks = newValue.hardDisks
934
- customizeHardware.value.virtualHardware.networks = newValue.networks
935
- customizeHardware.value.virtualHardware.cpu = newValue.cpu
936
- customizeHardware.value.virtualHardware.memory = newValue.memory
937
- customizeHardware.value.virtualHardware.videoCard = newValue.videoCard
938
- customizeHardware.value.virtualHardware.usbController =
939
- newValue.usbController
940
- customizeHardware.value.virtualHardware.pciDevices = newValue.pciDevices
941
- customizeHardware.value.vmOptions = newValue.options
942
- }
943
- maxCpus.value = newValue.cpu.max_vcpus
857
+ // vmForm.value.name = newValue.name
858
+ // vmForm.value.compatibility =
859
+ // newValue.compatibility || vmForm.value.compatibility
860
+ // vmForm.value.storage = newValue.storage
861
+ // TODO remove
862
+ model.value.name = newValue.name
863
+ model.value.compatibility =
864
+ newValue.compatibility || model.value.compatibility
865
+ model.value.storage = newValue.storage
866
+ // TODO remove end
867
+
868
+ capabilities.value.maxCpus = newValue.cpu.max_vcpus
944
869
  cpuModels.value = newValue.cpu.model
945
870
  isPowerOnByDefault.value = false
946
871
  }
@@ -66,7 +66,7 @@
66
66
  </template>
67
67
  <template #content>
68
68
  <common-wizards-common-steps-name
69
- v-model:name="vmForm.name"
69
+ v-model:name="model.name"
70
70
  v-model:location="location"
71
71
  :show="
72
72
  selectedStep.id === dynamicSteps.selectName ||
@@ -118,7 +118,7 @@
118
118
  <common-wizards-common-steps-compute-resource
119
119
  v-if="props.isSphere"
120
120
  v-show="selectedStep.id === dynamicSteps.selectComputeResource"
121
- v-model="vmForm.computeResource"
121
+ v-model="computeResource"
122
122
  :node="computeResourceTreeLocal"
123
123
  :alert-messages="props.computeResourceAlert"
124
124
  :is-loading="props.isLoadingComputeTree"
@@ -227,9 +227,9 @@
227
227
  <template #content>
228
228
  <div class="select-block-wrap overflow-auto pb-4">
229
229
  <common-vm-actions-common-select-os
230
- v-model:machine-type="vmForm.guestMachineType"
231
- v-model:guest-os-family="vmForm.guestOsFamily"
232
- v-model:guest-os-version="vmForm.guestOsVersion"
230
+ v-model:guest-os-family="model.guest_os_family"
231
+ v-model:guest-os-version="model.guest_os_version"
232
+ v-model:machine-type="model.machine_type"
233
233
  :families-options="props.guestOsFamilies"
234
234
  :versions-options="props.guestOsVersions"
235
235
  :machine-types-options="props.machineTypes"
@@ -250,21 +250,11 @@
250
250
  <template #content>
251
251
  <div class="select-block-wrap customize-hardware flex flex-col">
252
252
  <common-vm-actions-common-customize-hardware
253
+ v-model="model"
253
254
  :project="props.project"
254
255
  :is-vmt="props.isVmt"
255
- :vm-name="vmForm.name"
256
- :guest-machine-type="vmForm.guestMachineType"
257
- :guest-os-family="vmForm.guestOsFamily"
258
- :guest-os-version="vmForm.guestOsVersion"
259
- :storage="vmForm.storage"
260
- :hard-disks-for-boot-options="props.virtualHardwareHardDisksLocal"
261
- :cd-dvd-drives-for-boot-options="
262
- props.virtualHardwareCdDvdDrivesLocal
263
- "
264
- :networks-for-boot-options="props.virtualHardwareNetworksLocal"
265
- :cd-dvd-drives="props.virtualHardwareCdDvdDrivesLocal"
256
+ :storage="model.storage"
266
257
  :customize-hardware-submit="props.customizeHardwareSubmit"
267
- :max-cpus="props.maxCpus"
268
258
  :max-memory="props.maxMemory"
269
259
  :cpu-models="props.cpuModels"
270
260
  :selected-nav-item="props.selectedNavItem"
@@ -278,10 +268,8 @@
278
268
  :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
279
269
  :passthrough-devices="props.passthroughDevices"
280
270
  :mediated-devices="props.mediatedDevices"
281
- :compute-resource="vmForm.computeResource"
271
+ :compute-resource="computeResource"
282
272
  :compatibility-info="props.compatibilityInfo"
283
- @change-boot-order="emits('change-boot-order', $event)"
284
- @send-data="emits('change-customize-hardware', $event)"
285
273
  @get-storage="emits('get-storage', $event)"
286
274
  @get-folders-or-files="emits('get-folders-or-files', $event)"
287
275
  @get-active-device-child="
@@ -313,31 +301,19 @@
313
301
  class="select-block-wrap overflow-auto h-full flex flex-col pr-8"
314
302
  >
315
303
  <common-vm-actions-common-customize-hardware
304
+ v-model="model"
316
305
  :project="props.project"
317
306
  :is-vmt="props.isVmt"
318
- :vm-name="vmForm.name"
319
- :guest-machine-type="vmForm.guestMachineType"
320
- :guest-os-family="vmForm.guestOsFamily"
321
- :guest-os-version="vmForm.guestOsVersion"
322
- :storage="vmForm.storage"
323
- :hard-disks-for-boot-options="props.virtualHardwareHardDisksLocal"
324
- :cd-dvd-drives-for-boot-options="
325
- props.virtualHardwareCdDvdDrivesLocal
326
- "
327
- :networks-for-boot-options="props.virtualHardwareNetworksLocal"
307
+ :storage="model.storage"
328
308
  :cd-dvd-drives="props.vmtSettings.cdDvdDrives || []"
329
309
  :hard-disks="props.vmtSettings.hardDisks || []"
330
310
  :networks="props.vmtSettings.networks || []"
331
311
  :customize-hardware-submit="
332
312
  props.customizeHardwareForTemplateSubmit
333
313
  "
334
- :max-cpus="props.maxCpus"
335
314
  :max-memory="props.maxMemory"
336
315
  :cpu-models="props.cpuModels"
337
- :cpu="props.vmtSettings.cpu"
338
- :memory="props.vmtSettings.memory"
339
316
  :video-card="props.vmtSettings.videoCard"
340
- :usb-controller="props.vmtSettings.usbController"
341
317
  :pci-devices="props.vmtSettings.pciDevices"
342
318
  :hard-disks-for-edit="props.vmtSettings.hardDisks || []"
343
319
  :options="props.vmtSettings.options"
@@ -352,11 +328,9 @@
352
328
  :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
353
329
  :passthrough-devices="props.passthroughDevices"
354
330
  :mediated-devices="props.mediatedDevices"
355
- :compute-resource="vmForm.computeResource"
331
+ :compute-resource="computeResource"
356
332
  :compatibility-info="props.compatibilityInfo"
357
333
  is-clone
358
- @change-boot-order="emits('change-boot-order', $event)"
359
- @send-data="emits('change-customize-hardware', $event)"
360
334
  @get-storage="emits('get-storage', $event)"
361
335
  @get-folders-or-files="emits('get-folders-or-files', $event)"
362
336
  @get-active-device-child="
@@ -444,17 +418,11 @@ import type {
444
418
  } from '~/components/common/vm/actions/common/lib/models/types'
445
419
  import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
446
420
  import type {
421
+ UI_I_CreateVmData,
447
422
  // UI_I_Capabilities,
448
423
  UI_I_VmForm,
449
424
  } from '~/components/common/vm/actions/common/lib/models/interfaces'
450
- import type { UI_I_SendDataCustomizeHardware } from '~/components/common/vm/actions/common/customizeHardware/lib/models/interfaces'
451
- import type {
452
- UI_I_SendDataNewCdDvdDrive,
453
- UI_I_SendDataNewHardDisk,
454
- UI_I_SendDataNewNetwork,
455
- } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
456
425
  import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
457
- import type { UI_T_ChangeBootOrder } from '~/components/common/vm/actions/lib/models/types'
458
426
  import type {
459
427
  UI_I_MediatedDevice,
460
428
  UI_I_PciDevice,
@@ -464,7 +432,10 @@ import type { UI_I_NameTestIds } from '~/components/common/wizards/common/steps/
464
432
  import type { UI_T_CompatibilityStatus } from '~/components/common/wizards/common/compatibility/lib/models/types'
465
433
  import { dynamicSteps } from '~/components/common/vm/actions/add/lib/config/steps'
466
434
 
467
- const vmForm = defineModel<UI_I_VmForm>('vmForm', {
435
+ const model = defineModel<UI_I_CreateVmData>({
436
+ required: true,
437
+ })
438
+ const computeResource = defineModel<UI_I_TreeNode | null>('computeResource', {
468
439
  required: true,
469
440
  })
470
441
  const selectedCreateType = defineModel<string>('selectedCreateType', {
@@ -503,10 +474,6 @@ const props = withDefaults(
503
474
  guestOsFamilies: UI_I_OptionItem[]
504
475
  guestOsVersions: UI_I_ArbitraryObject<UI_I_OptionItem[]>
505
476
  machineTypes: UI_I_OptionItem[]
506
- virtualHardwareHardDisksLocal: UI_I_SendDataNewHardDisk[] | null
507
- virtualHardwareCdDvdDrivesLocal: UI_I_SendDataNewCdDvdDrive[] | null
508
- virtualHardwareNetworksLocal: UI_I_SendDataNewNetwork[] | null
509
- maxCpus: number
510
477
  maxMemory: number
511
478
  cpuModels: UI_I_OptionItem[]
512
479
  selectedNavItem: UI_T_SelectedNavItem
@@ -559,11 +526,6 @@ const emits = defineEmits<{
559
526
  (event: 'change-storage', value: UI_I_DatastoreTableItem | null): void
560
527
  (event: 'change-select-options', value: string[]): void
561
528
  (event: 'change-compatibility', value: UI_I_OptionItem): void
562
- (event: 'change-boot-order', value: UI_T_ChangeBootOrder): void
563
- (
564
- event: 'change-customize-hardware',
565
- value: UI_I_SendDataCustomizeHardware
566
- ): void
567
529
  (event: 'hide'): void
568
530
  }>()
569
531
 
@@ -34,7 +34,7 @@
34
34
  selectedStep.id === dynamicSteps.selectName ||
35
35
  selectedStep.id === dynamicSteps.selectNameFolder
36
36
  "
37
- v-model:name="vmForm.name"
37
+ v-model:name="model.name"
38
38
  v-model:location="location"
39
39
  :show="
40
40
  selectedStep.id === dynamicSteps.selectName ||
@@ -55,7 +55,7 @@
55
55
  <common-wizards-common-steps-compute-resource
56
56
  v-if="props.isSphere"
57
57
  v-show="selectedStep.id === dynamicSteps.selectComputeResource"
58
- v-model="vmForm.computeResource"
58
+ v-model="computeResource"
59
59
  :node="computeResourceTreeLocal"
60
60
  :alert-messages="props.computeResourceAlert"
61
61
  :is-loading="props.isLoadingComputeTree"
@@ -90,9 +90,9 @@
90
90
  selectedStep.id === dynamicSteps.selectGuestOSMachineType ||
91
91
  selectedStep.id === dynamicSteps.selectGuestOS
92
92
  "
93
- v-model:machine-type="vmForm.guestMachineType"
94
- v-model:guest-os-family="vmForm.guestOsFamily"
95
- v-model:guest-os-version="vmForm.guestOsVersion"
93
+ v-model:guest-os-family="model.guest_os_family"
94
+ v-model:guest-os-version="model.guest_os_version"
95
+ v-model:machine-type="model.machine_type"
96
96
  :families-options="props.guestOsFamilies"
97
97
  :versions-options="props.guestOsVersions"
98
98
  :machine-types-options="props.machineTypes"
@@ -101,21 +101,11 @@
101
101
  />
102
102
  <common-vm-actions-common-customize-hardware
103
103
  v-show="selectedStep.id === dynamicSteps.customizeHardware"
104
+ v-model="model"
104
105
  :project="props.project"
105
106
  :is-vmt="props.isVmt"
106
- :vm-name="vmForm.name"
107
- :guest-machine-type="vmForm.guestMachineType"
108
- :guest-os-family="vmForm.guestOsFamily"
109
- :guest-os-version="vmForm.guestOsVersion"
110
- :storage="vmForm.storage"
111
- :hard-disks-for-boot-options="props.virtualHardwareHardDisksLocal"
112
- :cd-dvd-drives-for-boot-options="
113
- props.virtualHardwareCdDvdDrivesLocal
114
- "
115
- :networks-for-boot-options="props.virtualHardwareNetworksLocal"
116
- :cd-dvd-drives="props.virtualHardwareCdDvdDrivesLocal"
107
+ :storage="model.storage"
117
108
  :customize-hardware-submit="props.customizeHardwareSubmit"
118
- :max-cpus="props.maxCpus"
119
109
  :max-memory="props.maxMemory"
120
110
  :cpu-models="props.cpuModels"
121
111
  :selected-nav-item="props.selectedNavItem"
@@ -129,9 +119,7 @@
129
119
  :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
130
120
  :passthrough-devices="props.passthroughDevices"
131
121
  :mediated-devices="props.mediatedDevices"
132
- :compute-resource="vmForm.computeResource"
133
- @change-boot-order="emits('change-boot-order', $event)"
134
- @send-data="emits('change-customize-hardware', $event)"
122
+ :compute-resource="computeResource"
135
123
  @get-storage="emits('get-storage', $event)"
136
124
  @get-folders-or-files="emits('get-folders-or-files', $event)"
137
125
  @get-active-device-child="emits('get-active-device-child', $event)"
@@ -143,34 +131,21 @@
143
131
  <common-vm-actions-common-customize-hardware
144
132
  v-if="props.vmtSettings"
145
133
  v-show="selectedStep.id === dynamicSteps.customizeHardwareTemplate"
134
+ v-model="model"
146
135
  :is-vmt="props.isVmt"
147
136
  :project="props.project"
148
- :vm-name="vmForm.name"
149
- :guest-machine-type="vmForm.guestMachineType"
150
- :guest-os-family="vmForm.guestOsFamily"
151
- :guest-os-version="vmForm.guestOsVersion"
152
- :storage="vmForm.storage"
153
- :hard-disks-for-boot-options="props.virtualHardwareHardDisksLocal"
154
- :cd-dvd-drives-for-boot-options="
155
- props.virtualHardwareCdDvdDrivesLocal
156
- "
157
- :networks-for-boot-options="props.virtualHardwareNetworksLocal"
137
+ :storage="model.storage"
158
138
  :cd-dvd-drives="props.vmtSettings.cdDvdDrives || []"
159
139
  :hard-disks="props.vmtSettings.hardDisks || []"
160
140
  :networks="props.vmtSettings.networks || []"
161
141
  :customize-hardware-submit="
162
142
  props.customizeHardwareForTemplateSubmit
163
143
  "
164
- :max-cpus="props.maxCpus"
165
144
  :max-memory="props.maxMemory"
166
145
  :cpu-models="props.cpuModels"
167
- :cpu="props.vmtSettings.cpu"
168
- :memory="props.vmtSettings.memory"
169
146
  :video-card="props.vmtSettings.videoCard"
170
- :usb-controller="props.vmtSettings.usbController"
171
147
  :pci-devices="props.vmtSettings.pciDevices"
172
148
  :hard-disks-for-edit="props.vmtSettings.hardDisks || []"
173
- :options="props.vmtSettings.options"
174
149
  :selected-nav-item="props.selectedNavItem"
175
150
  :nodes="props.nodes"
176
151
  :files="props.files"
@@ -182,10 +157,8 @@
182
157
  :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
183
158
  :passthrough-devices="props.passthroughDevices"
184
159
  :mediated-devices="props.mediatedDevices"
185
- :compute-resource="vmForm.computeResource"
160
+ :compute-resource="computeResource"
186
161
  is-clone
187
- @change-boot-order="emits('change-boot-order', $event)"
188
- @send-data="emits('change-customize-hardware', $event)"
189
162
  @get-storage="emits('get-storage', $event)"
190
163
  @get-folders-or-files="emits('get-folders-or-files', $event)"
191
164
  @get-active-device-child="emits('get-active-device-child', $event)"
@@ -246,17 +219,11 @@ import type {
246
219
  } from '~/components/common/vm/actions/common/lib/models/types'
247
220
  import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
248
221
  import type {
222
+ UI_I_CreateVmData,
249
223
  // UI_I_Capabilities,
250
224
  UI_I_VmForm,
251
225
  } from '~/components/common/vm/actions/common/lib/models/interfaces'
252
- import type { UI_I_SendDataCustomizeHardware } from '~/components/common/vm/actions/common/customizeHardware/lib/models/interfaces'
253
- import type {
254
- UI_I_SendDataNewCdDvdDrive,
255
- UI_I_SendDataNewHardDisk,
256
- UI_I_SendDataNewNetwork,
257
- } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
258
226
  import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
259
- import type { UI_T_ChangeBootOrder } from '~/components/common/vm/actions/lib/models/types'
260
227
  import type {
261
228
  UI_I_MediatedDevice,
262
229
  UI_I_PciDevice,
@@ -266,7 +233,10 @@ import type { UI_I_NameTestIds } from '~/components/common/wizards/common/steps/
266
233
  import type { UI_T_CompatibilityStatus } from '~/components/common/wizards/common/compatibility/lib/models/types'
267
234
  import { dynamicSteps } from '~/components/common/vm/actions/add/lib/config/steps'
268
235
 
269
- const vmForm = defineModel<UI_I_VmForm>('vmForm', {
236
+ const model = defineModel<UI_I_CreateVmData>({
237
+ required: true,
238
+ })
239
+ const computeResource = defineModel<UI_I_TreeNode | null>('computeResource', {
270
240
  required: true,
271
241
  })
272
242
  const selectedCreateType = defineModel<string>('selectedCreateType', {
@@ -305,10 +275,6 @@ const props = withDefaults(
305
275
  guestOsFamilies: UI_I_OptionItem[]
306
276
  guestOsVersions: UI_I_ArbitraryObject<UI_I_OptionItem[]>
307
277
  machineTypes: UI_I_OptionItem[]
308
- virtualHardwareHardDisksLocal: UI_I_SendDataNewHardDisk[] | null
309
- virtualHardwareCdDvdDrivesLocal: UI_I_SendDataNewCdDvdDrive[] | null
310
- virtualHardwareNetworksLocal: UI_I_SendDataNewNetwork[] | null
311
- maxCpus: number
312
278
  maxMemory: number
313
279
  cpuModels: UI_I_OptionItem[]
314
280
  selectedNavItem: UI_T_SelectedNavItem
@@ -358,11 +324,6 @@ const emits = defineEmits<{
358
324
  (event: 'change-storage', value: UI_I_DatastoreTableItem | null): void
359
325
  (event: 'change-select-options', value: string[]): void
360
326
  (event: 'change-compatibility', value: UI_I_OptionItem): void
361
- (event: 'change-boot-order', value: UI_T_ChangeBootOrder): void
362
- (
363
- event: 'change-customize-hardware',
364
- value: UI_I_SendDataCustomizeHardware
365
- ): void
366
327
  (event: 'hide'): void
367
328
  }>()
368
329