bfg-common 1.3.83 → 1.3.85

package/components/common/diagramMain/DiagramMain.vue

@@ -210,9 +210,9 @@
       <common-diagram-main-modals-migrate-vmkernel-adapter
         v-if="isShowMigrateVmkernelAdapterModal"
         :show="isShowMigrateVmkernelAdapterModal"
-        :switch-name="diagramData.id"
+        :switch-name="props.diagramData.id"
         :networks-list="props.networksList"
-        :switch-networks="diagramData.networks"
+        :switch-networks="props.diagramData.networks"
         :is-dark-mode="props.isDarkMode"
         @check-network-label="onCheckNetworkLabel"
         @hide="onHideMigrateVmkernelAdapterModal"
@@ -237,10 +237,14 @@ import {
   UI_I_SwitchLine,
   UI_I_ToggleDiagramAdaptersPayload,
   UI_I_ToggleDiagramPortsPayload,
+  UI_I_PortToggleFlag,
 } from '~/components/common/diagramMain/lib/models/interfaces'
-import { UI_I_ArbitraryObject, UI_I_Localization } from '~/lib/models/interfaces'
 import {
-  UI_I_AddNetworkingSecondSchemeDataSend,
+  UI_I_ArbitraryObject,
+  UI_I_Localization,
+} from '~/lib/models/interfaces'
+import {
+  UI_I_AddNetworkingSecondOrThirdSchemeDataSend,
   UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
   UI_I_Switch,
 } from '~/components/common/wizards/network/add/lib/models/interfaces'
@@ -323,7 +327,7 @@ watch(
 
 const onValidateBeforeSending = (
   networkData:
-    | UI_I_AddNetworkingSecondSchemeDataSend
+    | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
     | UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
   type: string,
   setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void
@@ -564,7 +568,7 @@ const onGetFreeAdapters = (cb: () => void) => {
 }
 const onSendNetworkData = (
   networkData:
-    | UI_I_AddNetworkingSecondSchemeDataSend
+    | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
     | UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
   type: string,
   hideSendNetworkDataLoader: () => void,
@@ -720,10 +724,18 @@ const countNetworksPositions = (): UI_I_NetworksWithPositions[] => {
 const networksWithPositions = ref<UI_I_NetworksWithPositions[]>(
   countNetworksPositions()
 )
+
+const isPortToggled = ref<UI_I_PortToggleFlag>({
+  value: false,
+  id: '',
+})
+
 watch(
   () => props.diagramData?.networks,
   () => {
     networksWithPositions.value = countNetworksPositions()
+
+    isPortToggled.value.value && handlePortTogle()
   },
   { deep: true }
 )
@@ -795,17 +807,21 @@ const onSelectAdapter = (adapterId: string): void => {
   let selectedAdapterPosition: number | null =
     adaptersWithPositions.value.adapters?.find((ad) => ad.id === adapterId)
       ?.adapterPosition || null
+
   selectedAdapterPosition !== null &&
     (selectedAdapterPosition += 7.5) &&
     pos?.push(selectedAdapterPosition)
 
   pos = pos?.sort((y1, y2) => y1 - y2)
+
   if (pos) {
+    console.log('pos', pos)
     selectedSwitchLineY.value = {
       y1: pos[0],
       y2: pos[pos.length - 1],
     }
   }
+
   selectedAdapter.value = {
     adapterId,
     connectedPorts:
@@ -837,7 +853,7 @@ const emits = defineEmits<{
   (
     event: 'send-add-networking-data',
     secondSchemeData:
-      | UI_I_AddNetworkingSecondSchemeDataSend
+      | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
       | UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
     type: string,
     hideSendNetworkDataLoader: () => void,
@@ -846,10 +862,10 @@ const emits = defineEmits<{
   (
     event: 'add-networking-data-validate',
     networkData:
-      | UI_I_AddNetworkingSecondSchemeDataSend
+      | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
       | UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
     type: string,
-    setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void,
+    setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void
   ): void
   (
     event: 'check-network-label',
@@ -887,24 +903,46 @@ const onTogglePorts = (
     isToggle,
     diagramId,
   })
+
+  isPortToggled.value = {
+    value: true,
+    id: id,
+  }
+}
+
+const handlePortTogle = () => {
   selectedPort.value.portId !== '-1' &&
     onSelectPort(selectedPort.value.networkId, selectedPort.value.portId)
+
   selectedAdapter.value.adapterId !== '-1' &&
     onSelectAdapter(selectedAdapter.value.adapterId)
+
   selectedNetwork.value !== '-1' && onSelectNetwork(selectedNetwork.value)
-  hasPortAndNetwork(selectedPort.value, id) && resetSelection()
+
+  hasPortAndNetwork(selectedPort.value, isPortToggled.value.id) &&
+    resetSelection()
+
+  isPortToggled.value = {
+    value: false,
+    id: '',
+  }
 }
 
 const onToggleAdapters = (): void => {
   const newState = !adaptersWithPositions.value.toggle
+
   const payload: Omit<UI_I_ToggleDiagramAdaptersPayload, 'paths'> = {
     isToggle: newState,
     diagramId: props.diagramData?.id || '',
   }
+
   emits('toggle-adapters', payload)
+
   selectedPort.value.portId !== '-1' &&
     onSelectPort(selectedPort.value.networkId, selectedPort.value.portId)
+
   selectedAdapter.value.adapterId !== '-1' && resetSelection()
+
   selectedNetwork.value !== '-1' && onSelectNetwork(selectedNetwork.value)
 }
 

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

@@ -25,10 +25,6 @@ export interface UI_I_Adapter {
   status: string
 }
 
-export interface UI_I_AdapterWithStatus {
-  adapterName: string
-  status: string
-}
 export interface UI_I_PhysicalAdapters {
   toggle: boolean
   adapters: UI_I_Adapter[]
@@ -258,11 +254,6 @@ export interface UI_I_TrafficShapingFields {
   peak: number
   burstSize: number
 }
-export interface UI_I_TrafficShapingErrorFields {
-  average: string
-  peak: string
-  burstSize: string
-}
 
 export interface UI_I_IpvFourSettingsFields {
   ipv4Settings: string
@@ -562,3 +553,8 @@ export interface UI_I_MigrationVmkernelAdapterReadyComplete {
   }
   vlanId: string
 }
+
+export interface UI_I_PortToggleFlag {
+  value: boolean
+  id: string
+}

package/package.json

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