bfg-common 1.0.14 → 1.0.16

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

@@ -1,278 +1,282 @@
-<template>
-  <div class="hardware-memory">
-    <atoms-stack-block :has-children="true">
-      <template #stackBlockKey>
-        <div id="vm-wizard-toggle-block-memory" class="flex-align-center">
-          <span>{{ localization.memory }}</span>
-          <atoms-the-icon
-            v-show="memoryInvalid"
-            width="24px"
-            height="24px"
-            class="is-error tooltip-trigger"
-            name="info"
-          />
-        </div>
-      </template>
-      <template #stackBlockContent>
-        <div class="flex-align-center">
-          <atoms-tooltip-error
-            :has-error="!!memorySizeLocalAndApiErrorsTexts"
-            selector="#vm-wizard-memory-field input"
-            @remove="onRemoveValidationError"
-          >
-            <template #elem>
-              <atoms-combobox
-                id="vm-wizard-memory-field"
-                v-model="selectedMemory"
-                :items="memoryOptions"
-                :disabled="isMemoryDisabled"
-                @click.stop
-                @select="selectMemory"
-              />
-            </template>
-            <template #content>{{ memorySizeLocalAndApiErrorsTexts }}</template>
-          </atoms-tooltip-error>
-
-          <div class="select ml-1">
-            <select
-              id="vm-wizard-memory-type-select"
-              v-model="memoryType"
-              @click.stop
-            >
-              <option
-                v-for="(item, key) in memoryTypeOptions"
-                :key="key"
-                :value="item.value"
-              >
-                {{ item.text }}
-              </option>
-            </select>
-          </div>
-        </div>
-      </template>
-      <template #stackChildren>
-        <common-vm-actions-add-customize-hardware-virtual-hardware-reservation
-          v-model:reservation="reservation"
-          v-model:reservation-type="reservationType"
-          v-model:reserve-guest-memory="reserveGuestMemory"
-          :error-validation-fields="props.errorValidationFields"
-          :multiply="2"
-          :disabled="isDisabled"
-          component-type="memory"
-          type="mb"
-          class="memory-reservation"
-          @remove-error-by-title="emits('remove-error-by-title', $event)"
-          @invalid="reservationInvalid = $event"
-        />
-        <common-vm-actions-add-customize-hardware-virtual-hardware-limit
-          v-model:limit="limit"
-          v-model:limit-type="limitType"
-          :error-validation-fields="props.errorValidationFields"
-          :limit-options="limitOptions"
-          :disabled="isDisabled"
-          type="mb"
-          component-type="memory"
-          class="memory-limit"
-          @invalid="limitInvalid = $event"
-          @remove-error-by-title="emits('remove-error-by-title', $event)"
-        />
-        <common-vm-actions-add-customize-hardware-virtual-hardware-memory-hot-plug
-          v-model:memory-hot-plug="memoryHotPlug"
-          :disabled="isDisabledMemoryHotPlug"
-        />
-      </template>
-    </atoms-stack-block>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { API_UI_I_VmEditMemory } from '~/models/store/vm/interfaces'
-import { UI_I_SendDataMemory } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/models/interfaces'
-import { UI_I_Localization } from '~/models/interfaces'
-import { UI_I_ErrorValidationField } from '~/models/store/interfaces'
-import { UI_I_OptionItem } from '~/components/atoms/models/interfaces'
-import { binaryOptionsFunc } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/config/binaryOptions'
-import { memoryOptionsFunc } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/memory/config/memoryOptions'
-
-const props = defineProps<{
-  maxMemory: number
-  isEdit: boolean
-  errorValidationFields: UI_I_ErrorValidationField<string>[]
-  state?: string
-  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 localization = computed<UI_I_Localization>(() => useLocal())
-const { $binary } = useNuxtApp()
-
-const minMemoryInMb = 128
-watch(
-  () => props.maxMemory,
-  (newValue) => {
-    memoryOptions.value = memoryOptionsFunc(
-      localization.value,
-      minMemoryInMb,
-      newValue
-    )
-  }
-)
-
-const isDisabled = computed<boolean>(() => {
-  return props.state === '1'
-})
-
-const isMemoryDisabled = computed<boolean>(
-  () => isDisabled.value && !memoryHotPlug.value
-)
-
-const selectedMemory = ref<number>(4)
-const memoryType = ref<string>('gb')
-const memoryTypeOptions = ref<UI_I_OptionItem[]>(
-  binaryOptionsFunc(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 selectMemory = (mb: number): void => {
-  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.inputContainsInvalidCharacters
-  }
-
-  const maxMemoryInGb = $binary.mbToGb(props.maxMemory)
-  if (memoryInMb.value < minMemoryInMb || memoryInMb.value > props.maxMemory) {
-    return localization.value.memoryMustBe
-      .replace('{0}', `${minMemoryInMb} ${localization.value.mb}`)
-      .replace('{1}', `${maxMemoryInGb} ${localization.value.gb}`)
-  }
-
-  if (memoryInMb.value % 2 !== 0) {
-    return localization.value.valueShouldMultiple.replace(
-      '{0}',
-      `${2} ${localization.value.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, (val) => {
-  emits('invalid', val)
-})
-
-const reservation = ref<string>('2')
-const reservationType = ref<string>('mb')
-const reserveGuestMemory = ref<boolean>(false)
-
-const limit = ref<string>('Unlimited')
-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(
-  () => memoryInMb.value >= props.maxMemory || isDisabled.value
-)
-watch(isDisabledMemoryHotPlug, (newValue) => {
-  if (newValue) memoryHotPlug.value = false
-})
-
-watch(
-  [memoryInMb, memoryHotPlug, reservation, reservationType, limit],
-  () => {
-    const reservationInMb =
-      reservationType.value === 'mb'
-        ? reservation.value
-        : '' +
-          $binary.universalFromTo(
-            reservation.value,
-            reservationType.value,
-            'mb',
-            12
-          )
-    emits('send-data', {
-      memory: '' + memoryInMb.value,
-      hotplug: memoryHotPlug.value,
-      reservation_mb: reservationInMb,
-      limit_mb: limit.value,
-    })
-  },
-  { immediate: true }
-)
-
-// Добавляем данные для редактирования
-watch(
-  () => props.memory,
-  (newValue) => {
-    if (!newValue) return
-
-    selectedMemory.value = $binary.mbToGb(newValue.size_mb)
-    reservation.value = '' + newValue.reservation_mb
-    limit.value = '' + newValue.limit_mb
-    memoryHotPlug.value = newValue.hotplug
-  },
-  { immediate: true }
-)
-
-const onRemoveValidationError = (): void => {
-  emits('remove-error-by-title', 'memory.size_mb')
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <div class="hardware-memory">
+    <atoms-stack-block :has-children="true">
+      <template #stackBlockKey>
+        <div id="vm-wizard-toggle-block-memory" class="flex-align-center">
+          <span>{{ localization.memory }}</span>
+          <atoms-the-icon
+            v-show="memoryInvalid"
+            width="24px"
+            height="24px"
+            class="is-error tooltip-trigger"
+            name="info"
+          />
+        </div>
+      </template>
+      <template #stackBlockContent>
+        <div class="flex-align-center">
+          <atoms-tooltip-error
+            :has-error="!!memorySizeLocalAndApiErrorsTexts"
+            selector="#vm-wizard-memory-field input"
+            @remove="onRemoveValidationError"
+          >
+            <template #elem>
+              <atoms-combobox
+                id="vm-wizard-memory-field"
+                v-model="selectedMemory"
+                :items="memoryOptions"
+                :disabled="isMemoryDisabled"
+                @click.stop
+                @select="selectMemory"
+              />
+            </template>
+            <template #content>{{ memorySizeLocalAndApiErrorsTexts }}</template>
+          </atoms-tooltip-error>
+
+          <div class="select ml-1">
+            <select
+              id="vm-wizard-memory-type-select"
+              v-model="memoryType"
+              @click.stop
+            >
+              <option
+                v-for="(item, key) in memoryTypeOptions"
+                :key="key"
+                :value="item.value"
+              >
+                {{ item.text }}
+              </option>
+            </select>
+          </div>
+        </div>
+      </template>
+      <template #stackChildren>
+        <common-vm-actions-add-customize-hardware-virtual-hardware-reservation
+          v-model:reservation="reservation"
+          v-model:reservation-type="reservationType"
+          v-model:reserve-guest-memory="reserveGuestMemory"
+          :error-validation-fields="props.errorValidationFields"
+          :multiply="2"
+          :disabled="isDisabled"
+          component-type="memory"
+          type="mb"
+          class="memory-reservation"
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+          @invalid="reservationInvalid = $event"
+        />
+        <common-vm-actions-add-customize-hardware-virtual-hardware-limit
+          v-model:limit="limit"
+          v-model:limit-type="limitType"
+          :error-validation-fields="props.errorValidationFields"
+          :limit-options="limitOptions"
+          :disabled="isDisabled"
+          type="mb"
+          component-type="memory"
+          class="memory-limit"
+          @invalid="limitInvalid = $event"
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+        />
+        <common-vm-actions-add-customize-hardware-virtual-hardware-memory-hot-plug
+          v-model:memory-hot-plug="memoryHotPlug"
+          :disabled="isDisabledMemoryHotPlug"
+        />
+      </template>
+    </atoms-stack-block>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { API_UI_I_VmEditMemory } from '~/models/store/vm/interfaces'
+import { UI_I_SendDataMemory } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/models/interfaces'
+import { UI_I_Localization } from '~/models/interfaces'
+import { UI_I_ErrorValidationField } from '~/models/store/interfaces'
+import { UI_I_OptionItem } from '~/components/atoms/models/interfaces'
+import { binaryOptionsFunc } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/config/binaryOptions'
+import { memoryOptionsFunc } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/memory/config/memoryOptions'
+
+const props = defineProps<{
+  maxMemory: number
+  isEdit: boolean
+  errorValidationFields: UI_I_ErrorValidationField[]
+  state?: string
+  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 localization = computed<UI_I_Localization>(() => useLocal())
+const { $binary } = useNuxtApp()
+
+const minMemoryInMb = 128
+watch(
+  () => props.maxMemory,
+  (newValue) => {
+    memoryOptions.value = memoryOptionsFunc(
+      localization.value,
+      minMemoryInMb,
+      newValue
+    )
+  }
+)
+
+const isDisabled = computed<boolean>(() => {
+  return props.state === '1'
+})
+
+const isMemoryDisabled = computed<boolean>(
+  () => isDisabled.value && !memoryHotPlug.value
+)
+
+const selectedMemory = ref<number>(4)
+const memoryType = ref<string>('gb')
+const memoryTypeOptions = ref<UI_I_OptionItem[]>(
+  binaryOptionsFunc(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 selectMemory = (mb: number): void => {
+  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.inputContainsInvalidCharacters
+  }
+
+  const maxMemoryInGb = $binary.mbToGb(props.maxMemory)
+  if (memoryInMb.value < minMemoryInMb || memoryInMb.value > props.maxMemory) {
+    return localization.value.memoryMustBe
+      .replace('{0}', `${minMemoryInMb} ${localization.value.mb}`)
+      .replace('{1}', `${maxMemoryInGb} ${localization.value.gb}`)
+  }
+
+  if (memoryInMb.value % 2 !== 0) {
+    return localization.value.valueShouldMultiple.replace(
+      '{0}',
+      `${2} ${localization.value.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')
+const reservationType = ref<string>('mb')
+const reserveGuestMemory = ref<boolean>(false)
+
+const limit = ref<string>('Unlimited')
+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],
+  () => {
+    const reservationInMb =
+      reservationType.value === 'mb'
+        ? reservation.value
+        : '' +
+          $binary.universalFromTo(
+            reservation.value,
+            reservationType.value,
+            'mb',
+            12
+          )
+    emits('send-data', {
+      memory: '' + memoryInMb.value,
+      hotplug: memoryHotPlug.value,
+      reservation_mb: reservationInMb,
+      limit_mb: limit.value,
+    })
+  },
+  { immediate: true }
+)
+
+// Добавляем данные для редактирования
+watch(
+  () => props.memory,
+  (newValue) => {
+    if (!newValue) return
+
+    selectedMemory.value = $binary.mbToGb(newValue.size_mb)
+    reservation.value = '' + newValue.reservation_mb
+    limit.value = '' + newValue.limit_mb
+    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/add/customizeHardware/virtualHardware/newHardDisk/Location.vue

@@ -96,18 +96,18 @@ const locationOptions = ref<UI_I_OptionItem[]>([])
 
 watch(
   () => props.location,
-  (val) => {
-    if (locationOptions.value.length || !val) {
+  (newValue) => {
+    if (locationOptions.value.length || !newValue) {
       return
     }
 
     locationOptions.value = [
-      { text: localization.value.storeWithVirtualMachine, value: val.id },
+      { text: localization.value.storeWithVirtualMachine, value: newValue.id },
       { text: `${localization.value.browse}...`, value: -1 },
     ]
-    selectedLocation.value = val.id
-    storages.value.push(val)
-    addStorage(val)
+    selectedLocation.value = newValue.id
+    storages.value.push(newValue)
+    addStorage(newValue)
   },
   { immediate: true }
 )
@@ -133,15 +133,15 @@ const changeStorage = (storage: UI_I_DatastoreTableItem): void => {
 const onHideStorageModal = (): void => {
   storageModalIsShow.value = false
 }
-const changeLocation = (e: UI_I_HTMLSelectElement): void => {
-  const value = +e.target.value
+const changeLocation = (event: UI_I_HTMLSelectElement): void => {
+  const value = +event.target.value
   if (value === -1) {
     storageModalIsShow.value = true
     return
   }
 
-  selectedLocation.value = e.target.value
-  const storage = storages.value.find((item) => item.id === e.target.value)
+  selectedLocation.value = event.target.value
+  const storage = storages.value.find((item) => item.id === event.target.value)
   storage && emits('change', storage)
 }
 

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

@@ -308,9 +308,9 @@ const onRollBackHardDisk = (): void => {
 const location = ref<UI_I_DatastoreTableItem | null>(props.storage || null)
 watch(
   () => props.storage,
-  (val) => {
-    location.value = val
-    storage.value = val
+  (newValue) => {
+    location.value = newValue
+    storage.value = newValue
   }
 )
 const storage = ref<UI_I_DatastoreTableItem | null>(props.storage)
@@ -428,9 +428,13 @@ watch(
 const hardDiskInvalid = computed<boolean>(() => {
   return !!hardDiskTypeErrorLocalText.value || limitIopsInvalid.value
 })
-watch(hardDiskInvalid, (val) => {
-  emits('invalid', val)
-})
+watch(
+  hardDiskInvalid,
+  (newValue) => {
+    emits('invalid', newValue)
+  },
+  { immediate: true }
+)
 </script>
 
 <style scoped lang="scss">

package/components/common/vm/actions/add/customizeHardware/virtualHardware/newHardDisk/cache/Cache.vue

@@ -46,7 +46,7 @@ const props = defineProps<{
   cache: string
   index: number
   disabled: boolean
-  errorValidationFields: UI_I_ErrorValidationField<string>[]
+  errorValidationFields: UI_I_ErrorValidationField[]
 }>()
 const emits = defineEmits<{
   (event: 'update:cache', value: string): void

package/components/common/vm/actions/add/customizeHardware/virtualHardware/newHardDisk/limitIops/LimitIops.vue

@@ -125,9 +125,13 @@ const limitIopsErrorText = computed<string>(() => {
   }
   return ''
 })
-watch(limitIopsErrorText, (val) => {
-  emits('valid', !!val)
-})
+watch(
+  limitIopsErrorText,
+  (newValue) => {
+    emits('valid', !!newValue)
+  },
+  { immediate: true }
+)
 
 const typeError = computed<string>(() => `disk_devices[${props.index}].io`)