bfg-common 1.5.558 → 1.5.559

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/shares/Shares.vue

@@ -1,140 +1,140 @@
-<template>
-  <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-shares-new
-    v-if="isNewView"
-    v-model:shares-type="sharesTypeLocal"
-    v-model:shares="sharesLocal"
-    :disabled="props.disabled"
-    :shares-type-options="sharesTypeOptions"
-    :shares-errors-texts="sharesLocalAndApiErrorsTexts"
-    :shares-options="sharesOptions"
-    :is-disabled-shares="isDisabledShares"
-    @change-shares-type="onChangeSharesType"
-    @remove-error="onRemoveValidationError"
-  />
-  <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-shares-old
-    v-else
-    v-model:shares-type="sharesTypeLocal"
-    v-model:shares="sharesLocal"
-    :disabled="props.disabled"
-    :shares-type-options="sharesTypeOptions"
-    :shares-errors-texts="sharesLocalAndApiErrorsTexts"
-    :shares-options="sharesOptions"
-    :is-disabled-shares="isDisabledShares"
-    @change-shares-type="onChangeSharesType"
-    @remove-error="onRemoveValidationError"
-  />
-</template>
-
-<script setup lang="ts">
-import type {
-  UI_I_Localization,
-  UI_I_HTMLSelectElement,
-} 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 {
-  sharesTypeOptionsFunc,
-  sharesOptionsFunc,
-} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/shares/lib/config/options'
-
-const props = defineProps<{
-  shares: string
-  sharesType: string
-  disabled: boolean
-  errorValidationFields: UI_I_ErrorValidationField<string>[]
-}>()
-const emits = defineEmits<{
-  (event: 'update:shares', value: string): void
-  (event: 'update:shares-type', value: string): void
-  (event: 'invalid', value: boolean): void
-  (event: 'remove-error-by-title', value: string): void
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const apiErrorLocal = computed<string>(() => {
-  return (
-    props.errorValidationFields?.find(
-      (message) => message.field === 'cpu.shares'
-    )?.error_message || ''
-  )
-})
-
-const maxShares = 262_144
-const sharesOptions = computed<UI_I_OptionItem[]>(() => {
-  return sharesOptionsFunc(localization.value, maxShares)
-})
-
-const sharesTypeOptions = ref<UI_I_OptionItem[]>(
-  sharesTypeOptionsFunc(localization.value)
-)
-
-const isDisabledShares = computed<boolean>(
-  () => sharesTypeLocal.value !== '2' || props.disabled
-)
-const sharesLocal = computed<string>({
-  get() {
-    return props.shares
-  },
-  set(newValue) {
-    emits('update:shares', newValue)
-  },
-})
-const sharesTypeLocal = computed<string>({
-  get() {
-    return props.sharesType
-  },
-  set(newValue) {
-    emits('update:shares-type', newValue)
-  },
-})
-const onChangeSharesType = (event: UI_I_HTMLSelectElement): void => {
-  const value = event.target.value
-  if (value === '2') return
-  sharesLocal.value = event.target.value
-}
-
-const sharesErrorLocalText = computed<string>(() => {
-  if (+sharesLocal.value < 2 || +sharesLocal.value > maxShares) {
-    return localization.value.common.sharesMustBe
-      .replace('{0}', '2')
-      .replace('{1}', maxShares + '')
-  }
-
-  const validValue = /^\d+(\.\d+)?$/.test(sharesLocal.value + '')
-  if (!validValue) {
-    return localization.value.common.inputContainsInvalidCharacters
-  }
-
-  return ''
-})
-const sharesInvalid = computed<boolean>(() => !!sharesErrorLocalText.value)
-watch(
-  sharesInvalid,
-  (newValue) => {
-    emits('invalid', newValue)
-  },
-  { immediate: true }
-)
-
-const sharesLocalAndApiErrorsTexts = computed<string>(() => {
-  const localError = sharesErrorLocalText.value
-  const apiError = apiErrorLocal.value
-
-  let result = ''
-  if (localError && !apiError) result = localError
-  if (localError && apiError) result = localError + ', ' + apiError
-  if (!localError) result = apiError
-
-  return result
-})
-
-const onRemoveValidationError = (): void => {
-  emits('remove-error-by-title', 'cpu.shares')
-}
-</script>
-
-<style scoped></style>
+<template>
+  <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-shares-new
+    v-if="isNewView"
+    v-model:shares-type="sharesTypeLocal"
+    v-model:shares="sharesLocal"
+    :disabled="props.disabled"
+    :shares-type-options="sharesTypeOptions"
+    :shares-errors-texts="sharesLocalAndApiErrorsTexts"
+    :shares-options="sharesOptions"
+    :is-disabled-shares="isDisabledShares"
+    @change-shares-type="onChangeSharesType"
+    @remove-error="onRemoveValidationError"
+  />
+  <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-shares-old
+    v-else
+    v-model:shares-type="sharesTypeLocal"
+    v-model:shares="sharesLocal"
+    :disabled="props.disabled"
+    :shares-type-options="sharesTypeOptions"
+    :shares-errors-texts="sharesLocalAndApiErrorsTexts"
+    :shares-options="sharesOptions"
+    :is-disabled-shares="isDisabledShares"
+    @change-shares-type="onChangeSharesType"
+    @remove-error="onRemoveValidationError"
+  />
+</template>
+
+<script setup lang="ts">
+import type {
+  UI_I_Localization,
+  UI_I_HTMLSelectElement,
+} 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 {
+  sharesTypeOptionsFunc,
+  sharesOptionsFunc,
+} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/shares/lib/config/options'
+
+const props = defineProps<{
+  shares: string
+  sharesType: string
+  disabled: boolean
+  errorValidationFields: UI_I_ErrorValidationField<string>[]
+}>()
+const emits = defineEmits<{
+  (event: 'update:shares', value: string): void
+  (event: 'update:shares-type', value: string): void
+  (event: 'invalid', value: boolean): void
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const apiErrorLocal = computed<string>(() => {
+  return (
+    props.errorValidationFields?.find(
+      (message) => message.field === 'cpu.shares'
+    )?.error_message || ''
+  )
+})
+
+const maxShares = 262_144
+const sharesOptions = computed<UI_I_OptionItem[]>(() => {
+  return sharesOptionsFunc(localization.value, maxShares)
+})
+
+const sharesTypeOptions = ref<UI_I_OptionItem[]>(
+  sharesTypeOptionsFunc(localization.value)
+)
+
+const isDisabledShares = computed<boolean>(
+  () => sharesTypeLocal.value !== '2' || props.disabled
+)
+const sharesLocal = computed<string>({
+  get() {
+    return props.shares
+  },
+  set(newValue) {
+    emits('update:shares', newValue)
+  },
+})
+const sharesTypeLocal = computed<string>({
+  get() {
+    return props.sharesType
+  },
+  set(newValue) {
+    emits('update:shares-type', newValue)
+  },
+})
+const onChangeSharesType = (event: UI_I_HTMLSelectElement): void => {
+  const value = event.target.value
+  if (value === '2') return
+  sharesLocal.value = event.target.value
+}
+
+const sharesErrorLocalText = computed<string>(() => {
+  if (+sharesLocal.value < 2 || +sharesLocal.value > maxShares) {
+    return localization.value.common.sharesMustBe
+      .replace('{0}', '2')
+      .replace('{1}', maxShares + '')
+  }
+
+  const validValue = /^\d+(\.\d+)?$/.test(sharesLocal.value + '')
+  if (!validValue) {
+    return localization.value.common.inputContainsInvalidCharacters
+  }
+
+  return ''
+})
+const sharesInvalid = computed<boolean>(() => !!sharesErrorLocalText.value)
+watch(
+  sharesInvalid,
+  (newValue) => {
+    emits('invalid', newValue)
+  },
+  { immediate: true }
+)
+
+const sharesLocalAndApiErrorsTexts = computed<string>(() => {
+  const localError = sharesErrorLocalText.value
+  const apiError = apiErrorLocal.value
+
+  let result = ''
+  if (localError && !apiError) result = localError
+  if (localError && apiError) result = localError + ', ' + apiError
+  if (!localError) result = apiError
+
+  return result
+})
+
+const onRemoveValidationError = (): void => {
+  emits('remove-error-by-title', 'cpu.shares')
+}
+</script>
+
+<style scoped></style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/shares/lib/config/options.ts

@@ -1,28 +1,28 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-
-export const sharesOptionsFunc = (
-  localization: UI_I_Localization,
-  maxShares: number
-): UI_I_OptionItem[] => {
-  return [
-    {
-      text: `${localization.common.minimum} 2`,
-      value: 2,
-    },
-    {
-      text: `${localization.common.maximum} ${maxShares}`,
-      value: maxShares,
-    },
-  ]
-}
-export const sharesTypeOptionsFunc = (
-  localization: UI_I_Localization
-): UI_I_OptionItem[] => {
-  return [
-    { text: localization.common.low, value: '1000' },
-    { text: localization.common.normal, value: '2000' },
-    { text: localization.common.high, value: '4000' },
-    { text: localization.common.custom, value: '2' },
-  ]
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+
+export const sharesOptionsFunc = (
+  localization: UI_I_Localization,
+  maxShares: number
+): UI_I_OptionItem[] => {
+  return [
+    {
+      text: `${localization.common.minimum} 2`,
+      value: 2,
+    },
+    {
+      text: `${localization.common.maximum} ${maxShares}`,
+      value: maxShares,
+    },
+  ]
+}
+export const sharesTypeOptionsFunc = (
+  localization: UI_I_Localization
+): UI_I_OptionItem[] => {
+  return [
+    { text: localization.common.low, value: '1000' },
+    { text: localization.common.normal, value: '2000' },
+    { text: localization.common.high, value: '4000' },
+    { text: localization.common.custom, value: '2' },
+  ]
+}

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

@@ -10,7 +10,7 @@
     v-model:limit="limit"
     v-model:limit-type="limitType"
     v-model:limit-invalid="limitInvalid"
-    v-model:memory-hot-plug="model.memory.hotplug"
+    v-model:memory-hot-plug="memoryHotPlug"
     :error-validation-fields="props.errorValidationFields"
     :memory-invalid="memoryInvalid"
     :error-text="memorySizeLocalAndApiErrorsTexts"
@@ -35,7 +35,7 @@
     v-model:limit="limit"
     v-model:limit-type="limitType"
     v-model:limit-invalid="limitInvalid"
-    v-model:memory-hot-plug="model.memory.hotplug"
+    v-model:memory-hot-plug="memoryHotPlug"
     :error-validation-fields="props.errorValidationFields"
     :memory-invalid="memoryInvalid"
     :error-text="memorySizeLocalAndApiErrorsTexts"
@@ -52,29 +52,31 @@
 </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 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
+    memory?: API_UI_I_VmEditMemory
   }>(),
   {
     state: undefined,
+    memory: undefined,
   }
 )
 const emits = defineEmits<{
+  (event: 'send-data', value: UI_I_SendDataMemory): void
   (event: 'invalid', value: boolean): void
   (event: 'remove-error-by-title', value: string): void
 }>()
@@ -101,7 +103,7 @@ const isDisabled = computed<boolean>(() => {
 })
 
 const isMemoryDisabled = computed<boolean>(
-  () => isDisabled.value && !model.value.memory.hotplug
+  () => isDisabled.value && !memoryHotPlug.value
 )
 
 const selectedMemory = ref<number>(4)
@@ -120,18 +122,6 @@ const memoryInMb = computed<number>(() => {
 
   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)
@@ -221,26 +211,6 @@ watch(reservation, (newValue) => {
 })
 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) => {
@@ -250,47 +220,90 @@ watch(limit, (newValue) => {
 })
 const limitType = ref<string>('mb')
 const limitOptions = computed<UI_I_OptionItem[] | undefined>(() => {
-  if (model.value.memory.hotplug)
+  if (memoryHotPlug.value)
     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'
-    }
-  }
-}
+
+const memoryHotPlug = ref<boolean>(false)
+const isDisabledMemoryHotPlug = computed<boolean>(
+  () => memoryInMb.value >= props.maxMemory || isDisabled.value
+)
+watch(isDisabledMemoryHotPlug, (newValue) => {
+  if (newValue) memoryHotPlug.value = false
+})
+
 watch(
-  [limit, limitType],
+  [memoryInMb, memoryHotPlug, reservation, reservationType, limit, limitType],
   () => {
-    model.value.memory.limit_mb =
+    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,
+    })
   },
-  { deep: true, immediate: true }
+  { immediate: true }
 )
 
-// const memoryHotPlug = ref<boolean>(false)
-const isDisabledMemoryHotPlug = computed<boolean>(
-  () => memoryInMb.value >= props.maxMemory || isDisabled.value
+// Добавляем данные для редактирования
+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 }
 )
-watch(isDisabledMemoryHotPlug, (newValue) => {
-  if (newValue) model.value.memory.hotplug = false
-})
 
 const onRemoveValidationError = (): void => {
   emits('remove-error-by-title', 'memory.size_mb')