bfg-common 1.5.59 → 1.5.61

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

@@ -41,6 +41,7 @@
     :data-center="props.dataCenter"
     :compute-resource="props.computeResource"
     :compute-resource-tree="props.computeResourceTree"
+    :vmt-settings="props.vmtSettings"
     @check-name="onCheckName"
     @get-storage="emits('get-storage', $event)"
     @get-folders-or-files="emits('get-folders-or-files', $event)"
@@ -107,6 +108,7 @@
     :data-center="props.dataCenter"
     :compute-resource="props.computeResource"
     :compute-resource-tree="props.computeResourceTree"
+    :vmt-settings="props.vmtSettings"
     @check-name="onCheckName"
     @get-storage="emits('get-storage', $event)"
     @get-folders-or-files="emits('get-folders-or-files', $event)"
@@ -178,6 +180,7 @@ import type { UI_T_ChangeBootOrder } from '~/components/common/vm/actions/lib/mo
 import type {
   UI_I_MediatedDevice,
   UI_I_PciDevice,
+  UI_I_VmSettings,
 } from '~/lib/models/store/vm/interfaces'
 import { capabilities } from '~/components/common/vm/actions/common/lib/config/capabilities'
 import {
@@ -208,6 +211,7 @@ const props = defineProps<{
   vmNameInWizard: string
   templatesTree: UI_I_TreeNode[]
   capabilities?: UI_I_Capabilities
+  vmtSettings?: UI_I_VmSettings | null
   dataCenter?: UI_I_TreeNode // для сферы
   computeResource?: UI_I_TreeNode // для сферы
   computeResourceTree?: UI_I_TreeNode[] // для сферы
@@ -224,6 +228,7 @@ const emits = defineEmits<{
   (event: 'get-pci-devices'): void
   (event: 'get-pci-devices'): void
   (event: 'hide'): void
+  (event: 'select-template', value: string): void
   (
     event: 'get-compute-resource-tree',
     value: { id: string | number; cb: () => void }
@@ -344,11 +349,23 @@ const validationFunc = async (
       nextStep.id
     )
   ) {
-    const storageValidation = await checkCustomizeHardware(value)
+    const validation = await checkCustomizeHardware(value)
 
-    value = storageValidation.newValue
+    value = validation.newValue
 
-    stepHasError = stepHasError || storageValidation.stepHasError
+    stepHasError = stepHasError || validation.stepHasError
+  } else if (
+    wizard.isValidateForStep(
+      dynamicSteps.customizeHardwareTemplate,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
+    const validation = await checkCustomizeHardware(value, true)
+
+    value = validation.newValue
+
+    stepHasError = stepHasError || validation.stepHasError
   }
   wizard.setLoader(false)
 
@@ -485,7 +502,8 @@ const checkStorage = async (
   })
 }
 const checkCustomizeHardware = async (
-  value: UI_I_WizardStep[]
+  value: UI_I_WizardStep[],
+  forTemplate = false
 ): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
@@ -493,7 +511,9 @@ const checkCustomizeHardware = async (
     customizeHardwareSubmit.value = (isValid: boolean) => {
       if (!isValid) {
         stepHasError = wizard.setValidation(
-          dynamicSteps.customizeHardware,
+          forTemplate
+            ? dynamicSteps.customizeHardwareTemplate
+            : dynamicSteps.customizeHardware,
           'customizeHardware',
           {
             fieldMessage: 'aaa',
@@ -501,10 +521,17 @@ const checkCustomizeHardware = async (
           }
         )
       } else if (
-        wizard.hasMessage(dynamicSteps.customizeHardware, 'customizeHardware')
+        wizard.hasMessage(
+          forTemplate
+            ? dynamicSteps.customizeHardwareTemplate
+            : dynamicSteps.customizeHardware,
+          'customizeHardware'
+        )
       ) {
         value = wizard.removeValidation(
-          dynamicSteps.customizeHardware,
+          forTemplate
+            ? dynamicSteps.customizeHardwareTemplate
+            : dynamicSteps.customizeHardware,
           'customizeHardware',
           value
         )
@@ -699,8 +726,9 @@ const maxCpus = ref<number>(capabilities.maxCpus)
 const maxMemory = ref<number>(capabilities.maxMemory)
 
 const selectedTemplate = ref<string>('')
-const onChangeTemplate = (id: string): void => {
-  selectedTemplate.value = id
+const onChangeTemplate = (node: UI_I_TreeNode): void => {
+  selectedTemplate.value = node.id.toString()
+  emits('select-template', node.id.toString())
 }
 const selectedOptions = ref<string[]>([])
 const onChangeSelectOptions = (options: string[]) => {
@@ -717,11 +745,40 @@ const onChangeSelectOptions = (options: string[]) => {
   } else {
     wizard.changeScheme(2)
   }
+
+  isPowerOnByDefault.value = options.includes('power-on')
 }
 
 const onHideModal = (): void => {
   emits('hide')
 }
+
+watch(
+  () => props.vmtSettings,
+  (newValue) => {
+    if (newValue) {
+      vmForm.value.name = newValue.name
+      vmForm.value.compatibility =
+        newValue.compatibility || vmForm.value.compatibility
+      vmForm.value.storage = newValue.storage
+      if (customizeHardware.value?.virtualHardware) {
+        customizeHardware.value.virtualHardware.cdDvdDrives =
+          newValue.cdDvdDrives
+        customizeHardware.value.virtualHardware.hardDisks = newValue.hardDisks
+        customizeHardware.value.virtualHardware.networks = newValue.networks
+        customizeHardware.value.virtualHardware.cpu = newValue.cpu
+        customizeHardware.value.virtualHardware.memory = newValue.memory
+        customizeHardware.value.virtualHardware.videoCard = newValue.videoCard
+        customizeHardware.value.virtualHardware.usbController =
+          newValue.usbController
+        customizeHardware.value.virtualHardware.pciDevices = newValue.pciDevices
+        customizeHardware.value.vmOptions = newValue.options
+      }
+      maxCpus.value = newValue.cpu.max_vcpus
+      cpuModels.value = newValue.cpu.model
+    }
+  }
+)
 </script>
 
 <style scoped lang="scss"></style>

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

@@ -102,6 +102,7 @@
             :storage-submit="props.storageSubmit"
             :datastore="props.datastore"
             :get-datastore-table-func="props.getDatastoreTableFunc"
+            :storage="props.vmtSettings?.storage"
             @submit="emits('change-storage', $event)"
           />
         </template>
@@ -184,6 +185,57 @@
             @get-networks-table="emits('get-networks-table', $event)"
             @get-pci-devices="emits('get-pci-devices')"
           />
+        </template> </ui-wizard-block
+      ><ui-wizard-block
+        v-if="selectedStep.id === dynamicSteps.customizeHardwareTemplate && props.vmtSettings"
+      >
+        <template #content>
+          <common-vm-actions-common-customize-hardware
+            :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"
+            :cd-dvd-drives="props.vmtSettings.cdDvdDrives || []"
+            :hard-disks="props.vmtSettings.hardDisks || []"
+            :networks="props.vmtSettings.networks || []"
+            :customize-hardware-submit="props.customizeHardwareSubmit"
+            :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"
+            :networks-table="props.networksTable"
+            :error-validation-fields="props.errorValidationFields"
+            :get-datastore-table-func="props.getDatastoreTableFunc"
+            :datastore="props.datastore"
+            :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
+            :passthrough-devices="props.passthroughDevices"
+            :mediated-devices="props.mediatedDevices"
+            :compute-resource="vmForm.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)"
+            @show-datastore-child="emits('show-datastore-child', $event)"
+            @remove-error-by-title="emits('remove-error-by-title', $event)"
+            @get-networks-table="emits('get-networks-table', $event)"
+            @get-pci-devices="emits('get-pci-devices')"
+          />
         </template>
       </ui-wizard-block>
       <ui-wizard-block v-if="selectedStep.id === dynamicSteps.readyComplete">
@@ -237,13 +289,13 @@ import type {
 import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
 import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
 import type {
-  UI_T_AddVmFinishFunc,
+  // UI_T_AddVmFinishFunc,
   UI_T_SelectedNavItem,
 } 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_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
 import type {
-  UI_I_Capabilities,
+  // 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'
@@ -257,10 +309,11 @@ import type { UI_T_ChangeBootOrder } from '~/components/common/vm/actions/lib/mo
 import type {
   UI_I_MediatedDevice,
   UI_I_PciDevice,
+  UI_I_VmSettings,
 } from '~/lib/models/store/vm/interfaces'
+import type { UI_I_WizardTexts } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
 import { dynamicSteps } from '~/components/common/vm/actions/add/lib/config/steps'
 import Wizard from '~/components/atoms/wizard/lib/utils/utils'
-import type { UI_I_WizardTexts } from 'bfg-uikit/components/ui/wizard/lib/models/interfaces'
 
 const vmForm = defineModel<UI_I_VmForm>('vmForm', {
   required: true,
@@ -310,6 +363,7 @@ const props = defineProps<{
   dataCenter?: UI_I_TreeNode // для сферы
   computeResource?: UI_I_TreeNode // для сферы
   computeResourceTree?: UI_I_TreeNode[] // для сферы
+  vmtSettings?: UI_I_VmSettings | null // для шаблонов
 }>()
 
 const emits = defineEmits<{
@@ -323,7 +377,7 @@ const emits = defineEmits<{
   (event: 'get-pci-devices'): void
   (event: 'change-steps', value: UI_I_WizardStep[]): void
   (event: 'finish'): void
-  (event: 'change-template', value: string): void
+  (event: 'change-template', value: UI_I_TreeNode): void
   (event: 'change-name', value: [string, UI_I_TreeNode | null]): void
   (
     event: 'check-name',

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

@@ -64,6 +64,7 @@
             v-show="selectedStep.id === dynamicSteps.selectStorage"
             :storage-submit="props.storageSubmit"
             :datastore="props.datastore"
+            :storage="props.vmtSettings?.storage"
             :get-datastore-table-func="props.getDatastoreTableFunc"
             @submit="emits('change-storage', $event)"
           />
@@ -131,6 +132,56 @@
             @get-networks-table="emits('get-networks-table', $event)"
             @get-pci-devices="emits('get-pci-devices')"
           />
+          <common-vm-actions-common-customize-hardware
+            v-if="props.vmtSettings"
+            v-show="selectedStep.id === dynamicSteps.customizeHardwareTemplate"
+            :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"
+            :cd-dvd-drives="props.vmtSettings.cdDvdDrives || []"
+            :hard-disks="props.vmtSettings.hardDisks || []"
+            :networks="props.vmtSettings.networks || []"
+            :customize-hardware-submit="props.customizeHardwareSubmit"
+            :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"
+            :networks-table="props.networksTable"
+            :error-validation-fields="props.errorValidationFields"
+            :get-datastore-table-func="props.getDatastoreTableFunc"
+            :datastore="props.datastore"
+            :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
+            :passthrough-devices="props.passthroughDevices"
+            :mediated-devices="props.mediatedDevices"
+            :compute-resource="vmForm.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)"
+            @show-datastore-child="emits('show-datastore-child', $event)"
+            @remove-error-by-title="emits('remove-error-by-title', $event)"
+            @get-networks-table="emits('get-networks-table', $event)"
+            @get-pci-devices="emits('get-pci-devices')"
+          />
           <common-ready-to-complete
             v-if="selectedStep.id === dynamicSteps.readyComplete"
             :data="props.readyCompleteTableInfo"
@@ -179,13 +230,13 @@ import type {
 import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
 import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
 import type {
-  UI_T_AddVmFinishFunc,
+  // UI_T_AddVmFinishFunc,
   UI_T_SelectedNavItem,
 } 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_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
 import type {
-  UI_I_Capabilities,
+  // 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'
@@ -199,6 +250,7 @@ import type { UI_T_ChangeBootOrder } from '~/components/common/vm/actions/lib/mo
 import type {
   UI_I_MediatedDevice,
   UI_I_PciDevice,
+  UI_I_VmSettings,
 } from '~/lib/models/store/vm/interfaces'
 import { dynamicSteps } from '~/components/common/vm/actions/add/lib/config/steps'
 import Wizard from '~/components/atoms/wizard/lib/utils/utils'
@@ -251,6 +303,7 @@ const props = defineProps<{
   dataCenter?: UI_I_TreeNode // для сферы
   computeResource?: UI_I_TreeNode // для сферы
   computeResourceTree?: UI_I_TreeNode[] // для сферы
+  vmtSettings?: UI_I_VmSettings | null // для шаблонов
 }>()
 
 const emits = defineEmits<{
@@ -264,7 +317,7 @@ const emits = defineEmits<{
   (event: 'get-pci-devices'): void
   (event: 'change-steps', value: UI_I_WizardStep[]): void
   (event: 'finish'): void
-  (event: 'change-template', value: string): void
+  (event: 'change-template', value: UI_I_TreeNode): void
   (event: 'change-name', value: [string, UI_I_TreeNode | null]): void
   (
     event: 'check-name',

package/components/common/vm/actions/add/lib/config/steps.ts

@@ -14,7 +14,8 @@ export const dynamicSteps = {
   selectGuestOSMachineType: 8,
   selectGuestOS: 9,
   customizeHardware: 10,
-  readyComplete: 11,
+  customizeHardwareTemplate: 11,
+  readyComplete: 12,
 }
 
 export const stepsFunc = (
@@ -169,6 +170,21 @@ export const stepsFunc = (
         },
       },
     },
+    {
+      id: dynamicSteps.customizeHardwareTemplate,
+      stepName: '',
+      title: localization.common.customizeHardware,
+      subTitle: localization.common.configureVirtualMachineHardware,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'vm-select-customize-hardware',
+      fields: {
+        customizeHardware: {
+          field: '',
+          alert: '',
+        },
+      },
+    },
     {
       id: dynamicSteps.readyComplete,
       stepName: '',
@@ -230,7 +246,7 @@ export const stepsSchemeInitial = [
     dynamicSteps.selectName,
     dynamicSteps.selectStorage,
     dynamicSteps.selectOptions,
-    dynamicSteps.customizeHardware,
+    dynamicSteps.customizeHardwareTemplate,
     dynamicSteps.readyComplete,
   ],
   // Deploy from template with Customize the operating system and this virtual machine's hardware (Procurator)
@@ -241,7 +257,7 @@ export const stepsSchemeInitial = [
     dynamicSteps.selectStorage,
     dynamicSteps.selectOptions,
     dynamicSteps.selectGuestOSMachineType,
-    dynamicSteps.customizeHardware,
+    dynamicSteps.customizeHardwareTemplate,
     dynamicSteps.readyComplete,
   ],
 ]

package/components/common/vm/actions/clone/toTemplate/ToTemplate.vue

@@ -11,8 +11,8 @@
       @submit="onFinish"
     >
       <template #modalBody="{ selectedStep }">
-        <atoms-loader v-show="!vmSettings" id="loader" />
-        <div v-if="vmSettings" class="vm-context">
+        <atoms-loader v-show="!vmSettingsLocal" id="loader" />
+        <div v-if="vmSettingsLocal" class="vm-context">
           <common-pages-scheduled-tasks-modals-common-new-task-form
             v-show="selectedStep.id === dynamicSteps.scheduledTasks"
             v-model="newTaskForm"
@@ -31,35 +31,35 @@
             v-show="selectedStep.id === dynamicSteps.selectStorage"
             :storage-submit="storageSubmit"
             :datastore="props.datastore"
-            :storage="vmSettings.storage"
+            :storage="vmSettingsLocal.storage"
             :get-datastore-table-func="props.getDatastoreTableFunc"
             @submit="onChangeStorage"
           />
           <common-vm-actions-common-customize-hardware
             v-show="selectedStep.id === dynamicSteps.customizeHardware"
             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"
-            :storage="vmSettings.storage"
+            v-model:guest-machine-type="vmSettingsLocal.guestMachineType"
+            v-model:guest-os-family="vmSettingsLocal.guestOsFamily"
+            v-model:guest-os-version="vmSettingsLocal.guestOsVersion"
+            :storage="vmSettingsLocal.storage"
             :hard-disks-for-boot-options="virtualHardwareHardDisksLocal"
             :cd-dvd-drives-for-boot-options="virtualHardwareCdDvdDrivesLocal"
             :networks-for-boot-options="virtualHardwareNetworksLocal"
-            :cd-dvd-drives="vmSettings.cdDvdDrives"
-            :hard-disks="vmSettings.hardDisks"
-            :networks="vmSettings.networks"
+            :cd-dvd-drives="vmSettingsLocal.cdDvdDrives"
+            :hard-disks="vmSettingsLocal.hardDisks"
+            :networks="vmSettingsLocal.networks"
             :customize-hardware-submit="customizeHardwareSubmit"
-            :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"
+            :max-cpus="vmSettingsLocal.maxCpus"
+            :max-memory="vmSettingsLocal.maxMemory"
+            :cpu-models="vmSettingsLocal.cpuModels"
+            :cpu="vmSettingsLocal.cpu"
+            :memory="vmSettingsLocal.memory"
+            :video-card="vmSettingsLocal.videoCard"
+            :usb-controller="vmSettingsLocal.usbController"
+            :pci-devices="vmSettingsLocal.pciDevices"
             :selected-nav-item="selectedNavItem"
-            :hard-disks-for-edit="vmSettings.hardDisks"
-            :options="vmSettings.options"
+            :hard-disks-for-edit="vmSettingsLocal.hardDisks"
+            :options="vmSettingsLocal.options"
             :nodes="props.nodes"
             :files="props.files"
             :networks-table="props.networksTable"
@@ -120,7 +120,7 @@ import type {
 } from '~/lib/models/store/vm/interfaces'
 import type {
   I_DynamicSteps,
-  UI_I_VmForm,
+  // UI_I_VmForm,
 } from '~/components/common/vm/actions/clone/toTemplate/lib/models/interfaces'
 import type {
   UI_I_ValidationReturn,
@@ -396,23 +396,15 @@ const checkCustomizeHardware = async (
 }
 
 const storageIdCash = ref<string | null>(null)
-const vmForm = ref<UI_I_VmForm>({
-  name: '',
-  storage: null,
-  options: [],
-})
 const onChangeName = (name: string): void => {
-  vmForm.value.name = name
+  vmSettingsLocal.value && (vmSettingsLocal.value.name = name)
 }
 const onChangeStorage = (storage: UI_I_DatastoreTableItem | null): void => {
   if (!storage) return
 
-  vmForm.value.storage = storage
+  vmSettingsLocal.value && (vmSettingsLocal.value.storage = storage)
   storageIdCash.value = storage.id
 }
-const onChangeSelectOptions = (options: string[]): void => {
-  vmForm.value.options = options
-}
 const customizeHardware = ref<UI_I_SendDataCustomizeHardware | null>(null)
 const onChangeCustomizeHardware = (
   data: UI_I_SendDataCustomizeHardware
@@ -452,7 +444,7 @@ const isPowerOnByDefault = ref<boolean>(true)
 watch(
   () => props.vmNameInWizard,
   (newValue) => {
-    vmForm.value.name = newValue
+    vmSettingsLocal.value && (vmSettingsLocal.value.name = newValue)
   }
 )
 
@@ -463,7 +455,7 @@ const validateSendData = async (
   let stepHasError = false
 
   const data = await props.validateSendDataFunc(
-    vmForm.value,
+    vmSettingsLocal.value,
     virtualHardwareCpu.value,
     virtualHardwareMemory.value,
     customizeHardware.value,
@@ -489,7 +481,7 @@ const onFinish = (): void => {
   wizard.setLoader(false)
   props
     .finishFunc(
-      vmForm.value,
+      vmSettingsLocal.value,
       virtualHardwareCpu.value,
       virtualHardwareMemory.value,
       customizeHardware.value,
@@ -515,9 +507,9 @@ const storageSubmit = ref<null | Function>(null)
 const selectOptionsSubmit = ref<number>(0)
 const customizeHardwareSubmit = ref<null | Function>(null)
 
-const vmSettings = computed<UI_I_VmSettings | null>(() => props.vmSettings)
-const vmName = ref<string>(vmSettings.value?.name || '')
-watch(vmSettings, (newValue) => {
+const vmSettingsLocal = computed<UI_I_VmSettings | null>(() => props.vmSettings)
+const vmName = ref<string>(vmSettingsLocal.value?.name || '')
+watch(vmSettingsLocal, (newValue) => {
   vmName.value = newValue?.name || ''
 })
 

package/components/common/vm/actions/common/select/template/Template.vue

@@ -26,7 +26,7 @@ const props = defineProps<{
   templatesTree: UI_I_TreeNode[]
 }>()
 const emits = defineEmits<{
-  (event: 'submit', value: UI_I_TreeNode | null): void
+  (event: 'submit', value: UI_I_TreeNode): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -44,8 +44,7 @@ watch(
 )
 
 const submit = async (cb: Function): Promise<void> => {
-  if (!selectedNode.value || selectedNode.value.type !== 'vm') {
-    // TODO change vm to vmTemplate
+  if (!selectedNode.value || selectedNode.value.type !== 'vmt') {
     errors.value = [localization.value.vmWizard.selectValidTemplate]
     cb(false)
     return

package/components/common/vm/actions/common/select/template/TemplateTreeView.vue

@@ -34,7 +34,7 @@ watch(
   (newValue) => {
     nodes.value = useDeepCopy(newValue)
   },
-  { deep: true, once: true }
+  { deep: true }
 )
 
 const loading = ref<boolean>(false)

package/package.json

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