bfg-common 1.5.581 → 1.5.583

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

@@ -2,16 +2,17 @@
   <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-new
     v-if="isNewView"
     v-model:delete-files-from-datastore="deleteFilesFromDatastore"
-    v-model:size="size"
+    v-model:size="sizeLocal"
     v-model:hard-disk-type="hardDiskType"
-    v-model:disk-provisioning="diskProvisioning"
-    v-model:sharing="sharing"
+    v-model:disk-provisioning="provisionType"
+    v-model:sharing="sharingLocal"
     v-model:limit-iops="limitIops"
     v-model:limit-iops-type="limitIopsType"
     v-model:limit-iops-invalid="limitIopsInvalid"
     v-model:disk-mode="diskMode"
     v-model:cache="cache"
     v-model:bus="bus"
+    v-model:source="source"
     :is-removable="isRemovable"
     :label="label"
     :hard-disk-invalid="hardDiskInvalid"
@@ -36,7 +37,6 @@
     :error-validation-fields="props.errorValidationFields"
     :index="props.index"
     :type="props.type"
-    :hard-disk="props.hardDisk"
     :guest-machine-type="props.guestMachineType"
     :compute-resource="props.computeResource"
     @remove="emits('remove')"
@@ -48,16 +48,17 @@
   <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-old
     v-else
     v-model:delete-files-from-datastore="deleteFilesFromDatastore"
-    v-model:size="size"
+    v-model:size="sizeLocal"
     v-model:hard-disk-type="hardDiskType"
-    v-model:disk-provisioning="diskProvisioning"
-    v-model:sharing="sharing"
+    v-model:disk-provisioning="provisionType"
+    v-model:sharing="sharingLocal"
     v-model:limit-iops="limitIops"
     v-model:limit-iops-type="limitIopsType"
     v-model:limit-iops-invalid="limitIopsInvalid"
     v-model:disk-mode="diskMode"
     v-model:cache="cache"
     v-model:bus="bus"
+    v-model:source="source"
     :is-removable="isRemovable"
     :label="label"
     :hard-disk-invalid="hardDiskInvalid"
@@ -82,7 +83,6 @@
     :error-validation-fields="props.errorValidationFields"
     :index="props.index"
     :type="props.type"
-    :hard-disk="props.hardDisk"
     :guest-machine-type="props.guestMachineType"
     :compute-resource="props.computeResource"
     :disabled="false"
@@ -96,10 +96,10 @@
 
 <script setup lang="ts">
 import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
-import type {
-  UI_I_SendDataNewHardDisk,
-  UI_I_SendDataNewHardDiskStorage,
-} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
+// import type {
+//   UI_I_SendDataNewHardDisk,
+//   UI_I_SendDataNewHardDiskStorage,
+// } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
 import type { UI_T_HardDiskType } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/types'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
@@ -108,10 +108,61 @@ import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 import { binaryOptionsFunc } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/config/binaryOptions'
 
+const size = defineModel<number>('size', { required: true })
+const initialSize = size.value
+// const provisionType = ref<string>('thick')
+const provisionType = defineModel<string>('provisionType', { required: true })
+// const sharing = ref<string>('')
+const sharing = defineModel<boolean>('sharing', { required: true })
+// const sharingLocal = ref<string>(sharing.value ? 'yes' : '')
+const sharingLocal = computed<string>({
+  set(newValue) {
+    sharing.value = newValue === 'yes'
+  },
+  get() {
+    return sharing.value ? 'yes' : ''
+  }
+})
+// const shares = ref<number>(0)
+const shares = defineModel<number>('shares', { required: true })
+
+// const limitIops = ref<number>(16)
+const limitIops = defineModel<number>('limitIops', { required: true })
+const limitIopsType = ref<string>('unlimited') // ??
+const limitIopsInvalid = ref<boolean>(false) // ??
+
+// const diskMode = ref<string>('dependent')
+const diskMode = defineModel<string>('diskMode', { required: true })
+
+// const cache = ref<string>('none')
+const cache = defineModel<string>('cache', { required: true })
+
+// const bus = ref<string>('ide')
+const bus = defineModel<string>('bus', { required: true })
+
+// const readOnly = ref<boolean>(false)
+const readOnly = defineModel<boolean>('readOnly', { required: true })
+
+// const discard = ref<string>('')
+const discard = defineModel<string>('discard', { required: true })
+
+// const io = ref<string>('')
+const io = defineModel<string>('io', { required: true })
+
+// const target = ref<string>('')
+const target = defineModel<string>('target', { required: true })
+
+const source = defineModel<string>('source', { required: true })
+
+const storage = defineModel<any>('storage', { required: true })
+
+const remove = defineModel<boolean>('remove', { required: true })
+const detach = defineModel<boolean>('detach', { required: true })
+
 const props = withDefaults(
   defineProps<{
-    storage: UI_I_DatastoreTableItem | null
-    hardDisk: UI_I_SendDataNewHardDisk
+    mainStorage: UI_I_DatastoreTableItem | null
+    // hardDisk: UI_I_SendDataNewHardDisk
     type: UI_T_HardDiskType
     index: number
     errorValidationFields: UI_I_ErrorValidationField[]
@@ -130,13 +181,18 @@ const props = withDefaults(
   }
 )
 const emits = defineEmits<{
-  (event: 'send-data', value: UI_I_SendDataNewHardDisk): void
+  // (event: 'send-data', value: UI_I_SendDataNewHardDisk): void
   (event: 'invalid', value: boolean): void
   (event: 'remove'): void
   (event: 'roll-back'): void
   (event: 'remove-error-by-title', value: string): void
 }>()
 
+watch(() => props.type, (newValue) => {
+  detach.value = newValue === 'removed'
+})
+
+
 const { $store, $binary }: any = useNuxtApp()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
@@ -180,23 +236,24 @@ const label = computed<string>(() => {
 })
 
 const maxHardDisk = computed<number>(() => {
-  const hardDiskSizeMb = $binary.gbToMb(props.hardDisk.size)
+  // const hardDiskSizeMb = $binary.gbToMb(props.hardDisk.size)
 
-  if (props.type === 'exist') return hardDiskSizeMb
+  if (props.type === 'exist') return initialSize
 
-  if (!storage.value) return 0
-  const free = storage.value.capacity.free_mb || storage.value.capacity // TODO fix
+  if (!storageLocal.value) return 0
+  const free = (storageLocal.value.capacity.free_mb ||
+    storageLocal.value.capacity) as number // TODO fix
 
-  if (props.isEdit) return free + hardDiskSizeMb
+  if (props.isEdit) return free + initialSize
 
   return free
 })
 const hardDiskTypeErrorLocalText = computed<string>(() => {
-  if (+sizeInMb.value > maxHardDisk.value) {
+  if (size.value > maxHardDisk.value) {
     return localization.value.common.diskCapacitySpecifiedGreater
   }
 
-  if (+sizeInMb.value <= 0) {
+  if (size.value <= 0) {
     return localization.value.common.diskCapacityCannotZero
   }
 
@@ -217,25 +274,38 @@ const hardDiskLocalAndApiErrorsTexts = computed<string>(() => {
 })
 
 const deleteFilesFromDatastore = ref<boolean>(false)
+watch(deleteFilesFromDatastore, (newValue) => {
+  remove.value = props.type === 'removed' && newValue
+})
 
-const hardDiskType = ref<string>('gb')
+const hardDiskType = ref<string>(size.value < 1024 ? 'mb' : 'gb')
+watch(hardDiskType, (newValue) => {
+  size.value = $binary.universalFromTo(sizeLocal.value, newValue, 'mb')
+})
 const hardDiskTypeOptions = ref<UI_I_OptionItem[]>(
   binaryOptionsFunc(localization.value)
 )
 
-const size = ref<number>(props.hardDisk.size) // Изначально всегда приходит в gb
-const sizeInMb = computed<number>(() => {
+const sizeLocal = ref<number>(size.value < 1024 ? size.value : $binary.mbToGb(size.value))
+watch(sizeLocal, (newValue) => {
   if (hardDiskType.value === 'mb') {
-    return size.value
+    size.value = newValue
   }
 
-  return $binary.universalFromTo(size.value, hardDiskType.value, 'mb')
+  size.value = $binary.universalFromTo(newValue, hardDiskType.value, 'mb')
 })
+// const sizeInMb = computed<number>(() => {
+//   if (hardDiskType.value === 'mb') {
+//     return size.value
+//   }
+//
+//   return $binary.universalFromTo(size.value, hardDiskType.value, 'mb')
+// })
 const onValidateSize = (): void => {
   if (props.type !== 'edit') return
-  if (sizeInMb.value < props.hardDisk.size) {
-    size.value = $binary.universalFromTo(
-      props.hardDisk.size,
+  if (size.value < initialSize) {
+    sizeLocal.value = $binary.universalFromTo(
+      initialSize,
       'mb',
       hardDiskType.value
     )
@@ -247,7 +317,7 @@ const isDisabledSize = computed<boolean>(() => {
   return (
     props.type === 'exist' ||
     (props.type === 'edit' && readOnly.value) ||
-    (isRunning.value && diskProvisioning.value === 'thick')
+    (isRunning.value && provisionType.value === 'thick')
   )
 })
 const isDisabledProvisioning = computed<boolean>(() => {
@@ -271,13 +341,25 @@ const isDisabledBus = computed<boolean>(() => {
   return !isNewHardDisk.value && isRunning.value
 })
 
-const location = ref<UI_I_DatastoreTableItem | null>(props.storage || null)
-const storage = ref<UI_I_DatastoreTableItem | null>(props.storage)
+const location = ref<UI_I_DatastoreTableItem | null>(props.mainStorage || null)
+const storageLocal = ref<UI_I_DatastoreTableItem | null>(props.mainStorage)
 watch(
-  () => props.storage,
+  () => props.mainStorage,
   (newValue) => {
     location.value = newValue
-    storage.value = newValue
+    storageLocal.value = newValue
+
+    storage.value = {
+      id: newValue?.id || '',
+      name: newValue?.name || '',
+      type: newValue?.type_text || '',
+      pool: newValue?.pool_name || '',
+      user: '',
+      endpoint: '',
+      password: '',
+      protocol: '',
+      options: '',
+    }
   },
   {
     immediate: true,
@@ -285,125 +367,135 @@ watch(
   }
 )
 const onChangeStorage = (item: UI_I_DatastoreTableItem): void => {
-  storage.value = item
+  storageLocal.value = item
+
+  storage.value = {
+    id: item?.id || '',
+    name: item?.name || '',
+    type: item?.type_text || '',
+    pool: item?.pool_name || '',
+    user: '',
+    endpoint: '',
+    password: '',
+    protocol: '',
+    options: '',
+  }
 }
 
-const diskProvisioning = ref<string>('thick')
-const sharing = ref<string>('')
-const shares = ref<number>(0)
-
-const limitIops = ref<number>(16)
-const limitIopsType = ref<string>('unlimited')
-const limitIopsInvalid = ref<boolean>(false)
-
-const diskMode = ref<string>('dependent')
-
-const cache = ref<string>('none')
-
+// const diskProvisioning = ref<string>('thick')
+// const sharing = ref<string>('')
+// const shares = ref<number>(0)
+//
+// const limitIops = ref<number>(16)
+// const limitIopsType = ref<string>('unlimited')
+// const limitIopsInvalid = ref<boolean>(false)
+//
+// const diskMode = ref<string>('dependent')
+//
+// const cache = ref<string>('none')
+//
 // const bus = ref<string>('ide')
-const bus = ref<string>('virtio') // Семён попросил
-
-const readOnly = ref<boolean>(false)
-
-const discard = ref<string>('')
-
-const io = ref<string>('')
-
-const target = ref<string>('')
-
-watch(
-  [
-    sizeInMb,
-    storage,
-    diskProvisioning,
-    sharing,
-    limitIops,
-    limitIopsType,
-    diskMode,
-    cache,
-    bus,
-    deleteFilesFromDatastore,
-    (): void => props.type,
-  ],
-  () => {
-    const limitIopsLocal =
-      limitIopsType.value === 'unlimited' ? 0 : limitIops.value
-    const storageLocal: UI_I_SendDataNewHardDiskStorage = {
-      id: storage.value?.id || '',
-      name: storage.value?.name || '',
-      type: storage.value?.type_text || '',
-      pool: storage.value?.pool_name || '',
-      user: '',
-      endpoint: '',
-      password: '',
-      protocol: '',
-      options: '',
-    }
-
-    emits('send-data', {
-      create: props.hardDisk.create,
-      attach: props.hardDisk.attach,
-      source: props.hardDisk.source,
-      size: Math.ceil(sizeInMb.value),
-      bus: bus.value,
-      target: target.value,
-      storage: storageLocal,
-      device_type: 'disk',
-      provision_type: diskProvisioning.value,
-      disk_mode: diskMode.value,
-      sharing: sharing.value === 'yes',
-      read_only: readOnly.value,
-      shares: shares.value,
-      cache: cache.value,
-      io: io.value,
-      limit_iops: limitIopsLocal,
-      discard: discard.value,
-      capacity: Math.ceil(sizeInMb.value),
-      boot_order: props.hardDisk.boot_order,
-      detach: props.type === 'removed',
-      remove: props.type === 'removed' && deleteFilesFromDatastore.value, // Проверяем если удалили диск и указали Delete files from datastore
-    })
-  },
-  { immediate: true }
-)
+//
+// const readOnly = ref<boolean>(false)
+//
+// const discard = ref<string>('')
+//
+// const io = ref<string>('')
+//
+// const target = ref<string>('')
+
+// watch(
+//   [
+//     sizeInMb,
+//     storage,
+//     diskProvisioning,
+//     sharing,
+//     limitIops,
+//     limitIopsType,
+//     diskMode,
+//     cache,
+//     bus,
+//     deleteFilesFromDatastore,
+//     (): void => props.type,
+//   ],
+//   () => {
+//     const limitIopsLocal =
+//       limitIopsType.value === 'unlimited' ? 0 : limitIops.value
+//     const storageLocal: UI_I_SendDataNewHardDiskStorage = {
+//       id: storage.value?.id || '',
+//       name: storage.value?.name || '',
+//       type: storage.value?.type_text || '',
+//       pool: storage.value?.pool_name || '',
+//       user: '',
+//       endpoint: '',
+//       password: '',
+//       protocol: '',
+//       options: '',
+//     }
+//
+//     emits('send-data', {
+//       create: props.hardDisk.create,
+//       attach: props.hardDisk.attach,
+//       source: props.hardDisk.source,
+//       size: Math.ceil(sizeInMb.value),
+//       bus: bus.value,
+//       target: target.value,
+//       storage: storageLocal,
+//       device_type: 'disk',
+//       provision_type: diskProvisioning.value,
+//       disk_mode: diskMode.value,
+//       sharing: sharing.value === 'yes',
+//       read_only: readOnly.value,
+//       shares: shares.value,
+//       cache: cache.value,
+//       io: io.value,
+//       limit_iops: limitIopsLocal,
+//       discard: discard.value,
+//       capacity: Math.ceil(sizeInMb.value),
+//       boot_order: props.hardDisk.boot_order,
+//       detach: props.type === 'removed',
+//       remove: props.type === 'removed' && deleteFilesFromDatastore.value, // Проверяем если удалили диск и указали Delete files from datastore
+//     })
+//   },
+//   { immediate: true }
+// )
 
 // Добавляем данные для редактирования
-watch(
-  () => props.hardDisk,
-  (newValue) => {
-    // TODO refactoring
-    if (props.type === 'exist') {
-      diskProvisioning.value = newValue.provision_type || 'thick'
-      return
-    }
-    // if (props.type !== 'edit') return
-    if (props.type !== 'edit' && props.type !== 'clone') return
-
-    const sizeInGb = $binary.mbToGb(newValue.size)
-    if (sizeInGb < 1) {
-      size.value = newValue.size
-      hardDiskType.value = 'mb'
-    } else {
-      size.value = sizeInGb
-      hardDiskType.value = 'gb'
-    }
-    diskProvisioning.value = newValue.provision_type || 'thick'
-    sharing.value = newValue.sharing ? 'yes' : ''
-    shares.value = newValue.shares || 0
-    // limitIopsType.value = newValue.io === 'native' ? 'unlimited' : 'custom'
-    limitIopsType.value = newValue.limit_iops === 0 ? 'unlimited' : 'custom'
-    limitIops.value = newValue.limit_iops || 16
-    diskMode.value = newValue.disk_mode || 'dependent'
-    cache.value = newValue.cache || 'none'
-    // bus.value = newValue.bus || 'ide'
-    bus.value = newValue.bus || 'virtio' // Семён попросил
-    readOnly.value = newValue.read_only || false
-    discard.value = newValue.discard || ''
-    io.value = newValue.io || ''
-    target.value = newValue.target || ''
-  },
-  { immediate: true }
-)
+// watch(
+//   () => props.hardDisk,
+//   (newValue) => {
+//     // TODO refactoring
+//     if (props.type === 'exist') {
+//       diskProvisioning.value = newValue.provision_type || 'thick'
+//       return
+//     }
+//     // if (props.type !== 'edit') return
+//     if (props.type !== 'edit' && props.type !== 'clone') return
+//
+//     const sizeInGb = $binary.mbToGb(newValue.size)
+//     if (sizeInGb < 1) {
+//       size.value = newValue.size
+//       hardDiskType.value = 'mb'
+//     } else {
+//       size.value = sizeInGb
+//       hardDiskType.value = 'gb'
+//     }
+//     diskProvisioning.value = newValue.provision_type || 'thick'
+//     sharing.value = newValue.sharing ? 'yes' : ''
+//     shares.value = newValue.shares || 0
+//     // limitIopsType.value = newValue.io === 'native' ? 'unlimited' : 'custom'
+//     limitIopsType.value = newValue.limit_iops === 0 ? 'unlimited' : 'custom'
+//     limitIops.value = newValue.limit_iops || 16
+//     diskMode.value = newValue.disk_mode || 'dependent'
+//     cache.value = newValue.cache || 'none'
+//     bus.value = newValue.bus || 'ide'
+//     readOnly.value = newValue.read_only || false
+//     discard.value = newValue.discard || ''
+//     io.value = newValue.io || ''
+//     target.value = newValue.target || ''
+//   },
+//   { immediate: true }
+// )
 watch(
   isRunning,
   (newValue) => {

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

@@ -107,7 +107,7 @@
       />
       <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-file
         v-else
-        :path="props.hardDisk?.source"
+        :path="source"
         :index="props.index"
       />
       <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-provisioning
@@ -165,7 +165,6 @@
 
 <script setup lang="ts">
 import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
-import type { UI_I_SendDataNewHardDisk } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
 import type { UI_T_HardDiskType } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/types'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
@@ -191,6 +190,7 @@ const limitIopsInvalid = defineModel<boolean>('limitIopsInvalid', {
 const diskMode = defineModel<string>('diskMode', { required: true })
 const cache = defineModel<string>('cache', { required: true })
 const bus = defineModel<string>('bus', { required: true })
+const source = defineModel<string>('source', { required: true })
 
 const props = withDefaults(
   defineProps<{
@@ -216,10 +216,9 @@ const props = withDefaults(
     datastore: UI_I_DatastoreTableItem[]
     isDatastoreLoading: boolean
     getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
-    errorValidationFields: UI_I_ErrorValidationField<string>[]
+    errorValidationFields: UI_I_ErrorValidationField[]
     index: number
     type: UI_T_HardDiskType
-    hardDisk: UI_I_SendDataNewHardDisk
     guestMachineType?: UI_I_OptionItem | null
     computeResource?: UI_I_TreeNode | null
   }>(),

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

@@ -121,7 +121,7 @@
         />
         <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-file
           v-else
-          :path="props.hardDisk?.source"
+          :path="source"
           :index="props.index"
         />
         <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-provisioning
@@ -180,7 +180,6 @@
 
 <script setup lang="ts">
 import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
-import type { UI_I_SendDataNewHardDisk } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
 import type { UI_T_HardDiskType } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/types'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
@@ -206,6 +205,7 @@ const limitIopsInvalid = defineModel<boolean>('limitIopsInvalid', {
 const diskMode = defineModel<string>('diskMode', { required: true })
 const cache = defineModel<string>('cache', { required: true })
 const bus = defineModel<string>('bus', { required: true })
+const source = defineModel<string>('source', { required: true })
 
 const props = withDefaults(
   defineProps<{
@@ -234,7 +234,6 @@ const props = withDefaults(
     errorValidationFields: UI_I_ErrorValidationField<string>[]
     index: number
     type: UI_T_HardDiskType
-    hardDisk: UI_I_SendDataNewHardDisk
     guestMachineType?: UI_I_OptionItem | null
     computeResource?: UI_I_TreeNode | null
   }>(),