bfg-common 1.3.29 → 1.3.31

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

@@ -14,73 +14,76 @@
       @submit="onFinish"
     >
       <template #modalBody="{ selectedStep }">
-        <common-vm-actions-common-select-name
-          v-show="selectedStep.id === 0"
-          :name-form-submit="nameFormSubmit"
-          :project="props.project"
-          @submit="onChangeName(...$event)"
-          @check-name="emits('check-name', $event)"
-        />
-        <common-vm-actions-common-select-storage
-          v-show="selectedStep.id === 1"
-          :storage-submit="storageSubmit"
-          :datastore="props.datastore"
-          :storage="vmSettings.storage"
-          :get-datastore-table-func="props.getDatastoreTableFunc"
-          @submit="onChangeStorage"
-        />
-        <common-vm-actions-clone-select-options
-          v-show="selectedStep.id === 2"
-          :select-options-submit="selectOptionsSubmit"
-          @submit="onChangeSelectOptions"
-        />
-        <common-vm-actions-common-customize-hardware-old
-          v-show="selectedStep.id === 3"
-          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"
-          :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"
-          :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"
-          :selected-nav-item="selectedNavItem"
-          :hard-disks-for-edit="vmSettings.hardDisks"
-          :options="vmSettings.options"
-          :nodes="props.nodes"
-          :files="props.files"
-          :networks-table="props.networksTable"
-          :error-validation-fields="props.errorValidationFields"
-          :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
-          :passthrough-devices="props.passthroughDevices"
-          :get-datastore-table-func="props.getDatastoreTableFunc"
-          :datastore="props.datastore"
-          is-clone
-          @change-boot-order="onChangeBootOrder"
-          @send-data="onChangeCustomizeHardware"
-          @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)"
-          @get-networks-table="emits('get-networks-table', $event)"
-          @get-pci-devices="emits('get-pci-devices')"
-        />
-        <common-vm-actions-common-ready-to-complete
-          v-show="selectedStep.id === 4"
-          :ready-complete-table-info="props.readyCompleteTableInfo"
-        />
+        <atoms-loader v-show="!vmSettings" id="loader" />
+        <div v-if="vmSettings" class="vm-context">
+          <common-vm-actions-common-select-name
+            v-show="selectedStep.id === 0"
+            :name-form-submit="nameFormSubmit"
+            :project="props.project"
+            @submit="onChangeName(...$event)"
+            @check-name="emits('check-name', $event)"
+          />
+          <common-vm-actions-common-select-storage
+            v-show="selectedStep.id === 1"
+            :storage-submit="storageSubmit"
+            :datastore="props.datastore"
+            :storage="vmSettings.storage"
+            :get-datastore-table-func="props.getDatastoreTableFunc"
+            @submit="onChangeStorage"
+          />
+          <common-vm-actions-clone-select-options
+            v-show="selectedStep.id === 2"
+            :select-options-submit="selectOptionsSubmit"
+            @submit="onChangeSelectOptions"
+          />
+          <common-vm-actions-common-customize-hardware
+            v-show="selectedStep.id === 3"
+            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"
+            :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"
+            :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"
+            :selected-nav-item="selectedNavItem"
+            :hard-disks-for-edit="vmSettings.hardDisks"
+            :options="vmSettings.options"
+            :nodes="props.nodes"
+            :files="props.files"
+            :networks-table="props.networksTable"
+            :error-validation-fields="props.errorValidationFields"
+            :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
+            :passthrough-devices="props.passthroughDevices"
+            :get-datastore-table-func="props.getDatastoreTableFunc"
+            :datastore="props.datastore"
+            is-clone
+            @change-boot-order="onChangeBootOrder"
+            @send-data="onChangeCustomizeHardware"
+            @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)"
+            @get-networks-table="emits('get-networks-table', $event)"
+            @get-pci-devices="emits('get-pci-devices')"
+          />
+          <common-vm-actions-common-ready-to-complete
+            v-show="selectedStep.id === 4"
+            :ready-complete-table-info="props.readyCompleteTableInfo"
+          />
+        </div>
       </template>
     </atoms-wizard>
   </div>
@@ -108,10 +111,6 @@ import type {
   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_OptionItem,
-  UI_I_VerticalStepItem,
-} from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
 import type { UI_I_ConfigurePciDevicesTable } from '~/lib/models/store/host/interfaces'
 import type { UI_T_ChangeBootOrder } from '~/components/common/vm/actions/lib/models/types'
@@ -122,7 +121,6 @@ import {
   UI_I_ValidationReturn,
   UI_I_WizardStep,
 } from '~/components/atoms/wizard/lib/models/interfaces'
-import { capabilities } from '~/components/common/vm/actions/common/lib/config/capabilities'
 import {
   stepsSchemeInitial,
   stepsFunc,
@@ -166,7 +164,7 @@ const wizard: Wizard = new Wizard(
 )
 const wasCompleted = computed<boolean>(() => wizard.wasCompleted())
 const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
-const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
+// const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
 
 const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> => {
   wizard.changeSteps(value, validationFunc, validateSendData)
@@ -412,221 +410,6 @@ watch(vmSettings, (newValue) => {
 const onHideModal = (): void => {
   emits('hide')
 }
-
-// const storageIdCash = ref<string | null>(null)
-// const vmForm = ref<UI_I_VmForm>({
-//   name: '',
-//   storage: null,
-//   options: [],
-// })
-//
-// const isPowerOnByDefault = ref<boolean>(true)
-//
-// const onChangeNameAndNext = (name: string): void => {
-//   checkLocalChangeAndChangeStepStatus()
-//
-//   vmForm.value.name = name
-//   onNext(true)
-// }
-//
-// const onChangeStorageAndNext = (
-//   storage: UI_I_DatastoreTableItem | null
-// ): void => {
-//   if (!storage) return
-//
-//   const hasChanges = storage.id !== storageIdCash.value
-//   if (hasChanges) checkLocalChangeAndChangeStepStatus()
-//
-//   vmForm.value.storage = storage
-//   storageIdCash.value = storage.id
-//
-//   onNext(true)
-// }
-//
-// const onChangeSelectOptionsAndNext = (options: string[]): void => {
-//   vmForm.value.options = options
-//
-//   onNext(true)
-// }
-//
-// 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 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]
-// }
-//
-// watch(
-//   () => props.vmNameInWizard,
-//   (newValue) => {
-//     vmForm.value.name = newValue
-//   }
-// )
-//
-// const loading = ref<boolean>(false)
-// const validateSendData = (): void => {
-//   loading.value = true
-//   props
-//     .validateSendDataFunc(
-//       vmForm.value,
-//       virtualHardwareCpu.value,
-//       virtualHardwareMemory.value,
-//       customizeHardware.value,
-//       virtualHardwareNetworks.value,
-//       virtualHardwareHardDisks.value,
-//       virtualHardwareCdDvdDrives.value,
-//       isPowerOnByDefault.value,
-//       localization.value
-//     )
-//     .then((data) => {
-//       loading.value = false
-//       if (!data) return
-//
-//       selectedNavItem.value = data[0]
-//       data[1] !== null && (stepPosition.value = data[1])
-//     })
-// }
-// const onFinish = (): void => {
-//   loading.value = true
-//   props
-//     .finishFunc(
-//       vmForm.value,
-//       virtualHardwareCpu.value,
-//       virtualHardwareMemory.value,
-//       customizeHardware.value,
-//       virtualHardwareNetworks.value,
-//       virtualHardwareHardDisks.value,
-//       virtualHardwareCdDvdDrives.value,
-//       isPowerOnByDefault.value,
-//       localization.value
-//     )
-//     .then(() => {
-//       onHideModal()
-//       loading.value = false
-//     })
-// }
-//
-// const selectedNavItem = ref<UI_T_SelectedNavItem>(0)
-//
-// const nameFormSubmit = ref<number>(0)
-// const storageSubmit = ref<number>(0)
-// const customizeHardwareSubmit = ref<number>(0)
-//
-// const onNext = (force = false): void => {
-//   const isValid = checkSubmit(force)
-//   if (!isValid) {
-//     return
-//   }
-//
-//   const isDisabled = stepItems.value[cashStep]?.disabled
-//   if (cashStep !== -1 && !isDisabled) {
-//     stepPosition.value = cashStep
-//     cashStep = -1
-//     return
-//   }
-//
-//   stepItems.value[stepPosition.value].complete = true
-//   stepItems.value[stepPosition.value + 1].disabled = false
-//   stepPosition.value++
-// }
-// const checkLocalChangeAndChangeStepStatus = (): void => {
-//   stepItems.value = stepItems.value.map((step, index) => {
-//     if (index > stepPosition.value) {
-//       step.complete = false
-//       step.disabled = index > stepPosition.value + 1
-//     }
-//
-//     return step
-//   })
-// }
-//
-// const checkSubmit = (force = false): boolean => {
-//   if (stepPosition.value === 0 && !force) {
-//     nameFormSubmit.value++
-//     return false
-//   }
-//   if (stepPosition.value === 1 && !force) {
-//     storageSubmit.value++
-//     return false
-//   }
-//   if (stepPosition.value === 2 && !force) {
-//     selectOptionsSubmit.value++
-//     return false
-//   }
-//   if (stepPosition.value === 3 && !force) {
-//     customizeHardwareSubmit.value++
-//     return false
-//   }
-//   return true
-// }
-// const checkSubmitByManual = (step: number): boolean => {
-//   if (stepPosition.value === 0) {
-//     nameFormSubmit.value++
-//     return false
-//   }
-//   if (stepPosition.value === 1) {
-//     storageSubmit.value++
-//     return false
-//   }
-//   if (step === 3) {
-//     customizeHardwareSubmit.value++
-//     return false
-//   }
-//   return true
-// }
-// const onBack = (): void => {
-//   stepPosition.value--
-// }
-// let cashStep = -1
-// const onChangeStep = (key: number): void => {
-//   const isValid = checkSubmitByManual(key)
-//   if (!isValid) {
-//     cashStep = key
-//     return
-//   }
-//
-//   stepPosition.value = key
-// }
-//
-// const compatibility = ref<UI_I_OptionItem[]>(capabilities.compatibility)
-// const maxMemory = ref<number>(capabilities.maxMemory)
-//
-// const vmSettings = computed<UI_I_VmSettings | null>(() => props.vmSettings)
-// const vmName = ref<string>(vmSettings.value?.name || '')
-// watch(vmSettings, (newValue) => {
-//   vmName.value = newValue?.name || ''
-// })
-//
-// const onHideModal = (): void => {
-//   emits('hide')
-// }
 </script>
 
 <style scoped lang="scss">

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

@@ -11,7 +11,7 @@ export const stepsFunc = (
       stepName: '',
       title: localization.selectName,
       subTitle: localization.specifyUniqueName,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
+      status: UI_E_WIZARD_STATUS.SELECTED,
       isValid: true,
       fields: {
         name: {

package/package.json

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