bfg-common 1.5.160 → 1.5.162

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

@@ -56,7 +56,7 @@
             v-show="selectedStep.id === dynamicSteps.selectStorage"
             :storage-submit="storageSubmit"
             :datastore="props.datastore"
-            :storage="vmSettings.storage"
+            :storage="vmForm.storage"
             :get-datastore-table-func="props.getDatastoreTableFunc"
             @submit="onChangeStorage"
           />
@@ -81,7 +81,7 @@
             v-model:guest-machine-type="vmSettings.guestMachineType"
             v-model:guest-os-family="vmSettings.guestOsFamily"
             v-model:guest-os-version="vmSettings.guestOsVersion"
-            :storage="vmSettings.storage"
+            :storage="vmForm.storage"
             :hard-disks-for-boot-options="virtualHardwareHardDisksLocal"
             :cd-dvd-drives-for-boot-options="virtualHardwareCdDvdDrivesLocal"
             :networks-for-boot-options="virtualHardwareNetworksLocal"
@@ -161,9 +161,7 @@ import type {
   UI_I_PciDevice,
   UI_I_VmSettings,
 } from '~/lib/models/store/vm/interfaces'
-import type {
-  UI_I_VmForm,
-} from '~/components/common/vm/actions/common/lib/models/interfaces'
+import type { UI_I_VmForm } from '~/components/common/vm/actions/common/lib/models/interfaces'
 import type {
   UI_I_ValidationReturn,
   UI_I_WizardStep,
@@ -608,7 +606,8 @@ const validateSendData = async (
     isPowerOnByDefault.value,
     localization.value,
     vmForm.value.locationPath, // для сферы
-    computeResourcePath.value // для сферы
+    // computeResourcePath.value // для сферы
+    vmSettings.value.host_id // для сферы // TODO rollback
   )
 
   wizard.setLoader(false)
@@ -636,7 +635,8 @@ const onFinish = (): void => {
       isPowerOnByDefault.value,
       localization.value,
       vmForm.value.locationPath, // для сферы
-      computeResourcePath.value, // для сферы
+      // computeResourcePath.value, // для сферы
+      vmSettings.value.host_id, // для сферы // TODO rollback
       false,
       newTaskForm.value,
       props.schedulerTask
@@ -657,9 +657,11 @@ const customizeHardwareSubmit = ref<null | Function>(null)
 const vmSettings = computed<UI_I_VmSettings | null>(() => props.vmSettings)
 const vmName = ref<string>(vmSettings.value?.name || '')
 
-const guestOsFamilies = ref<UI_I_OptionItem[]>(capabilities.value.guestOsFamilies)
+const guestOsFamilies = ref<UI_I_OptionItem[]>(
+  capabilities.value.guestOsFamilies
+)
 const guestOsVersions = ref<UI_I_ArbitraryObject<UI_I_OptionItem[]>>(
-    capabilities.value.guestOsVersions
+  capabilities.value.guestOsVersions
 )
 const machineTypes = ref<UI_I_OptionItem[]>(capabilities.value.machineTypes)
 
@@ -686,6 +688,13 @@ watch(vmSettings, (newValue) => {
 
   if (newValue?.compatibility)
     vmForm.value.compatibility = newValue.compatibility
+
+  if (newValue?.storage) {
+    const datastore = props.datastore.find(
+      (item) => item.id === newValue.storage.id
+    )
+    if (datastore) vmForm.value.storage = datastore
+  }
 })
 
 const onHideModal = (): void => {

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDisk.vue

@@ -100,7 +100,7 @@ const props = defineProps<{
   hardDisk: UI_I_SendDataNewHardDisk
   type: UI_T_HardDiskType
   index: number
-  errorValidationFields: UI_I_ErrorValidationField<string>[]
+  errorValidationFields: UI_I_ErrorValidationField[]
   getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
   datastore: UI_I_DatastoreTableItem[]
   isEdit: boolean
@@ -160,14 +160,17 @@ const label = computed<string>(() => {
 })
 
 const maxHardDisk = computed<number>(() => {
-  if (props.type === 'exist') return $binary.gbToMb(props.hardDisk.size)
+  const hardDiskSizeMb = $binary.gbToMb(props.hardDisk.size)
+
+  if (props.type === 'exist') return hardDiskSizeMb
 
   if (!storage.value) return 0
+  const free = storage.value.capacity.free_mb || storage.value.capacity // TODO fix
 
   if (props.isEdit)
-    return storage.value.capacity.free_mb + $binary.gbToMb(props.hardDisk.size)
+    return free + hardDiskSizeMb
 
-  return storage.value.capacity.free_mb
+  return free
 })
 const hardDiskTypeErrorLocalText = computed<string>(() => {
   if (+sizeInMb.value > maxHardDisk.value) {

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

@@ -52,7 +52,6 @@
 <script setup lang="ts">
 import type {
   UI_I_Pagination,
-  UI_I_TablePayload,
 } from '~/lib/models/table/interfaces'
 import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
@@ -70,7 +69,6 @@ const pagination = defineModel<UI_I_Pagination>('pagination', {
 
 const props = defineProps<{
   datastore: UI_I_DatastoreTableItem[]
-  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
   errors: string[]
   selectedStorage: UI_I_DatastoreTableItem | null
   hideCompatibility?: boolean

package/components/common/vm/actions/common/select/storage/Storage.vue

@@ -4,7 +4,6 @@
     v-model:selected-row="selectedRow"
     v-model:pagination="pagination"
     :datastore="props.datastore"
-    :get-datastore-table-func="props.getDatastoreTableFunc"
     :errors="errors"
     :selected-storage="selectedStorage"
     :hide-compatibility="props.hideCompatibility"
@@ -17,7 +16,6 @@
     v-model:selected-row="selectedRow"
     v-model:pagination="pagination"
     :datastore="props.datastore"
-    :get-datastore-table-func="props.getDatastoreTableFunc"
     :errors="errors"
     :selected-storage="selectedStorage"
     :hide-compatibility="props.hideCompatibility"

package/components/common/vm/actions/common/select/storage/new/New.vue

@@ -63,7 +63,6 @@
 
 <script setup lang="ts">
 import type { UI_I_DataTable } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
-import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
 import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import {
@@ -76,7 +75,6 @@ const selectedRow = defineModel<number | null>('selectedRow')
 
 const props = defineProps<{
   datastore: UI_I_DatastoreTableItem[]
-  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
   errors: string[]
   selectedStorage: UI_I_DatastoreTableItem | null
   hideCompatibility?: boolean

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.160",
+  "version": "1.5.162",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -34,7 +34,7 @@
     "@nuxtjs/eslint-config-typescript": "^12.0.0",
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
-    "bfg-nuxt-3-graph": "1.0.22",
+    "bfg-nuxt-3-graph": "1.0.23",
     "bfg-uikit": "1.0.416",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"