bfg-common 1.1.52 → 1.1.54

package/components/common/vm/actions/add/customizeHardware/virtualHardware/VirtualHardware.vue

@@ -251,7 +251,8 @@ const addHardDisk = (
   hardDisksIndex.value.push(newIndex)
   hardDisksType.value.push(type)
 
-  hardDisks.value.push({ create, size, source })
+  hardDisks.value.push({ create, size, source, attach: props.isEdit })
+  sendData()
 }
 const onAddExistHardDisk = (hardDisk: UI_I_HardDisk): void => {
   addHardDisk(false, $binary.bToGb(hardDisk.size), hardDisk.path, 'exist')
@@ -259,7 +260,7 @@ const onAddExistHardDisk = (hardDisk: UI_I_HardDisk): void => {
 const onRemoveHardDisk = (index: number, hardDisk: UI_I_SendDataNewHardDisk): void => {
   const removeIndex = hardDisksIndex.value.indexOf(index)
 
-  if (!hardDisk.create) {
+  if (!hardDisk.create && !hardDisk.attach) {
     hardDisksType.value = hardDisksType.value.map((item, key) => {
       if (key === removeIndex) return 'removed'
       return item

package/components/common/vm/actions/add/customizeHardware/virtualHardware/limit/Limit.vue

@@ -66,9 +66,11 @@ const props = withDefaults(
     errorValidationFields: UI_I_ErrorValidationField<string>[]
     disabled?: boolean
     limitOptions?: UI_I_OptionItem[]
+    multiply?: number
   }>(),
   {
     limitOptions: undefined,
+    multiply: 1,
   }
 )
 const emits = defineEmits<{
@@ -111,24 +113,10 @@ const limitLocalByLocalization = computed<string>({
 })
 const limitLocal = computed<string>({
   get() {
-    return $binary.universalFromTo(
-      props.limit,
-      binaryKeys[0],
-      limitTypeLocal.value,
-      8
-    )
+    return props.limit
   },
   set(newValue) {
-    emits(
-      'update:limit',
-      '' +
-        $binary.universalFromTo(
-          newValue,
-          limitTypeLocal.value,
-          binaryKeys[0],
-          8
-        )
-    )
+    emits('update:limit', '' + newValue)
   },
 })
 const limitTypeLocal = computed<string>({
@@ -163,21 +151,27 @@ const onSelectLimit = ({
 }
 
 const limitErrorLocalText = computed<string>(() => {
-  const value = $binary.universalFromTo(
+  const valueForMin = $binary.universalFromTo(
+    +limitLocal.value,
+    limitTypeLocal.value,
+    limitOptionsLocal.value[0].value.type,
+    0
+  )
+  const valueForMax = $binary.universalFromTo(
     +limitLocal.value,
     limitTypeLocal.value,
-    binaryKeys[0],
-    8
+    limitOptionsLocal.value[1].value.type,
+    0
   )
   const minValue = limitOptionsLocal.value[0].value.value
   const maxValue = limitOptionsLocal.value[1].value.value
-  if (value < minValue) {
+  if (valueForMin < minValue) {
     return localization.value.limitMustBe.replace(
       '{0}',
       `${minValue} ${localization.value[binaryKeys[0]]}`
     )
   }
-  if (props.limitOptions && value > maxValue) {
+  if (props.limitOptions && valueForMax > maxValue) {
     return localization.value.limitMustBeMax.replace(
       '{0}',
       `${maxValue} ${localization.value[binaryKeys[0]]}`
@@ -193,6 +187,19 @@ const limitErrorLocalText = computed<string>(() => {
     return localization.value.inputContainsInvalidCharacters
   }
 
+  const value = $binary.universalFromTo(
+      +limitLocal.value,
+      limitTypeLocal.value,
+      binaryKeys[0],
+      0
+  )
+  if (value % props.multiply !== 0) {
+    return localization.value.valueShouldMultiple.replace(
+      '{0}',
+      `${props.multiply} ${binaryKeys[0].toUpperCase()}`
+    )
+  }
+
   return ''
 })
 const limitInvalid = computed<boolean>(() => !!limitErrorLocalText.value)

package/components/common/vm/actions/add/customizeHardware/virtualHardware/limit/config/options.ts

@@ -8,11 +8,11 @@ export const limitOptionsFunc = (
   return [
     {
       text: `${localization.minimum}: 0 ${localization[binaryKeys[0]]}`,
-      value: { value: 0, type: 'mb' },
+      value: { value: 0, type: binaryKeys[0] },
     },
     {
       text: `${localization.maximum}: ${localization.unlimited}`,
-      value: { value: 'Unlimited', type: 'mb' },
+      value: { value: 'Unlimited', type: binaryKeys[0] },
     },
   ]
 }

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

@@ -28,7 +28,7 @@
                 :disabled="isMemoryDisabled"
                 class="input-text-color"
                 @click.stop
-                @select="selectMemory"
+                @select="onSelectMemory"
               />
             </template>
             <template #content>{{ memorySizeLocalAndApiErrorsTexts }}</template>
@@ -71,6 +71,7 @@
           v-model:limit-type="limitType"
           :error-validation-fields="props.errorValidationFields"
           :limit-options="limitOptions"
+          :multiply="2"
           :disabled="isDisabled"
           type="mb"
           component-type="memory"
@@ -136,7 +137,8 @@ const isMemoryDisabled = computed<boolean>(
 
 const selectedMemory = ref<number>(4)
 watch(selectedMemory, (newValue) => {
-  selectedMemory.value = parseInt('' + newValue)
+  const valueInt = parseInt('' + newValue)
+  selectedMemory.value = isNaN(valueInt) ? 0 : valueInt
 })
 const memoryType = ref<string>('gb')
 const memoryTypeOptions = ref<UI_I_OptionItem[]>(
@@ -153,13 +155,23 @@ const memoryInMb = computed<number>(() => {
 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
+const onSelectMemory = ({
+  value,
+  type,
+}: {
+  value: number
+  type: string
+}): void => {
+  selectedMemory.value = value
+  if (memoryType.value !== type) {
+    memoryType.value = type
   }
-
-  selectedMemory.value = $binary.universalFromTo(mb, 'mb', memoryType.value, 12)
+  // if (memoryType.value === 'mb') {
+  //   selectedMemory.value = mb
+  //   return
+  // }
+  //
+  // selectedMemory.value = $binary.universalFromTo(mb, 'mb', memoryType.value, 12)
 }
 
 const memoryErrorLocalText = computed<string>(() => {
@@ -223,12 +235,17 @@ watch(
 
 const reservation = ref<string>('2')
 watch(reservation, (newValue) => {
-  reservation.value = '' + parseInt(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)

package/components/common/vm/actions/add/customizeHardware/virtualHardware/memory/config/memoryOptions.ts

@@ -7,17 +7,20 @@ export const memoryOptionsFunc = (
   max: number
 ): UI_I_OptionItem[] => {
   const { $binary } = useNuxtApp()
+  const minValueText = $binary.round(min)
+  const [value, type] = minValueText.split(' ')
+  const maxValue = $binary.mbToGb(max, 0)
+
   return [
     {
-      text: `${localization.minimum}: ${$binary.round(min)}`,
-      // text: `${localization.minimum} ${min} ${localization.mb}`,
-      value: { value: min, type: 'mb' },
+      text: `${localization.minimum}: ${minValueText}`,
+      value: { value: +value, type: type.toLowerCase() },
     },
     {
-      text: `${localization.maximum}: ${$binary.mbToGb(max, 0)} ${
+      text: `${localization.maximum}: ${maxValue} ${
         localization.gb
       }`,
-      value: { value: max, type: 'gb' },
+      value: { value: maxValue, type: 'gb' },
     },
   ]
 }

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

@@ -364,6 +364,7 @@ watch(
 
     emits('send-data', {
       create: props.hardDisk.create,
+      attach: props.hardDisk.attach,
       source: props.hardDisk.source,
       size: sizeInMb.value,
       bus: bus.value,

package/components/common/vm/actions/editSettings/utils.ts

@@ -37,7 +37,7 @@ export const constructDiskDevicesFunc = (
           io: disk.io ?? '',
           limit_iops: disk.limit_iops ?? 0,
           discard: disk.discard ?? '',
-          attach: disk.attach ?? false,
+          attach: disk.attach ?? true,
           detach: disk.detach ?? false,
           remove: disk.remove ?? false,
           create: disk.create ?? true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.1.52",
+  "version": "1.1.54",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",