bfg-common 1.5.701 → 1.5.702

package/components/common/pages/hardwareHealth/tableView/lib/config/sensorTable.ts

@@ -1,165 +1,165 @@
-import type {
-  UI_I_HeadItem,
-  UI_I_ColumnKey,
-  UI_I_BodyItem,
-} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import type { UI_I_Localization } from '~//lib/models/interfaces'
-import type { UI_I_HardwareHealthSensors } from '~/components/common/pages/hardwareHealth/tableView/lib/models/interfaces'
-import { UI_E_SensorsCategoryIcon } from '~/components/common/pages/hardwareHealth/lib/models/enums'
-import {
-  constructHeadItem,
-  constructColumnKey,
-} from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
-import { hardwareHealthSensorTableKeys } from '~/components/common/pages/hardwareHealth/tableView/lib/config/tableKeys'
-import {
-  sensorsLocalizationByStatus,
-  sensorsIconByStatus,
-} from '~/components/common/pages/hardwareHealth/lib/config/status'
-
-const getItems = (
-  localization: UI_I_Localization
-): [string, boolean, string, string][] => {
-  return [
-    [
-      localization.common.sensors,
-      true,
-      '330px',
-      hardwareHealthSensorTableKeys[0],
-    ],
-    [
-      localization.common.status,
-      true,
-      '180px',
-      hardwareHealthSensorTableKeys[1],
-    ],
-    [
-      localization.common.reading,
-      true,
-      '115px',
-      hardwareHealthSensorTableKeys[2],
-    ],
-    [
-      localization.common.categories,
-      true,
-      '130px',
-      hardwareHealthSensorTableKeys[3],
-    ],
-    [
-      localization.common.lastUpdated,
-      true,
-      '195px',
-      hardwareHealthSensorTableKeys[4],
-    ],
-    [localization.common.path, true, '195px', hardwareHealthSensorTableKeys[5]],
-  ]
-}
-export const columnKeys = (
-  localization: UI_I_Localization
-): UI_I_ColumnKey[] => {
-  const result: UI_I_ColumnKey[] = []
-  getItems(localization).forEach((item, i) => {
-    const col = i === 1 || i === 3 ? 'icon' : `col${i}`
-    result.push(
-      constructColumnKey(col, item[0], item[1], `show-column-${item[3]}`)
-    )
-  })
-  return result
-}
-export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
-  const result: UI_I_HeadItem[] = []
-  getItems(localization).forEach((item, i) => {
-    const col = i === 1 || i === 3 ? 'icon' : `col${i}`
-    result.push(
-      constructHeadItem(
-        col,
-        item[0],
-        item[3],
-        true,
-        item[2],
-        undefined,
-        item[3]
-      )
-    )
-  })
-  return result
-}
-
-export const bodyItems = (
-  data: UI_I_HardwareHealthSensors[],
-  localization: UI_I_Localization
-): UI_I_BodyItem[][] => {
-  const bodyItems: UI_I_BodyItem[][] = []
-
-  const { $formattedDatetime }: any = useNuxtApp()
-
-  data.forEach((sensor: UI_I_HardwareHealthSensors, key) => {
-    const statusData = {
-      iconClassName: sensorsIconByStatus[sensor.status],
-      isSprite: false,
-      warning: sensor.warning,
-    }
-
-    const lastUpdate = sensor[hardwareHealthSensorTableKeys[4]]
-    const currentLastUpdate =
-      typeof lastUpdate === 'number'
-        ? $formattedDatetime(lastUpdate, {
-            hasSeconds: true,
-            separator: ', ',
-          })
-        : lastUpdate
-
-    bodyItems.push([
-      // {
-      //   data,
-      //   key: 'col0',
-      //   text: sensor[hardwareHealthSensorTableKeys[0]],
-      //   id: key,
-      //   isShowToggleIcon: !!sensor.sel_entries?.length,
-      // },
-      {
-        key: 'col0',
-        text: sensor[hardwareHealthSensorTableKeys[0]],
-        id: key,
-      },
-      {
-        key: 'icon',
-        text: localization.common[
-          sensorsLocalizationByStatus[sensor[hardwareHealthSensorTableKeys[1]]]
-        ],
-        id: key,
-        data: statusData,
-      },
-      {
-        key: 'col2',
-        text: sensor[hardwareHealthSensorTableKeys[2]],
-        id: key,
-      },
-      // {
-      //   key: 'icon',
-      //   text: sensor[hardwareHealthSensorTableKeys[4]]?.length,
-      //   id: key,
-      // },
-      {
-        key: 'icon',
-        text: sensor[hardwareHealthSensorTableKeys[3]],
-        id: key,
-        data: {
-          iconClassName:
-            UI_E_SensorsCategoryIcon[sensor.category.toLowerCase()],
-          isSprite: true,
-        },
-      },
-      {
-        key: 'col4',
-        text: currentLastUpdate,
-        id: key,
-      },
-      {
-        key: 'col5',
-        text: sensor[hardwareHealthSensorTableKeys[5]],
-        id: key,
-      },
-    ])
-  })
-  return bodyItems
-}
+import type {
+  UI_I_HeadItem,
+  UI_I_ColumnKey,
+  UI_I_BodyItem,
+} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import type { UI_I_Localization } from '~//lib/models/interfaces'
+import type { UI_I_HardwareHealthSensors } from '~/components/common/pages/hardwareHealth/tableView/lib/models/interfaces'
+import { UI_E_SensorsCategoryIcon } from '~/components/common/pages/hardwareHealth/lib/models/enums'
+import {
+  constructHeadItem,
+  constructColumnKey,
+} from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
+import { hardwareHealthSensorTableKeys } from '~/components/common/pages/hardwareHealth/tableView/lib/config/tableKeys'
+import {
+  sensorsLocalizationByStatus,
+  sensorsIconByStatus,
+} from '~/components/common/pages/hardwareHealth/lib/config/status'
+
+const getItems = (
+  localization: UI_I_Localization
+): [string, boolean, string, string][] => {
+  return [
+    [
+      localization.common.sensors,
+      true,
+      '330px',
+      hardwareHealthSensorTableKeys[0],
+    ],
+    [
+      localization.common.status,
+      true,
+      '180px',
+      hardwareHealthSensorTableKeys[1],
+    ],
+    [
+      localization.common.reading,
+      true,
+      '115px',
+      hardwareHealthSensorTableKeys[2],
+    ],
+    [
+      localization.common.categories,
+      true,
+      '130px',
+      hardwareHealthSensorTableKeys[3],
+    ],
+    [
+      localization.common.lastUpdated,
+      true,
+      '195px',
+      hardwareHealthSensorTableKeys[4],
+    ],
+    [localization.common.path, true, '195px', hardwareHealthSensorTableKeys[5]],
+  ]
+}
+export const columnKeys = (
+  localization: UI_I_Localization
+): UI_I_ColumnKey[] => {
+  const result: UI_I_ColumnKey[] = []
+  getItems(localization).forEach((item, i) => {
+    const col = i === 1 || i === 3 ? 'icon' : `col${i}`
+    result.push(
+      constructColumnKey(col, item[0], item[1], `show-column-${item[3]}`)
+    )
+  })
+  return result
+}
+export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
+  const result: UI_I_HeadItem[] = []
+  getItems(localization).forEach((item, i) => {
+    const col = i === 1 || i === 3 ? 'icon' : `col${i}`
+    result.push(
+      constructHeadItem(
+        col,
+        item[0],
+        item[3],
+        true,
+        item[2],
+        undefined,
+        item[3]
+      )
+    )
+  })
+  return result
+}
+
+export const bodyItems = (
+  data: UI_I_HardwareHealthSensors[],
+  localization: UI_I_Localization
+): UI_I_BodyItem[][] => {
+  const bodyItems: UI_I_BodyItem[][] = []
+
+  const { $formattedDatetime }: any = useNuxtApp()
+
+  data.forEach((sensor: UI_I_HardwareHealthSensors, key) => {
+    const statusData = {
+      iconClassName: sensorsIconByStatus[sensor.status],
+      isSprite: false,
+      warning: sensor.warning,
+    }
+
+    const lastUpdate = sensor[hardwareHealthSensorTableKeys[4]]
+    const currentLastUpdate =
+      typeof lastUpdate === 'number'
+        ? $formattedDatetime(lastUpdate, {
+            hasSeconds: true,
+            separator: ', ',
+          })
+        : lastUpdate
+
+    bodyItems.push([
+      // {
+      //   data,
+      //   key: 'col0',
+      //   text: sensor[hardwareHealthSensorTableKeys[0]],
+      //   id: key,
+      //   isShowToggleIcon: !!sensor.sel_entries?.length,
+      // },
+      {
+        key: 'col0',
+        text: sensor[hardwareHealthSensorTableKeys[0]],
+        id: key,
+      },
+      {
+        key: 'icon',
+        text: localization.common[
+          sensorsLocalizationByStatus[sensor[hardwareHealthSensorTableKeys[1]]]
+        ],
+        id: key,
+        data: statusData,
+      },
+      {
+        key: 'col2',
+        text: sensor[hardwareHealthSensorTableKeys[2]],
+        id: key,
+      },
+      // {
+      //   key: 'icon',
+      //   text: sensor[hardwareHealthSensorTableKeys[4]]?.length,
+      //   id: key,
+      // },
+      {
+        key: 'icon',
+        text: sensor[hardwareHealthSensorTableKeys[3]],
+        id: key,
+        data: {
+          iconClassName:
+            UI_E_SensorsCategoryIcon[sensor.category.toLowerCase()],
+          isSprite: true,
+        },
+      },
+      {
+        key: 'col4',
+        text: currentLastUpdate,
+        id: key,
+      },
+      {
+        key: 'col5',
+        text: sensor[hardwareHealthSensorTableKeys[5]],
+        id: key,
+      },
+    ])
+  })
+  return bodyItems
+}

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

@@ -270,20 +270,12 @@
             v-model:mediated_device_uuid="item.mediated_device_uuid"
             :key="props.pciDevicesIndex[key]"
             :index="props.pciDevicesIndex[key]"
-            :error-validation-fields="props.errorValidationFields"
             :passthrough-devices="props.passthroughDevices"
             :mediated-devices="props.mediatedDevices"
             :type="props.pciDevicesType[key]"
             :is-edit="props.isEdit"
             :state="props.state"
             @remove="emits('remove-pci-device', props.pciDevicesIndex[key])"
-            @invalid="
-              emits('set-invalid-pci-device', [
-                $event,
-                props.pciDevicesIndex[key],
-              ])
-            "
-            @remove-error-by-title="emits('remove-error-by-title', $event)"
           />
         </template>
         <common-vm-actions-common-customize-hardware-virtual-hardware-video-card
@@ -432,7 +424,6 @@ const emits = defineEmits<{
   (event: 'set-invalid-hard-disk', value: [boolean, number]): void
   (event: 'remove-error-by-title', value: string): void
   (event: 'roll-back-cd-dvd-drive', value: number): void
-  (event: 'set-invalid-pci-device', value: [boolean, number]): void
   (event: 'get-active-device-child', value: UI_I_FileTreeNode): void
   (
     event: 'send-data-new-cd-dvd-drive-method',

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

@@ -250,20 +250,12 @@
             v-model:mediated-device-uuid="item.mediated_device_uuid"
             :key="props.pciDevicesIndex[key]"
             :index="props.pciDevicesIndex[key]"
-            :error-validation-fields="props.errorValidationFields"
             :passthrough-devices="props.passthroughDevices"
             :mediated-devices="props.mediatedDevices"
             :type="props.pciDevicesType[key]"
             :is-edit="props.isEdit"
             :state="props.state"
             @remove="emits('remove-pci-device', props.pciDevicesIndex[key])"
-            @invalid="
-              emits('set-invalid-pci-device', [
-                $event,
-                props.pciDevicesIndex[key],
-              ])
-            "
-            @remove-error-by-title="emits('remove-error-by-title', $event)"
           />
         </template>
         <common-vm-actions-common-customize-hardware-virtual-hardware-video-card
@@ -312,8 +304,10 @@ import type {
 } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
 import type {
+  UI_T_CdDvdType,
   UI_T_HardDiskType,
   UI_T_NetworkType,
+  UI_T_PciDeviceType,
 } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/types'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type {
@@ -355,10 +349,10 @@ const props = withDefaults(
     hardDisksType: UI_T_HardDiskType[]
     networksIndex: number[]
     hardDisksIndex: number[]
-    pciDevicesType: UI_T_NetworkType[]
+    pciDevicesType: UI_T_PciDeviceType[]
     isShowFileModal: boolean
     pciDevicesIndex: number[]
-    cdDvdDrivesType: UI_T_NetworkType[]
+    cdDvdDrivesType: UI_T_CdDvdType[]
     cdDvdDrivesIndex: number[]
     errorValidationFields: UI_I_ErrorValidationField[]
     getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
@@ -377,8 +371,8 @@ const props = withDefaults(
     state: undefined,
     videoCard: undefined,
     guestMachineType: undefined,
-    passthroughDevices: undefined,
-    mediatedDevices: undefined,
+    passthroughDevices: () => [],
+    mediatedDevices: () => [],
     vmCpuHelpTextSecond: undefined,
     computeResource: undefined,
   }
@@ -403,7 +397,6 @@ const emits = defineEmits<{
   (event: 'set-invalid-hard-disk', value: [boolean, number]): void
   (event: 'remove-error-by-title', value: string): void
   (event: 'roll-back-cd-dvd-drive', value: number): void
-  (event: 'set-invalid-pci-device', value: [boolean, number]): void
   (event: 'get-active-device-child', value: UI_I_FileTreeNode): void
   (
     event: 'send-data-new-cd-dvd-drive-method',

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

@@ -53,7 +53,6 @@
     @set-invalid-hard-disk="onSetInvalidHardDisk(...$event)"
     @remove-error-by-title="emits('remove-error-by-title', $event)"
     @roll-back-cd-dvd-drive="onRollBackCdDvdDrive"
-    @set-invalid-pci-device="onSetInvalidPciDevice(...$event)"
     @get-active-device-child="emits('get-active-device-child', $event)"
     @send-data-new-hard-disk-method="onSendDataNewHardDiskMethod(...$event)"
     @send-data-new-cd-dvd-drive-method="sendDataNewCdDvdDriveMethod(...$event)"
@@ -571,13 +570,6 @@ const onRemovePciDevice = (index: number): void => {
     model.value.passthrough_pci_devices.filter((_pciDevice, key: number) => {
       return removeIndex !== key
     })
-  // pciDevicesLocal.value = pciDevicesLocal.value.filter(
-  //   (_pciDevice, key: number) => {
-  //     return removeIndex !== key
-  //   }
-  // )
-
-  delete newPciDeviceInvalidKeys.value[index]
 }
 
 const isShowFileModal = ref<boolean>(false)
@@ -633,15 +625,10 @@ const onSetInvalidNetwork = (invalid: boolean, key: number): void => {
   newNetworkInvalidKeys.value[key] = invalid
 }
 
-const onSetInvalidPciDevice = (invalid: boolean, key: number): void => {
-  newPciDeviceInvalidKeys.value[key] = invalid
-}
-
 const memoryInvalid = ref<boolean>(false)
 const videoCardInvalid = ref<boolean>(false)
 const newHardDiskInvalidKeys = ref<UI_I_InvalidKeys>({})
 const newNetworkInvalidKeys = ref<UI_I_InvalidKeys>({})
-const newPciDeviceInvalidKeys = ref<UI_I_InvalidKeys>({})
 
 watch(
   [
@@ -649,7 +636,6 @@ watch(
     memoryInvalid,
     newHardDiskInvalidKeys,
     newNetworkInvalidKeys,
-    newPciDeviceInvalidKeys,
     videoCardInvalid,
   ],
   () => {
@@ -682,18 +668,6 @@ watch(
         ' ' +
         (+key + 1)
     })
-    // let pciDevice = ''
-    // Object.keys(newPciDeviceInvalidKeys.value).forEach((key) => {
-    //   if (!newPciDeviceInvalidKeys.value[+key]) {
-    //     return
-    //   }
-    //
-    //   pciDevice +=
-    //     (pciDevice ? ', ' : '') +
-    //     localization.value.common.pciDevice +
-    //     ' ' +
-    //     (+key + 1)
-    // })
 
     emits('invalid', [cpu, memory, newHardDisk, newNetwork, videoCard])
   },

package/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces.ts

@@ -105,9 +105,11 @@ export interface UI_I_SendDataNewCdDvdDrive {
 }
 export interface UI_I_SendDataNewPciDevice {
   address: string
+  vendor_name: string
   class_name: string
   device_name: string
-  vendor_name: string
+  mediated_device: boolean
+  mediated_device_uuid?: string
 }
 
 export interface UI_I_HardDisk {

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/New.vue

@@ -46,12 +46,15 @@
         />
       </template>
 
-      <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-note />
+      <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-note
+        :pci-device-index="props.index"
+      />
     </template>
   </ui-stack-block>
 </template>
 
 <script setup lang="ts">
+import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_T_PciDeviceType } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/types'
 import type {
@@ -62,13 +65,13 @@ import type {
 const selectedType = defineModel<UI_I_OptionItem>('selectedType', {
   required: true,
 })
-const directPathIo = defineModel<UI_I_PciDevice>('directPathIo', {
+const directPathIo = defineModel<string>('directPathIo', {
   required: true,
 })
-const dynamicDirectPathIo = defineModel<string>('dynamicDirectPathIo', {
+const dynamicDirectPathIo = defineModel<UI_I_PciDevice>('dynamicDirectPathIo', {
   required: true,
 })
-const nvidiaGridProfile = defineModel<string>('nvidiaGridProfile', {
+const nvidiaGridProfile = defineModel<UI_I_Option | null>('nvidiaGridProfile', {
   required: true,
 })
 

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/NewPciDevice.vue

@@ -33,7 +33,7 @@ const address = defineModel<string>('address')
 const vendorName = defineModel<string>('vendorName')
 const className = defineModel<string>('className')
 const deviceName = defineModel<string>('deviceName')
-const mediatedDevice = defineModel<string>('mediatedDevice')
+const mediatedDevice = defineModel<boolean>('mediatedDevice')
 const mediatedDeviceUuid = defineModel<string>('mediatedDeviceUuid')
 
 const props = withDefaults(
@@ -44,7 +44,6 @@ const props = withDefaults(
     type: UI_T_PciDeviceType
     isEdit: boolean
     state?: string | number
-    // errorValidationFields: UI_I_ErrorValidationField<string>[]
   }>(),
   {
     state: undefined,
@@ -69,7 +68,8 @@ const isRunning = computed<boolean>(() => {
 })
 
 const isRemovable = computed<boolean>(() => {
-  return !props.isEdit || !isRunning.value
+  // return !props.isEdit || !isRunning.value
+  return props.type !== 'edit' || !isRunning.value
 })
 
 const label = computed<string>(() => {
@@ -85,11 +85,12 @@ const selectedLabel = computed<string>(() => {
   }
   switch (selectedType.value.value) {
     case 'direct_path_io':
-      return `${directPathIo.value?.address} | ${directPathIo.value?.device_name}`
+      return directPathIo.value
+      // return `${directPathIo.value?.address} | ${directPathIo.value?.device_name}`
     case 'dynamic_direct_path_io':
       return `${dynamicDirectPathIo.value?.address} | ${dynamicDirectPathIo.value?.device_name}`
     default:
-      return nvidiaGridProfile.value?.text
+      return nvidiaGridProfile.value?.text || ''
   }
 })
 
@@ -104,16 +105,11 @@ pciDeviceTypeOptions.value.forEach((option) => {
   if (!option.disabled) selectedType.value = option
 })
 
-const directPathIo = ref<string>('') /// TODO
+const directPathIo = ref<string>('')
 const dynamicDirectPathIo = ref<UI_I_PciDevice>(props.passthroughDevices[0])
 const nvidiaGridProfile = ref<UI_I_Option | null>(null)
 
-const set = (): void => {
-  // const passthroughDevice = props.passthroughDevices.find(
-  //   (item) => item.address === newValue.address
-  // )
-  // passthroughDevice && (directPathIo.value = passthroughDevice) // Todo change
-  // directPathIo.value = newValue1
+const setData = (): void => {
   const passthroughDevice = props.passthroughDevices.find((device) => {
     return (
       device.class_name + '_' + device.address ===
@@ -145,53 +141,11 @@ const set = (): void => {
 watch(
   () => props.mediatedDevices,
   () => {
-    // if (props.isEdit) set()
-    set() // for edit
+    setData() // for edit
   },
   { immediate: true, deep: true }
 )
 
-// watch(
-//   [() => props.pciDevice, () => props.mediatedDevices],
-//   ([newValue1]) => {
-//     // const passthroughDevice = props.passthroughDevices.find(
-//     //   (item) => item.address === newValue.address
-//     // )
-//     // passthroughDevice && (directPathIo.value = passthroughDevice) // Todo change
-//     if (newValue1) {
-//       // directPathIo.value = newValue1
-//       const passthroughDevice = props.passthroughDevices.find((device) => {
-//         return (
-//           device.class_name + '_' + device.address ===
-//           newValue1.class_name + '_' + newValue1.address
-//         )
-//       })
-//       if (passthroughDevice) {
-//         dynamicDirectPathIo.value = passthroughDevice
-//       }
-//
-//       const mediatedDevice = props.mediatedDevices.find((device) => {
-//         return (
-//           device.profile_name + '_' + device.root_device ===
-//           newValue1.class_name + '_' + newValue1.address
-//         )
-//       })
-//       if (mediatedDevice) {
-//         nvidiaGridProfile.value = {
-//           text: mediatedDevice.human_readable,
-//           value: mediatedDevice.profile_name + '_' + mediatedDevice.root_device,
-//         }
-//
-//         selectedType.value =
-//           pciDeviceTypeOptions.value.find(
-//             (option) => option.value === 'nvidia_grid'
-//           ) || selectedType.value
-//       }
-//     }
-//   },
-//   { immediate: true, deep: true }
-// )
-
 const sendData = computed<UI_I_SendDataNewPciDevice>(() => {
   const nvidia = props.mediatedDevices.find(
     (device) =>
@@ -244,7 +198,6 @@ watch(
     deviceName.value = newValue.device_name
     mediatedDevice.value = newValue.mediated_device
     mediatedDeviceUuid.value = newValue.mediated_device_uuid || ''
-    // emits('send-data', props.type === 'edit' ? props.pciDevice : newValue)
   },
   { immediate: true }
 )