bfg-common 1.5.708 → 1.5.709

package/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/Memory.vue

@@ -1,283 +1,283 @@
-<template>
-  <!--  TODO если убрать див будет баг при редактировании, при изменения selectedMemory значение не меняется-->
-  <div>
-    <component
-      :is="currentComponent"
-      v-model:selected-memory="selectedMemory"
-      v-model:memory-type="memoryType"
-      v-model:reservation="reservation"
-      v-model:reservation-type="reservationType"
-      v-model:reserve-guest-memory="reserveGuestMemory"
-      v-model:reservation-invalid="reservationInvalid"
-      v-model:limit="limit"
-      v-model:limit-type="limitType"
-      v-model:limit-invalid="limitInvalid"
-      v-model:memory-hot-plug="model.memory.hotplug"
-      :error-validation-fields="props.errorValidationFields"
-      :memory-invalid="memoryInvalid"
-      :error-text="memorySizeLocalAndApiErrorsTexts"
-      :memory-options="memoryOptions"
-      :is-memory-disabled="isMemoryDisabled"
-      :memory-type-options="memoryTypeOptions"
-      :is-disabled="isDisabled"
-      :limit-options="limitOptions"
-      :is-disabled-memory-hot-plug="isDisabledMemoryHotPlug"
-      @select-memory="onSelectMemory"
-      @remove-error="onRemoveValidationError"
-      @remove-error-by-title="emits('remove-error-by-title', $event)"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
-import {
-  memoryOptionsFunc,
-  memoryTypeOptionsFunc,
-} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/lib/config/memoryOptions'
-
-const model = defineModel<UI_I_CreateVmData>({ required: true })
-
-const props = withDefaults(
-  defineProps<{
-    maxMemory: number
-    isEdit: boolean
-    errorValidationFields: UI_I_ErrorValidationField[]
-    state?: string | number
-  }>(),
-  {
-    state: undefined,
-  }
-)
-const emits = defineEmits<{
-  (event: 'invalid', value: boolean): void
-  (event: 'remove-error-by-title', value: string): void
-}>()
-
-const { $store, $binary }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const minMemoryInMb = 128
-watch(
-  () => props.maxMemory,
-  (newValue) => {
-    memoryOptions.value = memoryOptionsFunc(
-      localization.value,
-      minMemoryInMb,
-      newValue
-    )
-  }
-)
-
-const isDisabled = computed<boolean>(() => {
-  return props.state === 2
-})
-
-const isMemoryDisabled = computed<boolean>(
-  () => isDisabled.value && !model.value.memory.hotplug
-)
-
-const selectedMemory = ref<number>(4)
-watch(selectedMemory, (newValue) => {
-  const valueInt = parseInt('' + newValue)
-  selectedMemory.value = isNaN(valueInt) ? 0 : valueInt
-})
-const memoryType = ref<string>('gb')
-const memoryTypeOptions = ref<UI_I_OptionItem[]>(
-  memoryTypeOptionsFunc(localization.value)
-)
-const memoryInMb = computed<number>(() => {
-  if (memoryType.value === 'mb') {
-    return +selectedMemory.value
-  }
-
-  return $binary.universalFromTo(+selectedMemory.value, memoryType.value, 'mb')
-})
-watch(memoryInMb, (newValue) => {
-  model.value.memory.size_mb = newValue
-})
-if (model.value.memory.size_mb !== 4096) {
-  const sizeInGb = $binary.mbToGb(model.value.memory.size_mb)
-  if (sizeInGb < 1) {
-    selectedMemory.value = model.value.memory.size_mb
-    memoryType.value = 'mb'
-  } else {
-    selectedMemory.value = sizeInGb
-  }
-}
-
-const memoryOptions = ref<UI_I_OptionItem[]>(
-  memoryOptionsFunc(localization.value, minMemoryInMb, props.maxMemory)
-)
-const onSelectMemory = ({
-  value,
-  type,
-}: {
-  value: number
-  type: string
-}): void => {
-  selectedMemory.value = value
-  if (memoryType.value !== type) {
-    memoryType.value = type
-  }
-  // if (memoryType.value === 'mb') {
-  //   selectedMemory.value = mb
-  //   return
-  // }
-  //
-  // selectedMemory.value = $binary.universalFromTo(mb, 'mb', memoryType.value, 12)
-}
-
-const memoryErrorLocalText = computed<string>(() => {
-  const validValue = /^\d+(\.\d+)?$/.test(selectedMemory.value + '')
-  if (!validValue) {
-    return localization.value.common.inputContainsInvalidCharacters
-  }
-
-  const maxMemoryInGb = $binary.mbToGb(props.maxMemory)
-  if (memoryInMb.value < minMemoryInMb || memoryInMb.value > props.maxMemory) {
-    return localization.value.common.memoryMustBe
-      .replace('{0}', `${minMemoryInMb} ${localization.value.common.mb}`)
-      .replace('{1}', `${maxMemoryInGb} ${localization.value.common.gb}`)
-  }
-
-  if (memoryInMb.value % 2 !== 0) {
-    return localization.value.common.valueShouldMultiple.replace(
-      '{0}',
-      `${2} ${localization.value.common.mb}`
-    )
-  }
-  return ''
-})
-
-const apiErrorLocal = computed<string>(() => {
-  return (
-    props.errorValidationFields?.find(
-      (message) => message.field === 'memory.size_mb'
-    )?.error_message || ''
-  )
-})
-
-const memorySizeLocalAndApiErrorsTexts = computed<string>(() => {
-  const localError = memoryErrorLocalText.value
-  const apiError = apiErrorLocal.value
-
-  let result = ''
-  if (localError && !apiError) result = localError
-  if (apiError && !localError) result = apiError
-  if (localError && apiError) result = localError + ', ' + apiError
-  if (!localError && apiError) result = apiError
-
-  return result
-})
-
-const reservationInvalid = ref<boolean>(false)
-const limitInvalid = ref<boolean>(false)
-const memoryInvalid = computed<boolean>(
-  () =>
-    !!memorySizeLocalAndApiErrorsTexts.value ||
-    reservationInvalid.value ||
-    limitInvalid.value
-)
-watch(
-  memoryInvalid,
-  (newValue) => {
-    emits('invalid', newValue)
-  },
-  { immediate: true }
-)
-
-const reservation = ref<string>('2')
-watch(reservation, (newValue) => {
-  const valueInt = parseInt('' + newValue)
-  reservation.value = isNaN(valueInt) ? '0' : '' + valueInt
-})
-const reservationType = ref<string>('mb')
-const reserveGuestMemory = ref<boolean>(false)
-if (model.value.memory.reservation_mb !== 2) {
-  const reservationInGb = $binary.mbToGb(model.value.memory.reservation_mb)
-  if (reservationInGb < 1) {
-    reservation.value = model.value.memory.reservation_mb.toString()
-    reservationType.value = 'mb'
-  } else {
-    reservation.value = reservationInGb
-    reservationType.value = 'gb'
-  }
-}
-watch(
-  [reservation, reservationType],
-  () => {
-    model.value.memory.reservation_mb =
-      reservationType.value === 'gb'
-        ? $binary.gbToMb(+reservation.value)
-        : +reservation.value
-  },
-  { deep: true, immediate: true }
-)
-
-const limit = ref<string>('Unlimited')
-watch(limit, (newValue) => {
-  const valueInt = parseInt('' + newValue)
-  limit.value !== 'Unlimited' &&
-    (limit.value = isNaN(valueInt) ? '0' : '' + valueInt)
-})
-const limitType = ref<string>('mb')
-const limitOptions = computed<UI_I_OptionItem[] | undefined>(() => {
-  if (model.value.memory.hotplug)
-    return memoryOptionsFunc(
-      localization.value,
-      memoryInMb.value,
-      props.maxMemory
-    )
-})
-if (model.value.memory.limit_mb !== null) {
-  if (typeof model.value.memory.limit_mb === 'string')
-    limit.value = model.value.memory.limit_mb
-  else {
-    const limitInGb = $binary.mbToGb(model.value.memory.limit_mb)
-    if (limitInGb < 1) {
-      limit.value = model.value.memory.limit_mb.toString()
-      limitType.value = 'mb'
-    } else {
-      limit.value = limitInGb
-      limitType.value = 'gb'
-    }
-  }
-}
-watch(
-  [limit, limitType],
-  () => {
-    model.value.memory.limit_mb =
-      limit.value === 'Unlimited'
-        ? limit.value
-        : limitType.value === 'gb'
-        ? $binary.gbToMb(+limit.value)
-        : +limit.value
-  },
-  { deep: true, immediate: true }
-)
-
-// const memoryHotPlug = ref<boolean>(false)
-const isDisabledMemoryHotPlug = computed<boolean>(
-  () => memoryInMb.value >= props.maxMemory || isDisabled.value
-)
-watch(isDisabledMemoryHotPlug, (newValue) => {
-  if (newValue) model.value.memory.hotplug = false
-})
-
-const onRemoveValidationError = (): void => {
-  emits('remove-error-by-title', 'memory.size_mb')
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <!--  TODO если убрать див будет баг при редактировании, при изменения selectedMemory значение не меняется-->
+  <div>
+    <component
+      :is="currentComponent"
+      v-model:selected-memory="selectedMemory"
+      v-model:memory-type="memoryType"
+      v-model:reservation="reservation"
+      v-model:reservation-type="reservationType"
+      v-model:reserve-guest-memory="reserveGuestMemory"
+      v-model:reservation-invalid="reservationInvalid"
+      v-model:limit="limit"
+      v-model:limit-type="limitType"
+      v-model:limit-invalid="limitInvalid"
+      v-model:memory-hot-plug="model.memory.hotplug"
+      :error-validation-fields="props.errorValidationFields"
+      :memory-invalid="memoryInvalid"
+      :error-text="memorySizeLocalAndApiErrorsTexts"
+      :memory-options="memoryOptions"
+      :is-memory-disabled="isMemoryDisabled"
+      :memory-type-options="memoryTypeOptions"
+      :is-disabled="isDisabled"
+      :limit-options="limitOptions"
+      :is-disabled-memory-hot-plug="isDisabledMemoryHotPlug"
+      @select-memory="onSelectMemory"
+      @remove-error="onRemoveValidationError"
+      @remove-error-by-title="emits('remove-error-by-title', $event)"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
+import {
+  memoryOptionsFunc,
+  memoryTypeOptionsFunc,
+} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/lib/config/memoryOptions'
+
+const model = defineModel<UI_I_CreateVmData>({ required: true })
+
+const props = withDefaults(
+  defineProps<{
+    maxMemory: number
+    isEdit: boolean
+    errorValidationFields: UI_I_ErrorValidationField[]
+    state?: string | number
+  }>(),
+  {
+    state: undefined,
+  }
+)
+const emits = defineEmits<{
+  (event: 'invalid', value: boolean): void
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const { $store, $binary }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const minMemoryInMb = 128
+watch(
+  () => props.maxMemory,
+  (newValue) => {
+    memoryOptions.value = memoryOptionsFunc(
+      localization.value,
+      minMemoryInMb,
+      newValue
+    )
+  }
+)
+
+const isDisabled = computed<boolean>(() => {
+  return props.state === 2
+})
+
+const isMemoryDisabled = computed<boolean>(
+  () => isDisabled.value && !model.value.memory.hotplug
+)
+
+const selectedMemory = ref<number>(4)
+watch(selectedMemory, (newValue) => {
+  const valueInt = parseInt('' + newValue)
+  selectedMemory.value = isNaN(valueInt) ? 0 : valueInt
+})
+const memoryType = ref<string>('gb')
+const memoryTypeOptions = ref<UI_I_OptionItem[]>(
+  memoryTypeOptionsFunc(localization.value)
+)
+const memoryInMb = computed<number>(() => {
+  if (memoryType.value === 'mb') {
+    return +selectedMemory.value
+  }
+
+  return $binary.universalFromTo(+selectedMemory.value, memoryType.value, 'mb')
+})
+watch(memoryInMb, (newValue) => {
+  model.value.memory.size_mb = newValue
+})
+if (model.value.memory.size_mb !== 4096) {
+  const sizeInGb = $binary.mbToGb(model.value.memory.size_mb)
+  if (sizeInGb < 1) {
+    selectedMemory.value = model.value.memory.size_mb
+    memoryType.value = 'mb'
+  } else {
+    selectedMemory.value = sizeInGb
+  }
+}
+
+const memoryOptions = ref<UI_I_OptionItem[]>(
+  memoryOptionsFunc(localization.value, minMemoryInMb, props.maxMemory)
+)
+const onSelectMemory = ({
+  value,
+  type,
+}: {
+  value: number
+  type: string
+}): void => {
+  selectedMemory.value = value
+  if (memoryType.value !== type) {
+    memoryType.value = type
+  }
+  // if (memoryType.value === 'mb') {
+  //   selectedMemory.value = mb
+  //   return
+  // }
+  //
+  // selectedMemory.value = $binary.universalFromTo(mb, 'mb', memoryType.value, 12)
+}
+
+const memoryErrorLocalText = computed<string>(() => {
+  const validValue = /^\d+(\.\d+)?$/.test(selectedMemory.value + '')
+  if (!validValue) {
+    return localization.value.common.inputContainsInvalidCharacters
+  }
+
+  const maxMemoryInGb = $binary.mbToGb(props.maxMemory)
+  if (memoryInMb.value < minMemoryInMb || memoryInMb.value > props.maxMemory) {
+    return localization.value.common.memoryMustBe
+      .replace('{0}', `${minMemoryInMb} ${localization.value.common.mb}`)
+      .replace('{1}', `${maxMemoryInGb} ${localization.value.common.gb}`)
+  }
+
+  if (memoryInMb.value % 2 !== 0) {
+    return localization.value.common.valueShouldMultiple.replace(
+      '{0}',
+      `${2} ${localization.value.common.mb}`
+    )
+  }
+  return ''
+})
+
+const apiErrorLocal = computed<string>(() => {
+  return (
+    props.errorValidationFields?.find(
+      (message) => message.field === 'memory.size_mb'
+    )?.error_message || ''
+  )
+})
+
+const memorySizeLocalAndApiErrorsTexts = computed<string>(() => {
+  const localError = memoryErrorLocalText.value
+  const apiError = apiErrorLocal.value
+
+  let result = ''
+  if (localError && !apiError) result = localError
+  if (apiError && !localError) result = apiError
+  if (localError && apiError) result = localError + ', ' + apiError
+  if (!localError && apiError) result = apiError
+
+  return result
+})
+
+const reservationInvalid = ref<boolean>(false)
+const limitInvalid = ref<boolean>(false)
+const memoryInvalid = computed<boolean>(
+  () =>
+    !!memorySizeLocalAndApiErrorsTexts.value ||
+    reservationInvalid.value ||
+    limitInvalid.value
+)
+watch(
+  memoryInvalid,
+  (newValue) => {
+    emits('invalid', newValue)
+  },
+  { immediate: true }
+)
+
+const reservation = ref<string>('2')
+watch(reservation, (newValue) => {
+  const valueInt = parseInt('' + newValue)
+  reservation.value = isNaN(valueInt) ? '0' : '' + valueInt
+})
+const reservationType = ref<string>('mb')
+const reserveGuestMemory = ref<boolean>(false)
+if (model.value.memory.reservation_mb !== 2) {
+  const reservationInGb = $binary.mbToGb(model.value.memory.reservation_mb)
+  if (reservationInGb < 1) {
+    reservation.value = model.value.memory.reservation_mb.toString()
+    reservationType.value = 'mb'
+  } else {
+    reservation.value = reservationInGb
+    reservationType.value = 'gb'
+  }
+}
+watch(
+  [reservation, reservationType],
+  () => {
+    model.value.memory.reservation_mb =
+      reservationType.value === 'gb'
+        ? $binary.gbToMb(+reservation.value)
+        : +reservation.value
+  },
+  { deep: true, immediate: true }
+)
+
+const limit = ref<string>('Unlimited')
+watch(limit, (newValue) => {
+  const valueInt = parseInt('' + newValue)
+  limit.value !== 'Unlimited' &&
+    (limit.value = isNaN(valueInt) ? '0' : '' + valueInt)
+})
+const limitType = ref<string>('mb')
+const limitOptions = computed<UI_I_OptionItem[] | undefined>(() => {
+  if (model.value.memory.hotplug)
+    return memoryOptionsFunc(
+      localization.value,
+      memoryInMb.value,
+      props.maxMemory
+    )
+})
+if (model.value.memory.limit_mb !== null) {
+  if (typeof model.value.memory.limit_mb === 'string')
+    limit.value = model.value.memory.limit_mb
+  else {
+    const limitInGb = $binary.mbToGb(model.value.memory.limit_mb)
+    if (limitInGb < 1) {
+      limit.value = model.value.memory.limit_mb.toString()
+      limitType.value = 'mb'
+    } else {
+      limit.value = limitInGb
+      limitType.value = 'gb'
+    }
+  }
+}
+watch(
+  [limit, limitType],
+  () => {
+    model.value.memory.limit_mb =
+      limit.value === 'Unlimited'
+        ? limit.value
+        : limitType.value === 'gb'
+        ? $binary.gbToMb(+limit.value)
+        : +limit.value
+  },
+  { deep: true, immediate: true }
+)
+
+// const memoryHotPlug = ref<boolean>(false)
+const isDisabledMemoryHotPlug = computed<boolean>(
+  () => memoryInMb.value >= props.maxMemory || isDisabled.value
+)
+watch(isDisabledMemoryHotPlug, (newValue) => {
+  if (newValue) model.value.memory.hotplug = false
+})
+
+const onRemoveValidationError = (): void => {
+  emits('remove-error-by-title', 'memory.size_mb')
+}
+</script>
+
+<style scoped lang="scss"></style>

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

@@ -115,6 +115,7 @@ const detach = defineModel<boolean>('detach', { required: true })
 const props = withDefaults(
   defineProps<{
     mainStorage: UI_I_DatastoreTableItem | null
+    mainStorageFree: number
     // hardDisk: UI_I_SendDataNewHardDisk
     type: UI_T_HardDiskType
     index: number
@@ -196,17 +197,22 @@ 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 initialSize
+  //
+  // if (!storageLocal.value) return 0
+  // const free = (storageLocal.value.capacity.free_mb ||
+  //   storageLocal.value.free) as number // TODO fix
+  //
+  // if (props.type === 'edit') return free + initialSize
+  //
+  // return free
   if (props.type === 'exist') return initialSize
 
   if (!storageLocal.value) return 0
-  const free = (storageLocal.value.capacity.free_mb ||
-    storageLocal.value.capacity) as number // TODO fix
-
-  if (props.isEdit) return free + initialSize
 
-  return free
+  return props.mainStorageFree + size.value
 })
 const hardDiskTypeErrorLocalText = computed<string>(() => {
   if (size.value > maxHardDisk.value) {

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/New.vue

@@ -46,12 +46,15 @@
         />
       </template>
 
-      <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-note />
+      <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-note
+        :pci-device-index="props.index"
+      />
     </template>
   </ui-stack-block>
 </template>
 
 <script setup lang="ts">
+import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_T_PciDeviceType } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/types'
 import type {
@@ -62,13 +65,13 @@ import type {
 const selectedType = defineModel<UI_I_OptionItem>('selectedType', {
   required: true,
 })
-const directPathIo = defineModel<UI_I_PciDevice>('directPathIo', {
+const directPathIo = defineModel<string>('directPathIo', {
   required: true,
 })
-const dynamicDirectPathIo = defineModel<string>('dynamicDirectPathIo', {
+const dynamicDirectPathIo = defineModel<UI_I_PciDevice>('dynamicDirectPathIo', {
   required: true,
 })
-const nvidiaGridProfile = defineModel<string>('nvidiaGridProfile', {
+const nvidiaGridProfile = defineModel<UI_I_Option | null>('nvidiaGridProfile', {
   required: true,
 })