bfg-common 1.3.207 → 1.3.208

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

@@ -142,6 +142,7 @@ import {
   createFirstSchemeReadyCompleteFunc,
   createSecondSchemeReadyCompleteFunc,
   createThirdSchemeReadyCompleteFunc,
+  createFourthSchemeReadyCompleteFunc,
   stepsSchemeInitial,
   stepsFunc,
   connectionSettingsInitial,
@@ -424,6 +425,15 @@ watch(
         addedAdapters.value,
         localization.value
       )
+      return
+    }
+    if (wizard.isSelectedScheme(4)) {
+      readyCompleteFields.value = createFourthSchemeReadyCompleteFunc(
+        targetDevice.value.switch,
+        props.diagramsData,
+        adapterStatus.value,
+        localization.value
+      )
     }
   }
 )
@@ -481,7 +491,7 @@ const checkFinal = async (): Promise<UI_I_ArbitraryObject<string>> => {
     | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
     | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
 
-  let type: 'network' | 'vmkernel'
+  let type: 'network' | 'vmkernel' | 'adapter'
 
   if (wizard.isSelectedScheme(0) || wizard.isSelectedScheme(1)) {
     const vlan = getVlanId(portProperties.value.vlanId)
@@ -521,7 +531,7 @@ const checkFinal = async (): Promise<UI_I_ArbitraryObject<string>> => {
       targetDevice.value.mtu
     )
 
-    type = 'network'
+    type = 'adapter'
   }
 
   return new Promise((resolve, _reject) =>
@@ -702,7 +712,7 @@ const onSubmit = async (): Promise<void> => {
     | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
     | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
     | null = null
-  let type: 'network' | 'vmkernel' = 'network'
+  let type: 'network' | 'vmkernel' | 'adapter' = 'network'
 
   if (wizard.isSelectedScheme(0) || wizard.isSelectedScheme(1)) {
     const vlan = getVlanId(portProperties.value.vlanId)
@@ -730,6 +740,7 @@ const onSubmit = async (): Promise<void> => {
   }
 
   if (wizard.isSelectedScheme(4) || wizard.isSelectedScheme(5)) {
+    type = 'adapter'
     sendData = addNetworkingFourthOrFifthSchemeDataFunc(
       targetDevice.value.switch,
       wizard.isSelectedScheme(4),
@@ -737,8 +748,6 @@ const onSubmit = async (): Promise<void> => {
       props.diagramsData,
       targetDevice.value.mtu
     )
-
-    type = 'adapter'
   }
 
   sendData &&

package/components/common/wizards/network/add/lib/config/index.ts

@@ -11,6 +11,7 @@ export const {
   createZeroSchemeReadyCompleteFunc,
   createFirstSchemeReadyCompleteFunc,
   createThirdSchemeReadyCompleteFunc,
+  createFourthSchemeReadyCompleteFunc,
 } = addNetworkingStepsConfig
 export const {
   servicesInitial,

package/components/common/wizards/network/add/lib/config/steps.ts

@@ -7,6 +7,11 @@ import {
   UI_I_ReadyCompleteFirstColumn,
   UI_I_TargetDevice,
 } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import {
+  UI_I_DiagramData,
+  UI_I_AdapterStatus,
+  UI_I_Adapter,
+} from '~/components/common/diagramMain/lib/models/interfaces'
 import { UI_E_ValidationFields } from '~/components/common/wizards/network/add/lib/models/enums'
 import { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
 import { UI_E_WIZARD_STATUS } from '~/components/atoms/wizard/lib/models/enums'
@@ -395,91 +400,49 @@ export const createFirstSchemeReadyCompleteFunc = (
     addedAdapters
   )
 
-// For later
+export const createFourthSchemeReadyCompleteFunc = (
+  switchId: string,
+  diagramsData: UI_I_DiagramData[],
+  adapterStatus: UI_I_AdapterStatus,
+  localization: UI_I_Localization
+): UI_I_ReadyCompleteData[] => {
+  const adapters = [
+    ...(adapterStatus.active as string[]),
+    ...(adapterStatus.standby as string[]),
+    ...(adapterStatus.unused as string[]),
+  ]
+
+  const switchData: UI_I_DiagramData | undefined = diagramsData.find(
+    (diagram: UI_I_DiagramData) => diagram.id === switchId
+  )
+
+  if (!switchData) {
+    return []
+  }
+
+  const existing: string[] =
+    switchData.physicalAdapters?.adapters.map(
+      (adapter: UI_I_Adapter) => adapter.id
+    ) || []
+
+  const assignedAdapters: string[] = adapters.filter(
+    (adapterId: string) => !existing.includes(adapterId)
+  )
 
-// const viewSettingsFields = [
-//   {
-//     id: 0,
-//     type: 0,
-//     rows: [
-//       {
-//         name: 'New port group',
-//         value: 'VMkernel',
-//       },
-//       {
-//         name: 'Standard switch',
-//         value: 'vSwitch0',
-//       },
-//       {
-//         name: 'VLAN ID',
-//         value: 'None (0)',
-//       },
-//       {
-//         name: 'vMotion',
-//         value: 'Disabled',
-//       },
-//       {
-//         name: 'Provisioning',
-//         value: 'Disabled',
-//       },
-//       {
-//         name: 'Fault Tolerance logging',
-//         value: 'Disabled',
-//       },
-//       {
-//         name: 'Management',
-//         value: 'Disabled',
-//       },
-//       {
-//         name: 'Iridium Replication',
-//         value: 'Disabled',
-//       },
-//       {
-//         name: 'Iridium Replication NFC',
-//         value: 'Disabled',
-//       },
-//       {
-//         name: 'vSAN',
-//         value: 'Disabled',
-//       },
-//       {
-//         name: 'Iridium Backup NFC',
-//         value: 'Disabled',
-//       },
-//       {
-//         name: 'NVMe over TCP',
-//         value: 'Disabled',
-//       },
-//       {
-//         name: 'NVMe over RDMA',
-//         value: 'Disabled',
-//       },
-//     ],
-//   },
-//   {
-//     title: 'NIC settings',
-//     id: 1,
-//     type: 0,
-//     rows: [
-//       {
-//         name: 'MTU',
-//         value: '1500',
-//       },
-//       {
-//         name: 'TCP/IP stack',
-//         value: 'Default',
-//       },
-//     ],
-//   },
-//   {
-//     title: 'IPv4 settings',
-//     id: 2,
-//     type: 0,
-//     rows: [
-//       {
-//         name: 'DHCP',
-//         value: 'Enabled',
-//       },
-//     ],
-//   },
-// ]
+  return [
+    {
+      id: 0,
+      type: 0,
+      rows: [
+        {
+          name: localization.standardSwitch,
+          value: switchId,
+        },
+        {
+          name: localization.assignedAdapters,
+          value: assignedAdapters.join(', '),
+        },
+      ],
+    },
+  ]
+}

package/components/common/wizards/network/add/steps/SelectedTargetDevice.vue

@@ -188,7 +188,14 @@
         </div>
 
         <div>
-          <div class="radio">
+          <div
+            :class="[
+              'radio',
+              {
+                'disabled-on-time': props.connectionType === '2',
+              },
+            ]"
+          >
             <input
               id="standard-switch"
               v-model="fields.selected"

package/package.json

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