bfg-common 1.5.201 → 1.5.203

package/components/common/pages/scheduledTasks/modals/common/frequency/lib/config/frequencyOptions.ts

@@ -11,7 +11,7 @@ export const frequencyMethodFunc = (
       disabled: true,
     },
     {
-      label: localization.common.once,
+      label: localization.scheduledTasks.once,
       value: 'once',
     },
     {

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/Cpu.vue

@@ -308,11 +308,26 @@ watch(
     selectedCpu.value = newValue.vcpus
     selectedMaxCpu.value = newValue.hotplug ? newValue.max_vcpus : 1
     selectedCorePerSocket.value = newValue.core_per_socket
-    reservation.value = '' + newValue.reservation_mhz
-    limit.value = '' + newValue.limit_mhz
     shares.value = '' + newValue.shares
     sharesType.value = '' + newValue.shares
 
+    const reservationInGhz = $binary.mhzToGhz(newValue.reservation_mhz)
+    if (reservationInGhz < 1) {
+      reservation.value = newValue.reservation_mhz.toString()
+      reservationType.value = 'mhz'
+    } else {
+      reservation.value = reservationInGhz
+      reservationType.value = 'ghz'
+    }
+    const limitInGhz = $binary.mhzToGhz(newValue.limit_mhz)
+    if (limitInGhz < 1) {
+      limit.value = newValue.limit_mhz.toString()
+      limitType.value = 'mhz'
+    } else {
+      limit.value = limitInGhz
+      limitType.value = 'ghz'
+    }
+
     switch (newValue.model) {
       case 'host-passthrough':
         passthroughHostCpu.value = true

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

@@ -273,8 +273,24 @@ watch(
       selectedMemory.value = sizeInGb
     }
 
-    reservation.value = '' + newValue.reservation_mb
-    limit.value = '' + newValue.limit_mb
+    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'
+    }
+
+    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 }

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

@@ -167,8 +167,7 @@ const maxHardDisk = computed<number>(() => {
   if (!storage.value) return 0
   const free = storage.value.capacity.free_mb || storage.value.capacity // TODO fix
 
-  if (props.isEdit)
-    return free + hardDiskSizeMb
+  if (props.isEdit) return free + hardDiskSizeMb
 
   return free
 })
@@ -214,10 +213,10 @@ const sizeInMb = computed<number>(() => {
 })
 const onValidateSize = (): void => {
   if (props.type !== 'edit') return
-  if (sizeInMb.value < $binary.gbToMb(props.hardDisk.size)) {
+  if (sizeInMb.value < props.hardDisk.size) {
     size.value = $binary.universalFromTo(
       props.hardDisk.size,
-      'gb',
+      'mb',
       hardDiskType.value
     )
   }
@@ -334,6 +333,14 @@ watch(
     // if (props.type !== 'edit') return
     if (props.type !== 'edit' && props.type !== 'clone') return
 
+    const sizeInGb = $binary.mbToGb(newValue.size)
+    if (sizeInGb < 1) {
+      size.value = newValue.size
+      hardDiskType.value = 'mb'
+    } else {
+      size.value = sizeInGb
+      hardDiskType.value = 'gb'
+    }
     diskProvisioning.value = newValue.provision_type || 'thick'
     sharing.value = newValue.sharing ? 'yes' : ''
     shares.value = newValue.shares || 0

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

@@ -269,6 +269,10 @@ const localization = computed<UI_I_Localization>(() => useLocal())
     margin: 0 12px;
     border-right: 1px solid var(--device-will-removed-border-color);
     border-left: 1px solid var(--device-will-removed-border-color);
+
+    :deep(.ui-checkbox-label-text) {
+      word-break: break-word;
+    }
   }
 }
 

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

@@ -5,6 +5,7 @@
       :is-roll-back="props.type === 'removed'"
       :removable="props.isRemovable"
       :test-id="`hard-disk-stack-block-${props.index}`"
+      class="stack-block"
       @remove="emits('remove')"
       @roll-back="emits('roll-back')"
     >
@@ -27,25 +28,27 @@
       <template #stackBlockContent>
         <div class="flex-align-center flex-space-between mr-1">
           <template v-if="props.type === 'removed'">
-            <span>{{ localization.common.deviceWillRemoved }}</span>
-            <div class="flex-align-center" @click.stop>
-              <input
-                :id="`hard-disk-delete-files-from-datastore-${props.index}`"
-                v-model="deleteFilesFromDatastore"
-                :data-id="`hard-disk-delete-files-from-datastore-${props.index}`"
-                :disabled="props.disabled"
-                type="checkbox"
-                class="cursor-pointer"
-                @click.stop
-              />
-              <label
-                :for="`hard-disk-delete-files-from-datastore-${props.index}`"
-                :class="[
+            <div class="flex flex-col">
+              <span>{{ localization.common.deviceWillRemoved }}</span>
+              <div class="flex-align-center" @click.stop>
+                <input
+                    :id="`hard-disk-delete-files-from-datastore-${props.index}`"
+                    v-model="deleteFilesFromDatastore"
+                    :data-id="`hard-disk-delete-files-from-datastore-${props.index}`"
+                    :disabled="props.disabled"
+                    type="checkbox"
+                    class="cursor-pointer"
+                    @click.stop
+                />
+                <label
+                    :for="`hard-disk-delete-files-from-datastore-${props.index}`"
+                    :class="[
                   'label-text-normal cursor-pointer',
                   props.disabled && 'div-disabled',
                 ]"
                 >{{ localization.common.deleteFilesFromDatastore }}</label
-              >
+                >
+              </div>
             </div>
           </template>
           <template v-else>
@@ -247,4 +250,11 @@ const localization = computed<UI_I_Localization>(() => useLocal())
     }
   }
 }
+.hardware-hard-disk {
+  .stack-block {
+    :deep(.stack-block-label) {
+      align-items: center;
+    }
+  }
+}
 </style>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.201",
+  "version": "1.5.203",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -34,7 +34,7 @@
     "@nuxtjs/eslint-config-typescript": "^12.0.0",
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
-    "bfg-nuxt-3-graph": "1.0.26",
+    "bfg-nuxt-3-graph": "1.0.25",
     "bfg-uikit": "1.0.430",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"