bfg-common 1.5.38 → 1.5.39

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

@@ -81,11 +81,13 @@
               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"
             :families-options="guestOsFamilies"
             :versions-options="guestOsVersions"
             :machine-types-options="machineTypes"
             :error-validation-fields="props.errorValidationFields"
-            @change="onChangeOs"
             @remove-error-by-title="emits('remove-error-by-title', $event)"
           />
           <common-vm-actions-common-customize-hardware
@@ -594,11 +596,6 @@ const onChangeCompatibility = (compatibility: UI_I_OptionItem): void => {
   const version = compatibility.value.split('-')[1]
   compatibilityInfo.value = `${localization.value.common.compatibility}: ${compatibility.text} (${localization.value.common.vmVersion} ${version})`
 }
-const onChangeOs = (data: UI_I_OsChange): void => {
-  vmForm.value.guestMachineType = data.selectedMachineType
-  vmForm.value.guestOsFamily = data.selectedOS
-  vmForm.value.guestOsVersion = data.selectedVersion
-}
 const customizeHardware = ref<UI_I_SendDataCustomizeHardware | null>(null)
 const onChangeCustomizeHardware = (
   data: UI_I_SendDataCustomizeHardware

package/components/common/vm/actions/clone/Clone.vue

@@ -39,6 +39,17 @@
             v-show="selectedStep.id === dynamicSteps.selectOptions"
             @change="onChangeSelectOptions"
           />
+          <common-vm-actions-common-select-os
+            v-show="selectedStep.id === dynamicSteps.selectGuestOSMachineType"
+            v-model:machine-type="guestMachineType"
+            v-model:guest-os-family="guestOsFamily"
+            v-model:guest-os-version="guestOsVersion"
+            :families-options="guestOsFamilies"
+            :versions-options="guestOsVersions"
+            :machine-types-options="machineTypes"
+            :error-validation-fields="props.errorValidationFields"
+            @remove-error-by-title="emits('remove-error-by-title', $event)"
+          />
           <common-vm-actions-common-customize-hardware
             v-show="selectedStep.id === dynamicSteps.customizeHardware"
             v-model:vm-name="vmName"
@@ -103,7 +114,10 @@ import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interface
 import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
 import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
 import type { UI_I_FileTreeNode } from '~/components/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_ArbitraryObject,
+  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_ErrorValidationField } from '~/lib/models/store/interfaces'
 import type {
@@ -132,6 +146,7 @@ import type {
 } from '~/components/atoms/wizard/lib/models/interfaces'
 import type { UI_I_Capabilities } from '~/components/common/vm/actions/common/lib/models/interfaces'
 import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import {
   stepsSchemeInitial,
   stepsFunc,
@@ -140,6 +155,7 @@ import {
 import Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import { mapCapabilities } from '~/components/common/vm/actions/common/lib/utils/capabilities'
 import { scheduledTaskDefaultFormFunc } from '~/components/common/pages/scheduledTasks/modals/lib/config/createScheduledTask'
+import { capabilities } from '~/components/common/vm/actions/common/lib/config/capabilities'
 
 const props = defineProps<{
   project: UI_T_Project
@@ -199,7 +215,9 @@ const title = computed<string>(() => {
 watch(
   () => props.capabilities,
   () => {
-    if (props.capabilities) mapCapabilities(props.capabilities)
+    if (props.capabilities) {
+      mapCapabilities(props.capabilities)
+    }
   },
   { deep: true, immediate: true }
 )
@@ -518,8 +536,23 @@ const customizeHardwareSubmit = ref<null | Function>(null)
 
 const vmSettings = computed<UI_I_VmSettings | null>(() => props.vmSettings)
 const vmName = ref<string>(vmSettings.value?.name || '')
+
+const guestMachineType = ref<UI_I_OptionItem | null>(null)
+const guestOsFamily = ref<UI_I_OptionItem | null>(null)
+const guestOsVersion = ref<UI_I_OptionItem | null>(null)
+
+const guestOsFamilies = ref<UI_I_OptionItem[]>(capabilities.guestOsFamilies)
+const guestOsVersions = ref<UI_I_ArbitraryObject<UI_I_OptionItem[]>>(
+  capabilities.guestOsVersions
+)
+const machineTypes = ref<UI_I_OptionItem[]>(capabilities.machineTypes)
+
 watch(vmSettings, (newValue) => {
   vmName.value = newValue?.name || ''
+
+  if (newValue?.guestOsFamily) guestOsFamily.value = newValue.guestOsFamily
+  if (newValue?.guestMachineType) guestMachineType.value = newValue.guestMachineType
+  if (newValue?.guestOsVersion) guestOsVersion.value = newValue.guestOsVersion
 })
 
 const onHideModal = (): void => {

package/components/common/vm/actions/common/select/os/os.vue

@@ -16,7 +16,7 @@
         <template #elem>
           <select
             id="vm-wizard-machine-type-select"
-            v-model="selectedMachineType"
+            v-model="machineType"
             data-id="vm-wizard-machine-type-select"
             class="table-cell"
           >
@@ -45,7 +45,7 @@
         <template #elem>
           <select
             id="vm-wizard-os-select"
-            v-model="selectedOS"
+            v-model="guestOsFamily"
             data-id="vm-wizard-os-select"
             class="table-cell"
             @change="onChangeOS"
@@ -71,7 +71,7 @@
         <template #elem>
           <select
             id="vm-wizard-os-version-select"
-            v-model="selectedVersion"
+            v-model="guestOsVersion"
             data-id="vm-wizard-os-version-select"
             class="table-cell"
           >
@@ -99,6 +99,10 @@ import type {
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 
+const machineType = defineModel<UI_I_OptionItem | null>('machine-type', {required: true})
+const guestOsFamily = defineModel<UI_I_OptionItem | null>('guest-os-family', {required: true})
+const guestOsVersion = defineModel<UI_I_OptionItem | null>('guest-os-version', {required: true})
+
 const props = defineProps<{
   familiesOptions: UI_I_OptionItem[]
   machineTypesOptions: UI_I_OptionItem[]
@@ -106,70 +110,52 @@ const props = defineProps<{
   errorValidationFields: UI_I_ErrorValidationField[]
 }>()
 const emits = defineEmits<{
-  (event: 'change', value: UI_I_OsChange): void
   (event: 'remove-error-by-title', value: string): void
 }>()
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const machineTypeOptions = ref<UI_I_OptionItem[]>(props.machineTypesOptions)
-const selectedMachineType = ref<UI_I_OptionItem | null>(null)
 watch(
   () => props.machineTypesOptions,
   (newValue) => {
     machineTypeOptions.value = [...newValue]
+    if (machineType.value) return
+
     const q35MachineIndex = newValue.findIndex(item => item.value.toLowerCase().includes('q35'))
     if (q35MachineIndex === -1) {
-      selectedMachineType.value = newValue[0]
+      machineType.value = newValue[0]
     } else {
-      selectedMachineType.value = newValue[q35MachineIndex]
+      machineType.value = newValue[q35MachineIndex]
     }
   },
   { immediate: true }
 )
 
 const osOptions = ref<UI_I_OptionItem[]>(props.familiesOptions)
-const selectedOS = ref<UI_I_OptionItem | null>(null)
 watch(
   () => props.familiesOptions,
   (newValue) => {
     osOptions.value = [...newValue]
-    selectedOS.value = newValue[0]
+    if (guestOsFamily.value) return
+    guestOsFamily.value = newValue[0]
   },
   { immediate: true }
 )
 const onChangeOS = (): void => {
-  selectedVersion.value = versionsOptions.value[0]
+  guestOsVersion.value = versionsOptions.value[0]
 }
 
 const versionsOptions = computed<UI_I_OptionItem[]>(() => {
-  if (!selectedOS.value) return []
+  if (!guestOsFamily.value) return []
 
-  return props.versionsOptions[selectedOS.value.value] || []
+  return props.versionsOptions[guestOsFamily.value.value] || []
 })
-const selectedVersion = ref<UI_I_OptionItem | null>(null)
 watch(
   versionsOptions,
   () => {
-    selectedVersion.value = versionsOptions.value[0]
-  },
-  { immediate: true }
-)
+    if (guestOsVersion.value) return
 
-const windowsVirtualization = ref<boolean>(false)
-
-// const isShowHelp = ref<boolean>(false)
-
-watch(
-  [selectedMachineType, selectedOS, selectedVersion, windowsVirtualization],
-  () => {
-    if (!selectedOS.value) return
-
-    emits('change', {
-      selectedMachineType: selectedMachineType.value,
-      selectedOS: selectedOS.value,
-      selectedVersion: selectedVersion.value,
-      windowsVirtualization: windowsVirtualization.value,
-    })
+    guestOsVersion.value = versionsOptions.value[0]
   },
   { immediate: true }
 )

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.38",
+  "version": "1.5.39",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",