bfg-common 1.4.66 → 1.4.68

package/components/common/vm/actions/add/Add.vue

@@ -234,8 +234,8 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 
 watch(
   () => props.capabilities,
-  (newValue) => {
-    if (newValue) mapCapabilities(props.capabilities)
+  () => {
+    if (props.capabilities) mapCapabilities(props.capabilities)
   },
   { deep: true, immediate: true }
 )

package/components/common/vm/actions/common/customizeHardware/CustomizeHardware.vue

@@ -36,6 +36,7 @@
         :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
         :passthrough-devices="props.passthroughDevices"
         :project="props.project"
+        :guest-machine-type="guestMachineTypeLocal"
         @send-data="onSendDataVirtualHardwareMethod"
         @get-storage="emits('get-storage', $event)"
         @get-folders-or-files="emits('get-folders-or-files', $event)"

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

@@ -45,6 +45,7 @@
           :datastore="props.datastore"
           :is-edit="props.isEdit"
           :state="props.state"
+          :guest-machine-type="props.guestMachineType"
           @remove="onRemoveHardDisk(hardDisksIndex[key], item)"
           @roll-back="onRollBackHardDisk(hardDisksIndex[key])"
           @send-data="onSendDataNewHardDiskMethod($event, hardDisksIndex[key])"
@@ -80,6 +81,7 @@
           :error-validation-fields="props.errorValidationFields"
           :is-edit="props.isEdit"
           :state="props.state"
+          :guest-machine-type="props.guestMachineType"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
           @get-storage="emits('get-storage', $event)"
           @get-folders-or-files="emits('get-folders-or-files', $event)"
@@ -210,6 +212,7 @@ const props = defineProps<{
   pciDevices?: UI_I_SendDataNewPciDevice[]
   passthroughDevices?: UI_I_PciDevice[]
   project: UI_T_Project
+  guestMachineType?: UI_I_OptionItem | null
 }>()
 const emits = defineEmits<{
   (event: 'send-data', value: UI_I_SendDataVirtualHardware): void

package/components/common/vm/actions/common/customizeHardware/virtualHardware/bus/Bus.vue

@@ -83,6 +83,7 @@ const props = defineProps<{
   disabled?: boolean
   shortOptions?: boolean
   helpText?: string
+  guestMachineType?: UI_I_OptionItem | null
 }>()
 const emits = defineEmits<{
   (event: 'update:bus', value: string): void
@@ -91,7 +92,9 @@ const emits = defineEmits<{
 
 const helpId = ref<string>(`bus-field-help-icon${useUniqueId()}`)
 
-const busOptions = computed<UI_I_OptionItem[]>(() => capabilities.bus)
+const busOptions = computed<UI_I_OptionItem[]>(() =>
+  props.guestMachineType ? capabilities.bus[props.guestMachineType.value] : []
+)
 
 const busLocal = computed<string>({
   get() {

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/CdDvdDrive.vue

@@ -80,6 +80,7 @@
           :test-id="`vm-wizard-cd-dvd-bus-field-${props.index}`"
           short-options
           component-type="disk_devices"
+          :guest-machine-type="props.guestMachineType"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
       </template>
@@ -129,6 +130,7 @@ const props = defineProps<{
   type: UI_T_CdDvdType
   isEdit: boolean
   state?: string | number
+  guestMachineType?: UI_I_OptionItem | null
 }>()
 
 const emits = defineEmits<{

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

@@ -162,6 +162,7 @@
           :help-text="localization.common.busVirtioHelpDesc"
           :test-id="`vm-wizard-disk-bus-field-${props.index}`"
           component-type="disk_devices"
+          :guest-machine-type="props.guestMachineType"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
       </template>
@@ -192,6 +193,7 @@ const props = defineProps<{
   datastore: UI_I_DatastoreTableItem[]
   isEdit: boolean
   state?: string | number
+  guestMachineType?: UI_I_OptionItem | null
 }>()
 const emits = defineEmits<{
   (event: 'send-data', value: UI_I_SendDataNewHardDisk): void

package/components/common/vm/actions/common/lib/config/capabilities.ts

@@ -338,7 +338,7 @@ export const capabilities: UI_I_Compatibility = {
       },
     ],
   },
-  bus: [],
+  bus: {},
   maxCpus: 140,
   maxMemory: 262144, // 256 GB
 }

package/components/common/vm/actions/common/lib/utils/capabilities.ts

@@ -27,20 +27,17 @@ export const mapCapabilities = (
     }
   )
 
+  Object.keys(capabilitiesFromApi.bus_types).forEach(key => {
+      capabilities.bus[key] = Object.keys(capabilitiesFromApi.bus_types[key]).map(
+          (key2) => {
+              return {
+                  text: capabilitiesFromApi.bus_types[key][key2],
+                  value: key2,
+              }
+          }
+      )
+  })
+
   capabilities.maxCpus = capabilitiesFromApi.max_vcpus
   capabilities.maxMemory = $binary.kbToMb(capabilitiesFromApi.max_mem_kib)
 }
-
-export const mapCapabilitiesBus = (machineType: string): void => {
-  if (capabilities.dataFromApi) {
-    const buseType = capabilities.dataFromApi.bus_types[machineType]
-    capabilities.bus = Object.keys(buseType).map(
-        (key) => {
-          return {
-            text: buseType[key],
-            value: key,
-          }
-        }
-    )
-  }
-}

package/components/common/vm/actions/common/select/lib/models/interfaces.ts

@@ -28,7 +28,7 @@ export interface UI_I_Compatibility {
   guestOsVersions: UI_I_ArbitraryObject<UI_I_OptionItem[]>
   machineTypes: UI_I_OptionItem[]
   cpuModels: UI_I_OptionItem[]
-  bus: UI_I_OptionItem[]
+  bus: UI_I_ArbitraryObject<UI_I_OptionItem[]>
   maxCpus: number
   maxMemory: number
   dataFromApi?: UI_I_Capabilities

package/components/common/vm/actions/common/select/os/os.vue

@@ -98,7 +98,6 @@ import type {
 } 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 { mapCapabilitiesBus } from '~/components/common/vm/actions/common/lib/utils/capabilities'
 
 const props = defineProps<{
   familiesOptions: UI_I_OptionItem[]
@@ -122,13 +121,6 @@ watch(
   },
   { immediate: true }
 )
-watch(
-  selectedMachineType,
-  (newValue) => {
-    newValue && mapCapabilitiesBus(newValue.value)
-  },
-  { immediate: true, deep: true }
-)
 
 const osOptions = ref<UI_I_OptionItem[]>(props.familiesOptions)
 const selectedOS = ref<UI_I_OptionItem | null>(null)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.66",
+  "version": "1.4.68",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -16,7 +16,7 @@
     "@vueuse/core": "^10.1.2",
     "@vueuse/nuxt": "^10.1.2",
     "eslint-config-prettier": "^8.5.0",
-    "nuxt": "3.11.2",
+    "nuxt": "3.13.1",
     "prettier": "2.7.1",
     "sass": "^1.54.9",
     "sass-loader": "^10.3.1",