bfg-common 1.5.580 → 1.5.581

package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/keymap/{Old.vue → KeymapOld.vue}

@@ -1,8 +1,8 @@
 <template>
   <div class="">
     <atoms-stack-block
-      :has-children="false"
-      test-id="remote-console-keymap-stack-block"
+        :has-children="false"
+        test-id="remote-console-keymap-stack-block"
     >
       <template #stackBlockKey>
         {{ localization.common.keymap }}
@@ -11,9 +11,9 @@
         <div class="select">
           <select
             id="keymap-select"
-            v-model="model"
+            v-model="keymap"
             :disabled="props.disabled"
-            :data-value="model"
+            :data-value="keymap"
             data-id="keymap-select"
           >
             <option
@@ -34,7 +34,7 @@
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 
-const model = defineModel<string>({ required: true })
+const keymap = defineModel<string>('keymap', { required: true })
 
 const props = defineProps<{
   disabled: boolean

package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/password/Password.vue

@@ -26,7 +26,7 @@ import type { UI_I_DefaultForm } from '~/components/common/vm/actions/common/cus
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import { generatePassword } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/password/lib/utils'
 
-const model = defineModel<string>({ required: true })
+const password = defineModel<string>('password', { required: true })
 
 const props = defineProps<{
   disabled: boolean
@@ -43,7 +43,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const validation = $validation.call({})
 const defaultForm: UI_I_DefaultForm = {
   password: {
-    value: model.value,
+    value: password.value,
     validations: [
       {
         value: 'password',
@@ -61,6 +61,7 @@ setForm()
 
 const showValidationErrors = (): void => {
   const valid = validation.touch()
+  console.log(valid, 111)
   passwordErrorText.value = !valid.isValid ? valid.errors.password[0] : ''
   emits('valid', valid.isValid)
 }
@@ -76,24 +77,24 @@ const setPasswordDisable = (): void => {
 
   removeValidationErrors()
   setForm()
-  model.value = ''
+  password.value = ''
 }
 
 const passwordErrorText = ref<string>('')
 
 const changePassword = (value: string): void => {
-  model.value = value
+  password.value = value
 
   showValidationErrors()
 }
 
-const isEnabledPassword = ref<boolean>(!!model.value)
+const isEnabledPassword = ref<boolean>(!!password.value)
 
 const onGeneratePassword = (): void => {
   const generatedPassword = generatePassword()
 
   form.value.password.value = generatedPassword
-  model.value = generatedPassword
+  password.value = generatedPassword
 
   showValidationErrors()
 }

package/components/common/vm/actions/common/customizeHardware/vmoptions/tools/Tools.vue

@@ -1,37 +1,55 @@
 <template>
   <common-vm-actions-common-customize-hardware-vmoptions-tools-new
     v-if="isNewView"
-    v-model:balloon="model.balloon"
+    v-model:balloon="balloonLocal"
     :disabled="isDisabled"
   />
   <common-vm-actions-common-customize-hardware-vmoptions-tools-old
     v-else
-    v-model:balloon="model.balloon"
+    v-model:balloon="balloonLocal"
     :disabled="isDisabled"
   />
 </template>
 
 <script setup lang="ts">
-import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
-
-const model = defineModel<UI_I_CreateVmData['options']['guest_tools']>({
-  required: true,
-})
+import type { UI_I_SendDataTools } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/lib/models/interfaces'
 
 const props = withDefaults(
   defineProps<{
+    tools: boolean
+    balloon: boolean
     isEdit: boolean
     state?: string | number
   }>(),
   {
+    tools: true,
+    balloon: false,
     state: undefined,
   }
 )
+const emits = defineEmits<{
+  (event: 'send-data', value: UI_I_SendDataTools): void
+}>()
 
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+const toolsLocal = ref<boolean>(props.tools)
+const balloonLocal = ref<boolean>(props.balloon)
 
 const isDisabled = computed<boolean>(() => props.isEdit && props.state !== 1)
+
+watch(
+  balloonLocal,
+  () => {
+    emits('send-data', {
+      enabled: toolsLocal.value,
+      synchronized_time: toolsLocal.value,
+      balloon: balloonLocal.value,
+    })
+  },
+  { immediate: true }
+)
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 </script>
 
 <style scoped lang="scss">

package/components/common/vm/actions/common/lib/models/interfaces.ts

@@ -5,13 +5,7 @@ import type {
   UI_I_SendDataNewPciDevice,
   UI_I_SendDataVideoCard,
 } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
-import type {
-  UI_I_SendDataBootOptions,
-  UI_I_SendDataRemoteConsoleOptions,
-  UI_I_SendDataRemoteConsoleOptionsSpice,
-  UI_I_SendDataTools,
-  UI_I_SendDataVmoptions,
-} from '~/components/common/vm/actions/common/customizeHardware/vmoptions/lib/models/interfaces'
+import type { UI_I_SendDataVmoptions } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/lib/models/interfaces'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 import type { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
 
@@ -53,6 +47,25 @@ export interface UI_I_ErrorMessage {
   descriptions: string[]
 }
 
+interface UI_I_CreateVmDataStorage {
+  id: string
+}
+interface UI_I_CreateVmDataCpu {
+  vcpus: number
+  max_vcpus: number
+  core_per_socket: number
+  model: string
+  reservation_mhz: number
+  limit_mhz: number
+  shares: number
+  hotplug: boolean
+}
+interface UI_I_CreateVmDataMemory {
+  size_mb: number
+  hotplug: boolean
+  reservation_mb: number
+  limit_mb: number
+}
 export interface UI_I_CreateVmDataUsbController {
   type: string
 }
@@ -135,56 +148,10 @@ export interface UI_I_CreateVmData {
   )[]
   network_devices: UI_I_SendDataNewNetwork[]
   passthrough_pci_devices: UI_I_SendDataNewPciDevice[]
-  usb_controllers: {
-    type: string
-  }[]
+  options: UI_I_SendDataVmoptions
+  storage: UI_I_CreateVmDataStorage
+  cpu: UI_I_CreateVmDataCpu
+  memory: UI_I_CreateVmDataMemory
+  usb_controllers: UI_I_CreateVmDataUsbController[]
   input_devices: UI_I_CreateVmDataInputDevices[]
-  cpu: {
-    vcpus: number
-    max_vcpus: number
-    core_per_socket: number
-    model: string
-    reservation_mhz: number
-    limit_mhz: number
-    shares: number
-    hotplug: boolean
-  }
-  memory: {
-    size_mb: number
-    hotplug: boolean
-    reservation_mb: number
-    limit_mb: number
-  }
-  storage: {
-    id: string
-  } | null
-  options: {
-    remote_console: {
-      type: string
-      port: number
-      keymap: string
-      password: string
-      guest_os_lock: boolean
-      limit_sessions: number
-      spice: {
-        img_compression: string
-        jpeg_compression: string
-        zlib_glz_compression: string
-        streaming_mode: string
-        playback_compression: boolean
-        file_transfer: boolean
-        clipboard: boolean
-      }
-    }
-    guest_tools: {
-      enabled: boolean
-      synchronized_time: boolean
-      balloon: boolean
-    }
-    boot_options: {
-      firmware: string
-      boot_delay_ms: number
-      boot_menu: boolean
-    }
-  }
 }

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

@@ -1,7 +1,8 @@
 <template>
   <common-vm-actions-edit-settings-new
     v-if="isNewView"
-    v-model:vm-settings="model"
+    v-model:vm-name="vmName"
+    v-model:vm-settings="vmSettingsLocal"
     :nodes="props.nodes"
     :files="props.files"
     :project="props.project"
@@ -12,27 +13,32 @@
     :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="vmNameOld"
+    :vm-name-old="props.vmSettings?.name"
     :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-settings="model"
+    v-model:vm-name="vmName"
+    v-model:vm-settings="vmSettingsLocal"
     :nodes="props.nodes"
     :files="props.files"
     :project="props.project"
@@ -43,23 +49,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="vmNameOld"
+    :vm-name-old="props.vmSettings?.name"
     :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>
 
@@ -70,7 +80,17 @@ 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'
@@ -78,25 +98,20 @@ 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,
-  UI_I_CreateVmData,
-} from '~/components/common/vm/actions/common/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_Capabilities } from '~/components/common/vm/actions/common/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[]
+    errorValidationFields: UI_I_ErrorValidationField<string>[]
     vmCpuHelpTextSecond: string
     vmId: string
     datastore: UI_I_DatastoreTableItem[]
@@ -133,7 +148,7 @@ const emits = defineEmits<{
 const { $store }: any = useNuxtApp()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
-const vmNameOld = computed<string>(() => model.value?.name || '')
+const localization = computed<UI_I_Localization>(() => useLocal())
 
 watch(
   () => props.capabilities,
@@ -143,9 +158,6 @@ 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)
@@ -157,12 +169,45 @@ watch(
   { immediate: true }
 )
 
-watch(
-  model,
-  (newValue) => {
-    console.log(newValue, 11111111111)
-  },
-  { deep: 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
 )
 
 const customizeHardwareSubmit = ref<null | Function>(null)
@@ -183,11 +228,24 @@ const validateSendData = async (): Promise<void> => {
   }
 
   loadingLocal.value = true
-  props.validateSendDataFunc(model.value, props.vmId).then((data) => {
-    loadingLocal.value = false
-
-    !data && emits('update-vm')
-  })
+  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')
+    })
 }
 </script>
 

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

@@ -17,19 +17,29 @@
         />
         <div v-if="vmSettings" class="vm-context">
           <common-vm-actions-common-customize-hardware
-            v-model="vmSettings"
+            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"
             :project="props.project"
             :storage="vmSettings.storage"
-            :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')"
+            :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"
             :options="vmSettings.options"
-            :selected-nav-item="props.selectedNavItem"
             :nodes="props.nodes"
             :files="props.files"
             :networks-table="props.networksTable"
@@ -50,6 +60,8 @@
             @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>
@@ -66,6 +78,12 @@ 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'
@@ -73,7 +91,9 @@ import type {
   UI_I_DatastoreTableItem,
   UI_I_FolderOrFileTreePayload,
 } from '~/lib/models/store/storage/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'
+
+const vmName = defineModel<string>('vmName', { required: true })
 
 const vmSettings = defineModel<UI_I_VmSettings | null>('vmSettings', {
   required: true,
@@ -90,9 +110,10 @@ const props = withDefaults(
     networksTable: UI_I_NetworkTableItem[]
     selectedNavItem: UI_T_SelectedNavItem
     vmCpuHelpTextSecond: string
-    errorValidationFields: UI_I_ErrorValidationField[]
-    maxMemory: number
-    cpuModels: UI_I_OptionItem[]
+    errorValidationFields: UI_I_ErrorValidationField<string>[]
+    virtualHardwareNetworks: UI_I_SendDataNewNetwork[] | null
+    virtualHardwareHardDisks: UI_I_SendDataNewHardDisk[] | null
+    virtualHardwareCdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null
     state?: string | number
     vmNameOld?: string
     passthroughDevices?: UI_I_PciDevice[]
@@ -115,12 +136,18 @@ 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())