bfg-common 1.3.191 → 1.3.192

package/components/common/diagramMain/Diagram.vue

@@ -65,7 +65,7 @@
 import {
   UI_I_Adapter,
   UI_I_AdaptersWithPositions,
-  UI_I_DiagramDataFull,
+  UI_I_DiagramData,
   UI_I_ModalsInitialData,
   UI_I_NetworksWithPositions,
   UI_I_SelectedAdapter,
@@ -75,7 +75,7 @@ import {
 import { UI_E_PositionsY } from '~/components/common/diagramMain/lib/models/enums'
 
 const props = defineProps<{
-  diagramData: UI_I_DiagramDataFull | null
+  diagramData: UI_I_DiagramData
   isShowDiagram: boolean
   inPortlet: boolean
   networksWithPositions: UI_I_NetworksWithPositions[]

package/components/common/diagramMain/DiagramMain.vue

@@ -240,6 +240,8 @@ import {
   UI_I_ToggleDiagramAdaptersPayload,
   UI_I_ToggleDiagramPortsPayload,
   UI_I_PortToggleFlag,
+  UI_I_DiagramData,
+  UI_I_SwitchAdapters,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import {
   UI_I_ArbitraryObject,
@@ -280,21 +282,16 @@ import {
   countAdaptersHeight,
   getAdaptersPositions,
 } from '~/components/common/diagramMain/lib/utils/utils'
-import {
-  UI_I_DiagramDataFull,
-  UI_I_NetworkFull,
-  UI_I_SwitchAdapters,
-} from '~/components/common/diagramMain/lib/models/interfaces'
 
 const props = withDefaults(
   defineProps<{
-    diagramData: UI_I_DiagramDataFull | null
+    diagramData: UI_I_DiagramData
     inPortlet?: boolean
     standardSwitchesInitial?: UI_I_Switch[]
     hostName?: string
     adapters?: UI_I_SwitchAdapters
     freeAdapters?: UI_I_Adapter[]
-    networksList?: UI_I_NetworkFull[]
+    networksList?: UI_I_Network[]
     isDarkMode: boolean
   }>(),
   {

package/components/common/diagramMain/lib/config/index.ts

@@ -1,12 +1,12 @@
 import {
   UI_I_Adapter,
   UI_I_ModalsInitialData,
-  UI_I_NetworkFull,
+  UI_I_Network,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import * as initial from '~/components/common/diagramMain/lib/config/initial'
 
 export const dataForSelectedNetworkFunc = (
-  network: UI_I_NetworkFull
+  network: UI_I_Network
 ): UI_I_ModalsInitialData => ({
   networkLabel: network.title,
   vlanId: network.vlanId === '--' ? 0 : network.vlanId,

package/components/common/diagramMain/lib/models/interfaces.ts

@@ -97,7 +97,18 @@ export interface UI_I_NetworkSummaryPortletListItem<
   initialValue: UI_I_OverrideValue<T>
 }
 
-export interface UI_I_Network {
+
+export interface UI_I_NetworkInfo {
+  average_bw: number
+  burst_size: number
+  nicTeamingPolicy: UI_I_NetworkSummaryPortletListItem[]
+  nics_override: boolean
+  peak_bw: number
+  securityPolicy: UI_I_NetworkSummaryPortletListItem[]
+  shapingPolicy: UI_I_NetworkSummaryPortletListItem[]
+}
+
+export interface UI_I_Network extends UI_I_NetworkInfo {
   activeAdapters: string[]
   id: string
   networkType: UI_E_NetworkType
@@ -111,28 +122,16 @@ export interface UI_I_Network {
   vlanId?: number | string
 }
 
-export interface UI_I_NetworkInfo {
-  average_bw: number
-  burst_size: number
-  nicTeamingPolicy: UI_I_NetworkSummaryPortletListItem[]
-  nics_override: boolean
-  peak_bw: number
-  securityPolicy: UI_I_NetworkSummaryPortletListItem[]
-  shapingPolicy: UI_I_NetworkSummaryPortletListItem[]
-}
-
-export interface UI_I_NetworkFull extends UI_I_Network, UI_I_NetworkInfo {}
-
 export interface UI_I_SwitchInfo extends UI_I_NetworkInfo {
   mtu: number
   num_ports: string
-  activeAdapters: UI_I_Adapter[]
-  standbyAdapters: UI_I_Adapter[]
-  unusedAdapters: UI_I_Adapter[]
+  activeAdapters: UI_I_Adapter[] | string[]
+  standbyAdapters: UI_I_Adapter[] | string[]
+  unusedAdapters: UI_I_Adapter[] | string[]
   switch_name: string
 }
 
-export interface UI_I_NetworkFullWithPositions extends UI_I_NetworkFull {
+export interface UI_I_NetworkFullWithPositions extends UI_I_Network {
   portsCount: number
   portsHeight: number
   networkHeight: number
@@ -145,19 +144,11 @@ export interface UI_I_NetworkFullWithPositions extends UI_I_NetworkFull {
 }
 
 export interface UI_I_DiagramData {
-  diagramName: string
   id: string
-  networks: UI_I_Network[] | null
-  networking?: UI_I_SwitchInfo
-  physicalAdapters: UI_I_PhysicalAdapters | null
-}
-
-export interface UI_I_DiagramDataFull extends UI_I_DiagramData {
-  networks: UI_I_NetworkFull[]
   diagramName: string
-  id: string
+  networks: UI_I_Network[]
+  networking?: UI_I_SwitchInfo
   physicalAdapters: UI_I_PhysicalAdapters | null
-  networking: UI_I_SwitchInfo
 }
 
 export interface UI_I_AdaptersWithPositions {

package/components/common/diagramMain/lib/utils/utils.ts

@@ -4,12 +4,11 @@ import {
   UI_I_NetworksWithPositions,
   UI_I_AdaptersWithPositions,
   UI_I_SelectedSwitchPositions,
-  UI_I_DiagramDataFull,
+  UI_I_DiagramData,
   UI_I_AdaptersHeight,
   UI_I_Adapter,
   UI_I_AdaptersPositions,
   UI_I_AdapterStatus,
-  UI_I_NetworkFull,
   API_UI_I_SwitchItem,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import {
@@ -161,7 +160,7 @@ export const getSelectPortDataFunc = (
 }
 
 export const countAdaptersHeight = (
-  diagramData: UI_I_DiagramDataFull | null
+  diagramData: UI_I_DiagramData | null
 ): UI_I_AdaptersHeight => {
   const toggle: boolean = !!diagramData?.physicalAdapters?.toggle
   const adaptersCount: number =
@@ -182,7 +181,7 @@ export const countAdaptersHeight = (
 }
 
 export const getAdaptersPositions = (
-  diagramData: UI_I_DiagramDataFull | null,
+  diagramData: UI_I_DiagramData | null,
   height: number
 ): UI_I_AdaptersPositions => {
   const titlePosition: number =
@@ -220,13 +219,15 @@ export const getAdaptersPositions = (
 }
 
 export const makeSwitchSendData = (
-  data: UI_I_DiagramDataFull,
+  data: UI_I_DiagramData,
   adapterStatus: UI_I_AdapterStatus
-): API_UI_I_SwitchItem => {
+): API_UI_I_SwitchItem | void => {
+  if(!data.networking) return
+
   return {
     id: data.id,
     mtu: data.networking.mtu,
-    networks: data.networks.map((network: UI_I_NetworkFull) => network.title),
+    networks: data.networks.map((network: UI_I_Network) => network.title),
     nics: adapterStatus,
     security: {
       promiscuous: data.networking.securityPolicy[0].value,

package/components/common/diagramMain/modals/migrateVmkernelAdapter/MigrateVmkernelAdapter.vue

@@ -47,7 +47,7 @@
 <script setup lang="ts">
 import { UI_I_Localization } from '~/lib/models/interfaces'
 import {
-  UI_I_NetworkFull,
+  UI_I_Network,
   UI_I_VmkernelAdapterTableData,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import {
@@ -79,8 +79,8 @@ const props = withDefaults(
   defineProps<{
     show: boolean
     switchName?: string
-    networksList?: UI_I_NetworkFull[]
-    switchNetworks?: UI_I_NetworkFull[]
+    networksList?: UI_I_Network[]
+    switchNetworks?: UI_I_Network[]
     isDarkMode: boolean
   }>(),
   {
@@ -219,18 +219,18 @@ watch(
 
 watch(
   () => props.switchNetworks,
-  (netsOnSwitch: UI_I_NetworkFull[]) => {
+  (netsOnSwitch: UI_I_Network[]) => {
     const vmKernelNetworksIdOnSwitch = netsOnSwitch
-      .filter((net: UI_I_NetworkFull) => net.networkType === '1')
-      .map((net: UI_I_NetworkFull) => net.id)
+      .filter((net: UI_I_Network) => net.networkType === '1')
+      .map((net: UI_I_Network) => net.id)
 
     filteredNetworksList.value = props.networksList
       .filter(
-        (net: UI_I_NetworkFull) =>
+        (net: UI_I_Network) =>
           net.networkType === '1' &&
           !vmKernelNetworksIdOnSwitch.includes(net.id)
       )
-      .map((net: UI_I_NetworkFull, index: number) => ({
+      .map((net: UI_I_Network, index: number) => ({
         name: net.sysx?.name || '',
         networkLabel: net.title,
         switch: net.switchName || '',

package/package.json

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