bfg-common 1.5.577 → 1.5.578

package/components/common/vm/actions/common/select/options/Old.vue

@@ -1,103 +1,103 @@
-<template>
-  <div class="select-options">
-    <div :class="['checkbox', { disabled: props.isCreateTemplate }]">
-      <input
-        id="customize-os"
-        v-model="modelValue"
-        :disabled="props.isCreateTemplate"
-        data-id="customize-os"
-        type="checkbox"
-        value="customize-os"
-      />
-      <label for="customize-os">{{
-        localization.common.customizeTheOperatingSystem
-      }}</label>
-    </div>
-    <div v-if="!props.isCreateTemplate" class="checkbox">
-      <input
-        id="customize-hardware"
-        v-model="modelValue"
-        data-id="customize-hardware"
-        type="checkbox"
-        value="customize-hardware"
-      />
-      <label for="customize-hardware">{{
-        localization.common.customizeThisVirtualMachineHardware
-      }}</label>
-    </div>
-    <div class="checkbox">
-      <!--      :disabled="props.isCreateTemplate"-->
-      <input
-        id="power-on"
-        v-model="modelValue"
-        data-id="power-on"
-        type="checkbox"
-        value="power-on"
-      />
-      <label for="power-on">{{
-        localization.common.powerOnVirtualMachineAfterCreation
-      }}</label>
-    </div>
-    <div v-if="props.isCreateTemplate" class="checkbox">
-      <!--      :disabled="props.isCreateTemplate"-->
-      <input
-        id="create-inked-clone"
-        v-model="modelValue"
-        data-id="create-inked-clone"
-        type="checkbox"
-        value="create-inked-clone"
-      />
-      <label for="create-inked-clone">{{
-        localization.vmWizard.createLinkedClone
-      }}</label>
-
-      <input
-        v-model="cloneCount"
-        :disabled="!isLinkedClone"
-        data-id="clone-count"
-        type="number"
-        class="ml-1"
-        :min="0"
-        :max="1000"
-      />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const modelValue = defineModel<string[]>()
-const cloneCount = defineModel<number>('cloneCount')
-
-const props = withDefaults(
-  defineProps<{
-    isCreateTemplate?: boolean // TODO change
-  }>(),
-  {
-    isCreateTemplate: undefined,
-  }
-)
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const isLinkedClone = computed<boolean>(
-  () => modelValue.value?.includes('create-inked-clone') || false
-)
-</script>
-
-<style scoped lang="scss">
-.select-options {
-  padding: 12px 0 0;
-
-  .disabled {
-    input,
-    label {
-      cursor: not-allowed;
-    }
-  }
-  .checkbox {
-    margin: 6px 0;
-  }
-}
-</style>
+<template>
+  <div class="select-options">
+    <div :class="['checkbox', { disabled: props.isCreateTemplate }]">
+      <input
+        id="customize-os"
+        v-model="modelValue"
+        :disabled="props.isCreateTemplate"
+        data-id="customize-os"
+        type="checkbox"
+        value="customize-os"
+      />
+      <label for="customize-os">{{
+        localization.common.customizeTheOperatingSystem
+      }}</label>
+    </div>
+    <div v-if="!props.isCreateTemplate" class="checkbox">
+      <input
+        id="customize-hardware"
+        v-model="modelValue"
+        data-id="customize-hardware"
+        type="checkbox"
+        value="customize-hardware"
+      />
+      <label for="customize-hardware">{{
+        localization.common.customizeThisVirtualMachineHardware
+      }}</label>
+    </div>
+    <div class="checkbox">
+      <!--      :disabled="props.isCreateTemplate"-->
+      <input
+        id="power-on"
+        v-model="modelValue"
+        data-id="power-on"
+        type="checkbox"
+        value="power-on"
+      />
+      <label for="power-on">{{
+        localization.common.powerOnVirtualMachineAfterCreation
+      }}</label>
+    </div>
+    <div v-if="props.isCreateTemplate" class="checkbox">
+      <!--      :disabled="props.isCreateTemplate"-->
+      <input
+        id="create-inked-clone"
+        v-model="modelValue"
+        data-id="create-inked-clone"
+        type="checkbox"
+        value="create-inked-clone"
+      />
+      <label for="create-inked-clone">{{
+        localization.vmWizard.createLinkedClone
+      }}</label>
+
+      <input
+        v-model="cloneCount"
+        :disabled="!isLinkedClone"
+        data-id="clone-count"
+        type="number"
+        class="ml-1"
+        :min="0"
+        :max="1000"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const modelValue = defineModel<string[]>()
+const cloneCount = defineModel<number>('cloneCount')
+
+const props = withDefaults(
+  defineProps<{
+    isCreateTemplate?: boolean // TODO change
+  }>(),
+  {
+    isCreateTemplate: undefined,
+  }
+)
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const isLinkedClone = computed<boolean>(
+  () => modelValue.value?.includes('create-inked-clone') || false
+)
+</script>
+
+<style scoped lang="scss">
+.select-options {
+  padding: 12px 0 0;
+
+  .disabled {
+    input,
+    label {
+      cursor: not-allowed;
+    }
+  }
+  .checkbox {
+    margin: 6px 0;
+  }
+}
+</style>

package/components/common/vm/actions/common/select/options/Options.vue

@@ -1,54 +1,54 @@
-<template>
-  <common-vm-actions-common-select-options-new
-    v-if="isNewView"
-    v-model="selectedOptions"
-    v-model:clone-count="cloneCount"
-    :is-create-template="props.isCreateTemplate"
-  />
-  <common-vm-actions-common-select-options-old
-    v-else
-    v-model="selectedOptions"
-    v-model:clone-count="cloneCount"
-    :is-create-template="props.isCreateTemplate"
-  />
-</template>
-
-<script setup lang="ts">
-const props = withDefaults(
-  defineProps<{
-    isCreateTemplate?: boolean // TODO change
-  }>(),
-  {
-    isCreateTemplate: undefined,
-  }
-)
-
-const emits = defineEmits<{
-  (event: 'change', value: string[]): void
-  (event: 'change-count', value: number): void
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const selectedOptions = ref<string[]>([])
-watch(selectedOptions, (newValue) => {
-  emits('change', newValue)
-})
-const cloneCount = ref<number>(0) // For Deploy
-watch(cloneCount, (newValue) => {
-  if (newValue < 0) {
-    cloneCount.value = 0
-    return
-  }
-  if (newValue > 1000) {
-    cloneCount.value = 1000
-    return
-  }
-
-  emits('change-count', newValue)
-})
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <common-vm-actions-common-select-options-new
+    v-if="isNewView"
+    v-model="selectedOptions"
+    v-model:clone-count="cloneCount"
+    :is-create-template="props.isCreateTemplate"
+  />
+  <common-vm-actions-common-select-options-old
+    v-else
+    v-model="selectedOptions"
+    v-model:clone-count="cloneCount"
+    :is-create-template="props.isCreateTemplate"
+  />
+</template>
+
+<script setup lang="ts">
+const props = withDefaults(
+  defineProps<{
+    isCreateTemplate?: boolean // TODO change
+  }>(),
+  {
+    isCreateTemplate: undefined,
+  }
+)
+
+const emits = defineEmits<{
+  (event: 'change', value: string[]): void
+  (event: 'change-count', value: number): void
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const selectedOptions = ref<string[]>([])
+watch(selectedOptions, (newValue) => {
+  emits('change', newValue)
+})
+const cloneCount = ref<number>(0) // For Deploy
+watch(cloneCount, (newValue) => {
+  if (newValue < 0) {
+    cloneCount.value = 0
+    return
+  }
+  if (newValue > 1000) {
+    cloneCount.value = 1000
+    return
+  }
+
+  emits('change-count', newValue)
+})
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/vm/actions/editSettings/EditSettings.vue

@@ -1,8 +1,7 @@
 <template>
   <common-vm-actions-edit-settings-new
     v-if="isNewView"
-    v-model:vm-name="vmName"
-    v-model:vm-settings="vmSettingsLocal"
+    v-model:vm-settings="model"
     :nodes="props.nodes"
     :files="props.files"
     :project="props.project"
@@ -13,32 +12,27 @@
     :selected-nav-item="selectedNavItem"
     :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
     :error-validation-fields="props.errorValidationFields"
-    :virtual-hardware-networks="virtualHardwareNetworksLocal"
-    :virtual-hardware-hard-disks="virtualHardwareHardDisksLocal"
-    :virtual-hardware-cd-dvd-drives="virtualHardwareCdDvdDrivesLocal"
     :state="props.state"
-    :vm-name-old="props.vmSettings?.name"
+    :vm-name-old="vmNameOld"
     :passthrough-devices="props.passthroughDevices"
     :mediated-devices="props.mediatedDevices"
     :get-datastore-table-func="props.getDatastoreTableFunc"
     :customize-hardware-submit="customizeHardwareSubmit"
     :is-vmt="props.isVmt"
+    :max-memory="maxMemory"
+    :cpu-models="cpuModels"
     @hide="emits('hide')"
     @validate="validateSendData"
-    @update-vm="emits('update-vm')"
     @get-storage="emits('get-storage', $event)"
     @get-pci-devices="emits('get-pci-devices')"
-    @change-boot-order="onChangeBootOrder"
     @get-networks-table="emits('get-networks-table', $event)"
     @get-folders-or-files="emits('get-folders-or-files', $event)"
     @show-datastore-child="emits('show-datastore-child', $event)"
     @get-active-device-child="emits('get-active-device-child', $event)"
-    @change-customize-hardware="onChangeCustomizeHardware"
   />
   <common-vm-actions-edit-settings-old
     v-else
-    v-model:vm-name="vmName"
-    v-model:vm-settings="vmSettingsLocal"
+    v-model:vm-settings="model"
     :nodes="props.nodes"
     :files="props.files"
     :project="props.project"
@@ -49,27 +43,23 @@
     :selected-nav-item="selectedNavItem"
     :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
     :error-validation-fields="props.errorValidationFields"
-    :virtual-hardware-networks="virtualHardwareNetworksLocal"
-    :virtual-hardware-hard-disks="virtualHardwareHardDisksLocal"
-    :virtual-hardware-cd-dvd-drives="virtualHardwareCdDvdDrivesLocal"
     :state="props.state"
-    :vm-name-old="props.vmSettings?.name"
+    :vm-name-old="vmNameOld"
     :passthrough-devices="props.passthroughDevices"
     :mediated-devices="props.mediatedDevices"
     :get-datastore-table-func="props.getDatastoreTableFunc"
     :customize-hardware-submit="customizeHardwareSubmit"
     :is-vmt="props.isVmt"
+    :max-memory="maxMemory"
+    :cpu-models="cpuModels"
     @hide="emits('hide')"
     @validate="validateSendData"
-    @update-vm="emits('update-vm')"
     @get-storage="emits('get-storage', $event)"
     @get-pci-devices="emits('get-pci-devices')"
-    @change-boot-order="onChangeBootOrder"
     @get-networks-table="emits('get-networks-table', $event)"
     @get-folders-or-files="emits('get-folders-or-files', $event)"
     @show-datastore-child="emits('show-datastore-child', $event)"
     @get-active-device-child="emits('get-active-device-child', $event)"
-    @change-customize-hardware="onChangeCustomizeHardware"
   />
 </template>
 
@@ -80,17 +70,7 @@ import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interface
 import type {
   UI_I_MediatedDevice,
   UI_I_PciDevice,
-  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,
-  UI_I_SendDataCpu,
-  UI_I_SendDataMemory,
-} 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'
@@ -98,20 +78,25 @@ 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 type { UI_T_EditVmFinishFunc } from '~/components/common/vm/actions/editSettings/lib/models/types'
-import type { UI_I_Capabilities } from '~/components/common/vm/actions/common/lib/models/interfaces'
+import type {
+  UI_I_Capabilities,
+  UI_I_CreateVmData,
+} from '~/components/common/vm/actions/common/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import { mapCapabilities } from '~/components/common/vm/actions/common/lib/utils/capabilities'
+import { capabilities } from '~/components/common/vm/actions/common/lib/config/capabilities'
+
+const model = defineModel<UI_I_CreateVmData>({ required: true })
 
 const props = withDefaults(
   defineProps<{
     project: UI_T_Project
     loading: boolean
-    vmSettings: UI_I_VmSettings | null
     nodes: UI_I_FileTreeNode[]
     files: UI_I_FileTreeNode[]
     networksTable: UI_I_NetworkTableItem[]
-    errorValidationFields: UI_I_ErrorValidationField<string>[]
+    errorValidationFields: UI_I_ErrorValidationField[]
     vmCpuHelpTextSecond: string
     vmId: string
     datastore: UI_I_DatastoreTableItem[]
@@ -148,7 +133,7 @@ const emits = defineEmits<{
 const { $store }: any = useNuxtApp()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
-const localization = computed<UI_I_Localization>(() => useLocal())
+const vmNameOld = computed<string>(() => model.value?.name || '')
 
 watch(
   () => props.capabilities,
@@ -158,6 +143,9 @@ watch(
   { deep: true, immediate: true }
 )
 
+const cpuModels = ref<UI_I_OptionItem[]>(capabilities.value.cpuModels)
+const maxMemory = ref<number>(capabilities.value.maxMemory)
+
 const selectedNavItem = ref<UI_T_SelectedNavItem>(0)
 
 const loadingLocal = ref<boolean>(false)
@@ -169,45 +157,12 @@ watch(
   { immediate: true }
 )
 
-const vmSettingsLocal = computed<UI_I_VmSettings | null>(() => props.vmSettings)
-
-const vmName = ref<string>(vmSettingsLocal.value?.name || '')
-watch(vmSettingsLocal, (newValue) => {
-  vmName.value = newValue?.name || ''
-})
-
-const virtualHardwareHardDisks = ref<UI_I_SendDataNewHardDisk[] | null>(null)
-const virtualHardwareCdDvdDrives = ref<UI_I_SendDataNewCdDvdDrive[] | null>(
-  null
-)
-const virtualHardwareNetworks = ref<UI_I_SendDataNewNetwork[] | null>(null)
-const onChangeBootOrder = (data: UI_T_ChangeBootOrder): void => {
-  virtualHardwareHardDisks.value = data[0]
-  virtualHardwareCdDvdDrives.value = data[1]
-  virtualHardwareNetworks.value = data[2]
-}
-
-const customizeHardware = ref<UI_I_SendDataCustomizeHardware | null>(null)
-const onChangeCustomizeHardware = (
-  data: UI_I_SendDataCustomizeHardware
-): void => {
-  customizeHardware.value = data
-}
-const virtualHardwareHardDisksLocal = computed<
-  UI_I_SendDataNewHardDisk[] | null
->(() => customizeHardware.value?.virtualHardware?.hardDisks || null)
-const virtualHardwareNetworksLocal = computed<UI_I_SendDataNewNetwork[] | null>(
-  () => customizeHardware.value?.virtualHardware?.networks || null
-)
-const virtualHardwareCdDvdDrivesLocal = computed<
-  UI_I_SendDataNewCdDvdDrive[] | null
->(() => customizeHardware.value?.virtualHardware?.cdDvdDrives || null)
-
-const virtualHardwareCpu = computed<UI_I_SendDataCpu | null>(
-  () => customizeHardware.value?.virtualHardware?.cpu || null
-)
-const virtualHardwareMemory = computed<UI_I_SendDataMemory | null>(
-  () => customizeHardware.value?.virtualHardware?.memory || null
+watch(
+  model,
+  (newValue) => {
+    console.log(newValue, 11111111111)
+  },
+  { deep: true }
 )
 
 const customizeHardwareSubmit = ref<null | Function>(null)
@@ -228,24 +183,11 @@ const validateSendData = async (): Promise<void> => {
   }
 
   loadingLocal.value = true
-  props
-    .validateSendDataFunc(
-      vmSettingsLocal.value,
-      virtualHardwareCpu.value,
-      virtualHardwareMemory.value,
-      customizeHardware.value,
-      virtualHardwareNetworks.value,
-      virtualHardwareHardDisks.value,
-      virtualHardwareCdDvdDrives.value,
-      vmName.value,
-      localization.value,
-      props.vmId
-    )
-    .then((data) => {
-      loadingLocal.value = false
-
-      !data && emits('update-vm')
-    })
+  props.validateSendDataFunc(model.value, props.vmId).then((data) => {
+    loadingLocal.value = false
+
+    !data && emits('update-vm')
+  })
 }
 </script>
 

package/components/common/vm/actions/editSettings/EditSettingsOld.vue

@@ -17,29 +17,19 @@
         />
         <div v-if="vmSettings" class="vm-context">
           <common-vm-actions-common-customize-hardware
-            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"
+            v-model="vmSettings"
             :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"
-            :selected-nav-item="selectedNavItem"
-            :hard-disks-for-edit="vmSettings.hardDisks"
+            :cd-dvd-drives="vmSettings.disk_devices.filter((disk) => disk.device_type === 'cdrom')"
+            :hard-disks="vmSettings.disk_devices.filter((disk) => disk.device_type !== 'cdrom')"
+            :max-memory="props.maxMemory"
+            :cpu-models="props.cpuModels"
+            :video-card="vmSettings.video_card"
+            :usb-controller="vmSettings.usb_controllers"
+            :pci-devices="vmSettings.passthrough_pci_devices"
+            :hard-disks-for-edit="vmSettings.disk_devices.filter((disk) => disk.device_type !== 'cdrom')"
             :options="vmSettings.options"
+            :selected-nav-item="props.selectedNavItem"
             :nodes="props.nodes"
             :files="props.files"
             :networks-table="props.networksTable"
@@ -60,8 +50,6 @@
             @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>
@@ -78,12 +66,6 @@ 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'
@@ -91,9 +73,7 @@ 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'
-
-const vmName = defineModel<string>('vmName', { required: true })
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 
 const vmSettings = defineModel<UI_I_VmSettings | null>('vmSettings', {
   required: true,
@@ -110,10 +90,9 @@ const props = withDefaults(
     networksTable: UI_I_NetworkTableItem[]
     selectedNavItem: UI_T_SelectedNavItem
     vmCpuHelpTextSecond: string
-    errorValidationFields: UI_I_ErrorValidationField<string>[]
-    virtualHardwareNetworks: UI_I_SendDataNewNetwork[] | null
-    virtualHardwareHardDisks: UI_I_SendDataNewHardDisk[] | null
-    virtualHardwareCdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null
+    errorValidationFields: UI_I_ErrorValidationField[]
+    maxMemory: number
+    cpuModels: UI_I_OptionItem[]
     state?: string | number
     vmNameOld?: string
     passthroughDevices?: UI_I_PciDevice[]
@@ -136,18 +115,12 @@ 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())