bfg-common 1.4.197 → 1.4.199

package/components/common/wizards/network/add/Add.vue

@@ -128,14 +128,16 @@ import {
   UI_I_SwitchAdapterItem,
   UI_I_DiagramData,
   API_UI_I_SwitchItem,
+  UI_I_AvailableAdapters,
 } from '~/components/common/diagramMain/lib/models/interfaces'
+import { getAvailableAdapters } from '~/components/common/diagramMain/lib/utils/utils'
 import {
   UI_I_ValidationReturn,
   UI_I_WizardStep,
   UI_I_WizardStepNavigation,
 } from '~/components/atoms/wizard/lib/models/interfaces'
 import { UI_E_ValidationFields } from '~/components/common/wizards/network/add/lib/models/enums'
-import { getVlanId } from '~/components/common/wizards/network/add/lib/utils'
+import { getVlanId } from '~/components/common/wizards/network/add/lib/utils/utils'
 import Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import {
   createZeroSchemeReadyCompleteFunc,
@@ -152,7 +154,7 @@ import {
   addNetworkingZeroOrFirstSchemeDataFunc,
   addNetworkingSecondOrThirdSchemeDataFunc,
   addNetworkingFourthOrFifthSchemeDataFunc,
-} from '~/components/common/wizards/network/add/lib/config'
+} from '~/components/common/wizards/network/add/lib/config/config'
 import {
   checkTargetDeviceSync,
   checkAdaptersSync,
@@ -310,7 +312,10 @@ let flagSwitch = ''
 // Choosing Scheme
 watch(
   [connectionTypeLocal, targetDevice],
-  (newValues, oldValues) => {
+  (
+    newValues: [string, UI_I_TargetDevice],
+    oldValues: [string, UI_I_TargetDevice]
+  ) => {
     const newCT = newValues[0] // -> newConnectionType
     const oldCT = oldValues[0] // -> oldConnectionType
     const newTD = newValues[1] // -> newTargetDevice
@@ -366,14 +371,20 @@ watch(
       onGetTcpStacks()
     }
     if (newSelectedStep === 6 && flagSwitch !== targetDevice.value.switch) {
-      const nics = props.standardSwitchesInitial.find(
+      const nics: UI_I_AdapterStatus = props.standardSwitchesInitial.find(
         (currentSwitch: UI_I_Switch) =>
           currentSwitch.id === targetDevice.value.switch
       ).nics
+
+      const availableAdapters: UI_I_AvailableAdapters = getAvailableAdapters(
+        props.adapters,
+        nics
+      )
+
       adapterStatus.value = {
-        active: nics.active || [],
-        standby: nics.standby || [],
-        unused: nics.unused || [],
+        active: availableAdapters.activeAdapters || [],
+        standby: availableAdapters.standbyAdapters || [],
+        unused: availableAdapters.unusedAdapters || [],
       }
       coreAdapters.value = [
         ...adapterStatus.value.active,