bfg-common 1.5.244 → 1.5.245

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

@@ -1,307 +1,307 @@
-<template>
-  <common-vm-actions-common-customize-hardware-virtual-hardware-memory-new
-    v-if="isNewView"
-    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="memoryHotPlug"
-    :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)"
-  />
-  <common-vm-actions-common-customize-hardware-virtual-hardware-memory-old
-    v-else
-    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="memoryHotPlug"
-    :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)"
-  />
-</template>
-
-<script setup lang="ts">
-import type { API_UI_I_VmEditMemory } from '~/lib/models/store/vm/interfaces'
-import type { UI_I_SendDataMemory } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
-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 {
-  memoryOptionsFunc,
-  memoryTypeOptionsFunc,
-} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/lib/config/memoryOptions'
-
-const props = defineProps<{
-  maxMemory: number
-  isEdit: boolean
-  errorValidationFields: UI_I_ErrorValidationField[]
-  state?: string | number
-  memory?: API_UI_I_VmEditMemory
-}>()
-const emits = defineEmits<{
-  (event: 'send-data', value: UI_I_SendDataMemory): void
-  (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 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 && !memoryHotPlug.value
-)
-
-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')
-})
-
-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)
-
-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 (memoryHotPlug.value)
-    return memoryOptionsFunc(
-      localization.value,
-      memoryInMb.value,
-      props.maxMemory
-    )
-})
-
-const memoryHotPlug = ref<boolean>(false)
-const isDisabledMemoryHotPlug = computed<boolean>(
-  () => memoryInMb.value >= props.maxMemory || isDisabled.value
-)
-watch(isDisabledMemoryHotPlug, (newValue) => {
-  if (newValue) memoryHotPlug.value = false
-})
-
-watch(
-  [memoryInMb, memoryHotPlug, reservation, reservationType, limit, limitType],
-  () => {
-    const reservationInMb =
-      reservationType.value === 'mb'
-        ? reservation.value
-        : '' +
-          $binary.universalFromTo(
-            reservation.value,
-            reservationType.value,
-            'mb',
-            12
-          )
-    const limitInMb =
-      limit.value === 'Unlimited'
-        ? limit.value
-        : limitType.value === 'gb'
-        ? $binary.gbToMb(+limit.value)
-        : +limit.value
-    emits('send-data', {
-      memory: '' + memoryInMb.value,
-      hotplug: memoryHotPlug.value,
-      reservation_mb: reservationInMb,
-      limit_mb: limitInMb,
-    })
-  },
-  { immediate: true }
-)
-
-// Добавляем данные для редактирования
-watch(
-  () => props.memory,
-  (newValue) => {
-    if (!newValue) return
-
-    const sizeInGb = $binary.mbToGb(newValue.size_mb)
-    if (sizeInGb < 1) {
-      selectedMemory.value = newValue.size_mb
-      memoryType.value = 'mb'
-    } else {
-      selectedMemory.value = sizeInGb
-    }
-
-    const reservationInGb = $binary.mbToGb(newValue.reservation_mb)
-    if (reservationInGb < 1) {
-      reservation.value = newValue.reservation_mb
-      reservationType.value = 'mb'
-    } else {
-      reservation.value = reservationInGb
-      reservationType.value = 'gb'
-    }
-
-    if (typeof newValue.limit_mb === 'string') limit.value = newValue.limit_mb
-    else {
-      const limitInGb = $binary.mbToGb(newValue.limit_mb)
-      if (limitInGb < 1) {
-        limit.value = newValue.limit_mb
-        limitType.value = 'mb'
-      } else {
-        limit.value = limitInGb
-        limitType.value = 'gb'
-      }
-    }
-
-    memoryHotPlug.value = newValue.hotplug
-  },
-  { immediate: true }
-)
-
-const onRemoveValidationError = (): void => {
-  emits('remove-error-by-title', 'memory.size_mb')
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <common-vm-actions-common-customize-hardware-virtual-hardware-memory-new
+    v-if="isNewView"
+    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="memoryHotPlug"
+    :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)"
+  />
+  <common-vm-actions-common-customize-hardware-virtual-hardware-memory-old
+    v-else
+    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="memoryHotPlug"
+    :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)"
+  />
+</template>
+
+<script setup lang="ts">
+import type { API_UI_I_VmEditMemory } from '~/lib/models/store/vm/interfaces'
+import type { UI_I_SendDataMemory } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
+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 {
+  memoryOptionsFunc,
+  memoryTypeOptionsFunc,
+} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/lib/config/memoryOptions'
+
+const props = defineProps<{
+  maxMemory: number
+  isEdit: boolean
+  errorValidationFields: UI_I_ErrorValidationField[]
+  state?: string | number
+  memory?: API_UI_I_VmEditMemory
+}>()
+const emits = defineEmits<{
+  (event: 'send-data', value: UI_I_SendDataMemory): void
+  (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 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 && !memoryHotPlug.value
+)
+
+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')
+})
+
+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)
+
+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 (memoryHotPlug.value)
+    return memoryOptionsFunc(
+      localization.value,
+      memoryInMb.value,
+      props.maxMemory
+    )
+})
+
+const memoryHotPlug = ref<boolean>(false)
+const isDisabledMemoryHotPlug = computed<boolean>(
+  () => memoryInMb.value >= props.maxMemory || isDisabled.value
+)
+watch(isDisabledMemoryHotPlug, (newValue) => {
+  if (newValue) memoryHotPlug.value = false
+})
+
+watch(
+  [memoryInMb, memoryHotPlug, reservation, reservationType, limit, limitType],
+  () => {
+    const reservationInMb =
+      reservationType.value === 'mb'
+        ? reservation.value
+        : '' +
+          $binary.universalFromTo(
+            reservation.value,
+            reservationType.value,
+            'mb',
+            12
+          )
+    const limitInMb =
+      limit.value === 'Unlimited'
+        ? limit.value
+        : limitType.value === 'gb'
+        ? $binary.gbToMb(+limit.value)
+        : +limit.value
+    emits('send-data', {
+      memory: '' + memoryInMb.value,
+      hotplug: memoryHotPlug.value,
+      reservation_mb: reservationInMb,
+      limit_mb: limitInMb,
+    })
+  },
+  { immediate: true }
+)
+
+// Добавляем данные для редактирования
+watch(
+  () => props.memory,
+  (newValue) => {
+    if (!newValue) return
+
+    const sizeInGb = $binary.mbToGb(newValue.size_mb)
+    if (sizeInGb < 1) {
+      selectedMemory.value = newValue.size_mb
+      memoryType.value = 'mb'
+    } else {
+      selectedMemory.value = sizeInGb
+    }
+
+    const reservationInGb = $binary.mbToGb(newValue.reservation_mb)
+    if (reservationInGb < 1) {
+      reservation.value = newValue.reservation_mb
+      reservationType.value = 'mb'
+    } else {
+      reservation.value = reservationInGb
+      reservationType.value = 'gb'
+    }
+
+    if (typeof newValue.limit_mb === 'string') limit.value = newValue.limit_mb
+    else {
+      const limitInGb = $binary.mbToGb(newValue.limit_mb)
+      if (limitInGb < 1) {
+        limit.value = newValue.limit_mb
+        limitType.value = 'mb'
+      } else {
+        limit.value = limitInGb
+        limitType.value = 'gb'
+      }
+    }
+
+    memoryHotPlug.value = newValue.hotplug
+  },
+  { immediate: true }
+)
+
+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/memory/MemoryNew.vue

@@ -1,5 +1,9 @@
 <template>
-  <ui-stack-block :has-children="true" test-id="memory-stack-block">
+  <ui-stack-block
+    :has-children="true"
+    test-id="memory-stack-block"
+    is-toggle-on-stack-view-key
+  >
     <template #stackBlockKey>
       <div
         id="vm-wizard-toggle-block-memory"

package/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/hotPlug/HotPlugNew.vue

@@ -1,7 +1,9 @@
 <template>
   <ui-stack-block :has-children="false">
     <template #stackBlockKey>
-      {{ localization.common.memoryHotPlug }}
+      <span class="limit-title">
+        {{ localization.common.memoryHotPlug }}
+      </span>
     </template>
     <template #stackBlockContent>
       <ui-checkbox
@@ -26,4 +28,8 @@ const props = defineProps<{
 }>()
 </script>
 
-<style scoped></style>
+<style scoped>
+.limit-title {
+  margin-right: 12px;
+}
+</style>