bfg-common 1.3.204 → 1.3.205

package/components/common/diagramMain/DiagramMain.vue

@@ -205,6 +205,7 @@
         :selected-switch-id="selectedSwitchId"
         :tcp-stacks="props.tcpStacks"
         :tcp-stack-loading="props.tcpStackLoading"
+        :diagrams-data="props.diagramsData"
         @check-network-label="onCheckNetworkLabel"
         @get-existing-standard-switches="onGetExistingStandardSwitches"
         @get-tcp-stacks="onGetTcpStacks"
@@ -300,6 +301,7 @@ const props = withDefaults(
     isDarkMode: boolean
     tcpStacks?: UI_I_TCPStack[]
     tcpStackLoading?: boolean
+    diagramsData?: UI_I_DiagramData[]
   }>(),
   {
     diagramData: null,
@@ -315,6 +317,7 @@ const props = withDefaults(
     networksList: () => [],
     tcpStacks: () => [],
     tcpStackLoading: false,
+    diagramsData: [],
   }
 )
 

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

@@ -18,16 +18,16 @@ import {
 import { UI_T_Adapters } from '~/components/common/diagramMain/lib/models/types'
 
 export const hasPortAndNetwork = (
-  selectedPort: UI_I_SelectedPort,
-  id: string
+    selectedPort: UI_I_SelectedPort,
+    id: string
 ): boolean =>
-  selectedPort.portId !== '-1' &&
-  selectedPort.networkId !== '-1' &&
-  selectedPort.networkId === id
+    selectedPort.portId !== '-1' &&
+    selectedPort.networkId !== '-1' &&
+    selectedPort.networkId === id
 
 export const networksPositions = (
-  arr: number[],
-  net: UI_I_NetworksWithPositions
+    arr: number[],
+    net: UI_I_NetworksWithPositions
 ): number[] => {
   if (net.ports.length === 0) return [...arr, net.connectLineY]
   if (!net.toggle) return [...arr, net.portsPosition + 7.5]
@@ -36,44 +36,44 @@ export const networksPositions = (
     ...arr,
     net.portsPosition + 22 + 7.5,
     net.networkType === UI_E_NetworkType.VCenter
-      ? net.portsPosition + 22 + 12.5 + 32 * (net.portsCount - 1)
-      : net.portsPosition + 22 + 7.5 + 22 * (net.portsCount - 1),
+        ? net.portsPosition + 22 + 12.5 + 32 * (net.portsCount - 1)
+        : net.portsPosition + 22 + 7.5 + 22 * (net.portsCount - 1),
   ]
 }
 
 export const getSelectedPortLinePositions = (
-  selectedPortPosition: number | undefined,
-  selectedNetworkData: UI_I_Network
+    selectedPortPosition: number | undefined,
+    selectedNetworkData: UI_I_Network
 ) =>
-  selectedPortPosition
-    ? selectedNetworkData.networkType === UI_E_NetworkType.VCenter
-      ? selectedPortPosition + 12.5
-      : selectedPortPosition + 7.5
-    : 0
+    selectedPortPosition
+        ? selectedNetworkData.networkType === UI_E_NetworkType.VCenter
+            ? selectedPortPosition + 12.5
+            : selectedPortPosition + 7.5
+        : 0
 
 const selectedNetworkDataFunc = (
-  networkId: string,
-  networksWithPositions: UI_I_NetworksWithPositions[]
+    networkId: string,
+    networksWithPositions: UI_I_NetworksWithPositions[]
 ): UI_I_NetworksWithPositions | undefined =>
-  networksWithPositions?.find(
-    (network: UI_I_Network): boolean => network.id === networkId
-  )
+    networksWithPositions?.find(
+        (network: UI_I_Network): boolean => network.id === networkId
+    )
 
 export const getSelectNetworkDataFunc = (
-  networkId: string,
-  networksWithPositions: UI_I_NetworksWithPositions[],
-  adaptersWithPositions: UI_I_AdaptersWithPositions
+    networkId: string,
+    networksWithPositions: UI_I_NetworksWithPositions[],
+    adaptersWithPositions: UI_I_AdaptersWithPositions
 ): UI_I_SelectedSwitchPositions | undefined => {
   const selectedNetworkData: UI_I_NetworksWithPositions | undefined =
-    selectedNetworkDataFunc(networkId, networksWithPositions)
+      selectedNetworkDataFunc(networkId, networksWithPositions)
 
   if (!selectedNetworkData) return
 
   const activeAdapters: string[] = selectedNetworkData.activeAdapters
   const adaptersPositions: number[] =
-    adaptersWithPositions.adapters
-      ?.filter((adapter: UI_T_Adapters) => activeAdapters?.includes(adapter.id))
-      ?.map((adapter: UI_T_Adapters) => adapter.adapterPosition + 7.5) || []
+      adaptersWithPositions.adapters
+          ?.filter((adapter: UI_T_Adapters) => activeAdapters?.includes(adapter.id))
+          ?.map((adapter: UI_T_Adapters) => adapter.adapterPosition + 7.5) || []
   let selectedPositions: number[] = []
 
   if (!adaptersWithPositions.toggle) {
@@ -82,11 +82,11 @@ export const getSelectNetworkDataFunc = (
       selectedNetworkData.connectLineY,
     ]
   } else if (
-    adaptersWithPositions.adapters === null ||
-    adaptersWithPositions.adapters?.length === 0
+      adaptersWithPositions.adapters === null ||
+      adaptersWithPositions.adapters?.length === 0
   ) {
     selectedPositions = [47.5, selectedNetworkData.connectLineY].sort(
-      (y1: number, y2: number) => y1 - y2
+        (y1: number, y2: number) => y1 - y2
     )
   } else {
     selectedPositions = [
@@ -109,28 +109,28 @@ export const getSelectNetworkDataFunc = (
 }
 
 export const getSelectPortDataFunc = (
-  networkId: string,
-  portId: string,
-  networksWithPositions: UI_I_NetworksWithPositions[],
-  adaptersWithPositions: UI_I_AdaptersWithPositions
+    networkId: string,
+    portId: string,
+    networksWithPositions: UI_I_NetworksWithPositions[],
+    adaptersWithPositions: UI_I_AdaptersWithPositions
 ): UI_I_SelectedSwitchPositions | undefined => {
   const selectedNetworkData: UI_I_NetworksWithPositions | undefined =
-    selectedNetworkDataFunc(networkId, networksWithPositions)
+      selectedNetworkDataFunc(networkId, networksWithPositions)
 
   if (!selectedNetworkData) return
 
   const activeAdapters: string[] = selectedNetworkData.activeAdapters
   const adaptersPositions: number[] =
-    adaptersWithPositions.adapters
-      ?.filter((adapter: UI_T_Adapters) => activeAdapters?.includes(adapter.id))
-      ?.map((adapter: UI_T_Adapters) => adapter.adapterPosition + 7.5) || []
+      adaptersWithPositions.adapters
+          ?.filter((adapter: UI_T_Adapters) => activeAdapters?.includes(adapter.id))
+          ?.map((adapter: UI_T_Adapters) => adapter.adapterPosition + 7.5) || []
   const selectedPortPosition: number | undefined =
-    selectedNetworkData.ports.find(
-      (el): boolean => el.id === portId
-    )?.portPosition
+      selectedNetworkData.ports.find(
+          (el): boolean => el.id === portId
+      )?.portPosition
   const selectedPortLinePosition: number = getSelectedPortLinePositions(
-    selectedPortPosition,
-    selectedNetworkData
+      selectedPortPosition,
+      selectedNetworkData
   )
   let selectedPositions: number[] = []
 
@@ -142,7 +142,7 @@ export const getSelectPortDataFunc = (
     ]
   } else {
     selectedPositions = [...adaptersPositions, selectedPortLinePosition].sort(
-      (y1: number, y2: number) => y1 - y2
+        (y1: number, y2: number) => y1 - y2
     )
   }
 
@@ -160,55 +160,55 @@ export const getSelectPortDataFunc = (
 }
 
 export const countAdaptersHeight = (
-  diagramData: UI_I_DiagramData | null
+    diagramData: UI_I_DiagramData | null
 ): UI_I_AdaptersHeight => {
   const toggle: boolean = !!diagramData?.physicalAdapters?.toggle
   const adaptersCount: number =
-    diagramData?.physicalAdapters?.adapters.length || 0
+      diagramData?.physicalAdapters?.adapters.length || 0
 
   return {
     height:
-      UI_E_PositionsY.ADAPTER_FROM_RECT_TOP +
-      (adaptersCount === 0
-        ? UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT
-        : toggle
-        ? adaptersCount * UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT
-        : 0) +
-      UI_E_PositionsY.SPACE_FROM_RECT_BOTTOM,
+        UI_E_PositionsY.ADAPTER_FROM_RECT_TOP +
+        (adaptersCount === 0
+            ? UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT
+            : toggle
+                ? adaptersCount * UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT
+                : 0) +
+        UI_E_PositionsY.SPACE_FROM_RECT_BOTTOM,
     toggle,
     adaptersCount,
   }
 }
 
 export const getAdaptersPositions = (
-  diagramData: UI_I_DiagramData | null,
-  height: number
+    diagramData: UI_I_DiagramData | null,
+    height: number
 ): UI_I_AdaptersPositions => {
   const titlePosition: number =
-    UI_E_PositionsY.DIAGRAM_TOP +
-    UI_E_PositionsY.BETWEEN_RECTS +
-    UI_E_PositionsY.TITLE_FROM_RECT_TOP
+      UI_E_PositionsY.DIAGRAM_TOP +
+      UI_E_PositionsY.BETWEEN_RECTS +
+      UI_E_PositionsY.TITLE_FROM_RECT_TOP
 
   const rectPosition: number =
-    UI_E_PositionsY.DIAGRAM_TOP + UI_E_PositionsY.BETWEEN_RECTS
+      UI_E_PositionsY.DIAGRAM_TOP + UI_E_PositionsY.BETWEEN_RECTS
 
   const adaptersConnectLineY: number = rectPosition + height / 2
 
   const adapters: UI_T_Adapters[] | null =
-    diagramData?.physicalAdapters?.adapters.map(
-      (adapter: UI_I_Adapter, index: number) => {
-        const adapterPosition: number =
-          UI_E_PositionsY.DIAGRAM_TOP +
-          UI_E_PositionsY.BETWEEN_RECTS +
-          UI_E_PositionsY.ADAPTER_FROM_RECT_TOP +
-          UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT * index
-
-        return {
-          ...adapter,
-          adapterPosition,
-        }
-      }
-    ) || null
+      diagramData?.physicalAdapters?.adapters.map(
+          (adapter: UI_I_Adapter, index: number) => {
+            const adapterPosition: number =
+                UI_E_PositionsY.DIAGRAM_TOP +
+                UI_E_PositionsY.BETWEEN_RECTS +
+                UI_E_PositionsY.ADAPTER_FROM_RECT_TOP +
+                UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT * index
+
+            return {
+              ...adapter,
+              adapterPosition,
+            }
+          }
+      ) || null
 
   return {
     titlePosition,
@@ -219,10 +219,10 @@ export const getAdaptersPositions = (
 }
 
 export const makeSwitchSendData = (
-  data: UI_I_DiagramData,
-  adapterStatus: UI_I_AdapterStatus
-): API_UI_I_SwitchItem | void => {
-  if(!data.networking) return
+    data: UI_I_DiagramData,
+    adapterStatus: UI_I_AdapterStatus
+): API_UI_I_SwitchItem | null => {
+  if (!data.networking) return null
 
   return {
     id: data.id,