bfg-common 1.6.95 → 1.6.97

package/components/common/diagramMain/modals/lib/config/adapterModal.ts

@@ -41,19 +41,19 @@ export const adapterViewSettingsFunc = (
     type: 1,
     rows: [
       {
-        name: localization.common.adapter,
+        name: localization.common.adapter + ':',
         value: initialData?.adapter?.trim(),
       },
       {
-        name: localization.common.name,
+        name: localization.common.name + ':',
         value: initialData?.name,
       },
       {
-        name: localization.common.location,
+        name: localization.common.location + ':',
         value: `PCI ${initialData?.pciAddress}`,
       },
       {
-        name: localization.common.driver,
+        name: localization.common.driver + ':',
         value: initialData?.driver,
       },
     ],
@@ -64,7 +64,7 @@ export const adapterViewSettingsFunc = (
     type: 1,
     rows: [
       {
-        name: localization.common.status,
+        name: localization.common.status + ':',
         value: initialData?.carrier
           ? localization.common.connected
           : localization.common.disconnected,
@@ -72,7 +72,7 @@ export const adapterViewSettingsFunc = (
         status: true,
       },
       {
-        name: localization.common.actualSpeedDuplex,
+        name: localization.common.actualSpeedDuplex + ':',
         value: initialData?.carrier
           ? `${getNicSpeed(initialData?.speed || 0, localization)}, ${
               initialData?.duplex
@@ -80,7 +80,7 @@ export const adapterViewSettingsFunc = (
           : localization.common.down,
       },
       {
-        name: localization.common.configuredSpeedDuplex,
+        name: localization.common.configuredSpeedDuplex + ':',
         value: initialData?.carrier
           ? `${getNicSpeed(initialData?.speed || 0, localization)}, ${
               initialData?.duplex
@@ -88,7 +88,7 @@ export const adapterViewSettingsFunc = (
           : localization.common.autoNegotiate,
       },
       {
-        name: localization.common.networks,
+        name: localization.common.networks + ':',
         value:
           initialData?.networks && initialData?.networks?.length > 0
             ? initialData?.networks.map((network: string) => network.trim())
@@ -102,7 +102,7 @@ export const adapterViewSettingsFunc = (
     type: 1,
     rows: [
       {
-        name: localization.common.status,
+        name: localization.common.status + ':',
         value: !initialData?.srIov ? localization.common.notSupported : '--',
         color: initialData?.srIov,
         status: true,

package/components/common/diagramMain/modals/lib/config/diagramConfig.ts

@@ -1,3 +1,4 @@
+import type { UI_I_Button } from '~/node_modules/bfg-common/components/common/tools/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_NavigationItem } from '~/components/common/diagramMain/lib/models/interfaces'
 
@@ -9,7 +10,7 @@ export const switchMainNavigationFunc = (
     text: localization.common.migrateVmKernelAdapter,
     value: 'migrate-vmkernel-adapter',
     testId: `${testId}-migrate-vm-kernel-adapter`,
-    development: true
+    development: true,
   },
   {
     text: localization.common.viewSettings,
@@ -20,6 +21,46 @@ export const switchMainNavigationFunc = (
     text: localization.common.remove,
     value: 'switch-remove',
     testId: `${testId}-remove`,
-    permission: 'Networks.RemoveSwitch'
+    permission: 'Networks.RemoveSwitch',
+  },
+]
+
+export const switchMainNavigationNewFunc = (
+  localization: UI_I_Localization,
+  testId: string
+): UI_I_Button[] => [
+  {
+    text: localization.common.addNetworking,
+    value: 'add-networking',
+    iconName: 'network',
+    testId: `${testId}-add-networking-button`,
+    permission:
+      'Networks.CreateSysx Networks.CreatePortGroup Networks.UpdateSwitch Networks.CreateSwitch',
+  },
+  {
+    text: localization.common.edit,
+    value: 'switch-edit',
+    iconName: 'edit',
+    testId: `${testId}-edit-button`,
+    permission: 'Networks.UpdateSwitch',
+  },
+  {
+    text: localization.common.managePhysicalAdapters,
+    value: 'switch-manage-physical-adapters',
+    iconName: 'settings',
+    testId: `${testId}-manage-physical-adapters-button`,
+    permission: 'Networks.UpdateSwitch',
+  },
+  // {
+  //   text: localization.common.migrateVmKernelAdapter,
+  //   value: 'migrate-vmkernel-adapter',
+  //   testId: `${testId}-migrate-vm-kernel-adapter`,
+  //   development: true,
+  // },
+  {
+    text: localization.common.viewSettings,
+    value: 'switch-view-settings',
+    iconName: 'password-hide',
+    testId: `${testId}-view-settings`,
   },
 ]

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

@@ -52,4 +52,5 @@ export const {
   vmKernelAdapterViewSettingsFunc,
 } = vmKernelAdapterData
 // export const { managePhysicalAdapterTableData } = temporaryData
-export const { switchMainNavigationFunc } = diagramConfig
+export const { switchMainNavigationFunc, switchMainNavigationNewFunc } =
+  diagramConfig

package/components/common/diagramMain/modals/lib/config/networkModal.ts

@@ -115,11 +115,11 @@ export const networkViewSettingsFunc = (
       type: 1,
       rows: [
         {
-          name: localization.common.networkLabel,
+          name: localization.common.networkLabel + ':',
           value: initialData.networkLabel,
         },
         {
-          name: localization.common.vlanId,
+          name: localization.common.vlanId + ':',
           value: initialData.vlanId,
         },
       ],
@@ -130,7 +130,7 @@ export const networkViewSettingsFunc = (
       type: 2,
       rows: [
         {
-          name: localization.common.promiscuousMode,
+          name: localization.common.promiscuousMode + ':',
           value: promiscuousModeFlag
             ? localization.common.accept
             : localization.common.reject,
@@ -138,7 +138,7 @@ export const networkViewSettingsFunc = (
           status: true,
         },
         {
-          name: localization.common.macAddressChanges,
+          name: localization.common.macAddressChanges + ':',
           value: macAddressChanges
             ? localization.common.accept
             : localization.common.reject,
@@ -146,7 +146,7 @@ export const networkViewSettingsFunc = (
           status: true,
         },
         {
-          name: localization.common.forgedTransmits,
+          name: localization.common.forgedTransmits + ':',
           value: forgedTransmits
             ? localization.common.accept
             : localization.common.reject,
@@ -161,19 +161,19 @@ export const networkViewSettingsFunc = (
       type: 2,
       rows: [
         {
-          name: localization.common.averageBandwidth,
+          name: localization.common.averageBandwidth + ':',
           value: initialData.shapingPolicy?.[0].initialValue.value
             ? `${initialData.average_bw} ${localization.common.kbitS}`
             : '--',
         },
         {
-          name: localization.common.peakBandwidth,
+          name: localization.common.peakBandwidth + ':',
           value: initialData.shapingPolicy?.[0].initialValue.value
             ? `${initialData.peak_bw} ${localization.common.kbitS}`
             : '--',
         },
         {
-          name: localization.common.burstSize,
+          name: localization.common.burstSize + ':',
           value: initialData.shapingPolicy?.[0].initialValue.value
             ? `${initialData.burst_size} ${localization.common.kb}`
             : '--',
@@ -186,11 +186,11 @@ export const networkViewSettingsFunc = (
       type: 2,
       rows: [
         {
-          name: localization.common.loadBalancing,
+          name: localization.common.loadBalancing + ':',
           value: loadBalancingValue,
         },
         {
-          name: localization.common.networkFailureDetection,
+          name: localization.common.networkFailureDetection + ':',
           value:
             (
               initialData.nicTeamingPolicy as UI_I_NetworkSummaryPortletListItem<UI_E_ICBLinkDetectionMode>[]
@@ -203,7 +203,7 @@ export const networkViewSettingsFunc = (
               : localization.common.beaconProbing,
         },
         {
-          name: localization.common.notifySwitches,
+          name: localization.common.notifySwitches + ':',
           value: notifySwitches
             ? localization.common.yes
             : localization.common.no,
@@ -211,21 +211,21 @@ export const networkViewSettingsFunc = (
           status: true,
         },
         {
-          name: localization.common.failback,
+          name: localization.common.failback + ':',
           value: failback ? localization.common.yes : localization.common.no,
           color: failback,
           status: true,
         },
         {
-          name: localization.networks.activeAdapters,
+          name: localization.networks.activeAdapters + ':',
           value: initialData.activeAdapters,
         },
         {
-          name: localization.common.standbyAdapters,
+          name: localization.common.standbyAdapters + ':',
           value: initialData.standbyAdapters,
         },
         {
-          name: localization.common.unusedAdapters,
+          name: localization.common.unusedAdapters + ':',
           value: initialData.unusedAdapters,
         },
       ],

package/components/common/diagramMain/modals/lib/config/portModal.ts

@@ -55,19 +55,19 @@ export const portViewSettingsFunc = (
       type: 1,
       rows: [
         {
-          name: localization.common.networkLabel,
+          name: localization.common.networkLabel + ':',
           value: initialData.networkLabel,
         },
         {
-          name: localization.common.vlanId,
+          name: localization.common.vlanId + ':',
           value: initialData.vlanId,
         },
         {
-          name: localization.common.tcpIpStack,
+          name: localization.common.tcpIpStack + ':',
           value: localization.common[initialData.tcpIp || 'default'],
         },
         {
-          name: localization.common.enabledServices,
+          name: localization.common.enabledServices + ':',
           value: enabledServices,
         },
       ],
@@ -80,7 +80,7 @@ export const portViewSettingsFunc = (
         initialData.tcpConfig?.ipv4Settings === '0'
           ? [
               {
-                name: localization.common.dhcp,
+                name: localization.common.dhcp + ':',
                 value: localization.common.enabled,
                 color: true,
                 status: true,
@@ -88,26 +88,26 @@ export const portViewSettingsFunc = (
             ]
           : [
               {
-                name: localization.common.dhcp,
+                name: localization.common.dhcp + ':',
                 value: localization.common.disabled,
                 color: false,
                 status: true,
               },
               {
-                name: localization.common.ipv4address,
+                name: localization.common.ipv4address + ':',
                 value: initialData.tcpConfig?.ipv4Address,
                 // (${localization.static})
               },
               {
-                name: localization.common.subnetMask,
+                name: localization.common.subnetMask + ':',
                 value: initialData.tcpConfig?.subnetMask,
               },
               {
-                name: localization.common.defaultGateway,
+                name: localization.common.defaultGateway + ':',
                 value: initialData.tcpConfig?.defaultGateway?.value,
               },
               {
-                name: localization.common.dnsServerAddresses,
+                name: localization.common.dnsServerAddresses + ':',
                 value: ['--'],
               },
             ],
@@ -143,11 +143,11 @@ export const portViewSettingsFunc = (
       type: 1,
       rows: [
         {
-          name: localization.common.macAddress,
+          name: localization.common.macAddress + ':',
           // value: '02:00:2f:fb:9a:6b',
         },
         {
-          name: localization.common.mtu,
+          name: localization.common.mtu + ':',
           value: initialData.mtu,
         },
       ],

package/components/common/diagramMain/modals/lib/config/vCenterModal.ts

@@ -13,11 +13,11 @@ export const vCenterViewSettingsFunc = (
     type: 1,
     rows: [
       {
-        name: localization.common.macAddress,
+        name: localization.common.macAddress + ':',
         value: initialData.macAddress,
       },
       {
-        name: localization.common.adapterType,
+        name: localization.common.adapterType + ':',
         value: initialData.adapter,
       },
     ],

package/components/common/diagramMain/modals/lib/config/vmKernelAdapter.ts

@@ -18,7 +18,7 @@ export const vmKernelAdapterViewSettingsFunc = (
     type: 0,
     rows: [
       { name: localization.common.networkLabel, value: '' },
-      { name: localization.common.vlanId, value: 'None (0)' },
+      { name: localization.common.vlanId, value: `${localization.common.none2} (0)` },
       { name: localization.common.tcpIpStack, value: 'Default' },
       { name: localization.common.enabledServices },
     ],

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

@@ -2,12 +2,42 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_EditSettingsErrorMessage } from '~/components/common/diagramMain/lib/models/interfaces'
 
 export const validationMessagesArrayFunc = (
-  arr: (keyof UI_I_EditSettingsErrorMessage)[],
+  keyArray: (keyof UI_I_EditSettingsErrorMessage)[],
   errorMessages: UI_I_EditSettingsErrorMessage
 ) =>
-  arr
-    .map((ar: keyof UI_I_EditSettingsErrorMessage) => errorMessages[ar])
-    .filter((err) => err !== '')
+  keyArray
+    .map(
+      (key: keyof UI_I_EditSettingsErrorMessage): string | undefined =>
+        errorMessages[key]
+    )
+    .filter((message: string | undefined): boolean => message !== '')
+
+export const validationMessagesArrayNewFunc = (
+  keyArray: (keyof UI_I_EditSettingsErrorMessage)[],
+  errorMessages: UI_I_EditSettingsErrorMessage
+) =>
+  keyArray
+    .map(
+      (
+        key: keyof UI_I_EditSettingsErrorMessage
+      ):
+        | {
+            key: keyof UI_I_EditSettingsErrorMessage
+            message: string | undefined
+          }
+        | undefined =>
+        errorMessages[key] ? { key, message: errorMessages[key] } : undefined
+    )
+    .filter(
+      (
+        messageObject:
+          | {
+              key: keyof UI_I_EditSettingsErrorMessage
+              message: string | undefined
+            }
+          | undefined
+      ): boolean => !!messageObject
+    )
 
 export const getNicSpeed = (
   speedInitial: number = 0,

package/components/common/diagramMain/modals/managePhysicalAdapters/ManagePhysicalAdapters.vue

@@ -0,0 +1,164 @@
+<template>
+  <div>
+    <component
+      :is="currentComponent"
+      :switch-name="props.switchName"
+      :is-dark-mode="props.isDarkMode"
+      :adapters="props.adapters"
+      :free-adapters="props.freeAdapters"
+      :added-adapters="addedAdapters"
+      :adapter-status="props.adapterStatus"
+      :is-show-no-connected-active-adapters-modal="
+        isShowNoConnectedActiveAdaptersModal
+      "
+      :is-show-no-active-adapters-modal="isShowNoActiveAdaptersModal"
+      :is-manage-adapters-modal-loading="props.isManageAdaptersModalLoading"
+      @get-free-adapters="onGetFreeAdapters"
+      @change-added-adapters="onChangeAddedAdapters"
+      @change-adapter-status="onChangeAdapterStatus"
+      @hide-no-connected-active-adapters-modal="
+        onHideNoConnectedActiveAdaptersModal
+      "
+      @hide-no-active-adapters-modal="onHideNoActiveAdaptersModal"
+      @confirm-no-active-adapters-modal="onConfirmNoActiveAdaptersModal"
+      @send-manage-adapter="onSendManageAdapter"
+      @hide="onHideManagePhysicalAdaptersModal"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_ItemsWithTotalCounts } from '~/lib/models/interfaces'
+import type {
+  UI_I_Adapter,
+  UI_I_AdapterStatus,
+  UI_I_SwitchAdapterItem,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+
+const props = withDefaults(
+  defineProps<{
+    switchName?: string
+    freeAdapters: UI_I_Adapter[]
+    adapterStatus?: UI_I_AdapterStatus
+    adapters: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
+    initialAdapterStatus: UI_I_AdapterStatus
+    isDarkMode?: boolean
+    isManageAdaptersModalLoading?: boolean
+  }>(),
+  {
+    switchName: '',
+    adapterStatus: () => ({
+      active: [],
+      standby: [],
+      unused: [],
+    }),
+    isDarkMode: false,
+    isManageAdaptersModalLoading: false,
+  }
+)
+
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'get-free-adapters', showModal: () => void): void
+  (event: 'change-adapter-status', adapterStatus: UI_I_AdapterStatus): void
+  (
+    event: 'send-manage-physical-adapters-data',
+    adapterStatus: UI_I_AdapterStatus,
+    switchName: string,
+    hideModal: () => void
+  ): void
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./ManagePhysicalAdaptersNew.vue'))
+    : defineAsyncComponent(() => import('./ManagePhysicalAdaptersOld.vue'))
+)
+
+const addedAdapters = ref<string[]>([])
+
+const onChangeAddedAdapters = (addedAdaptersNew: string[]) => {
+  addedAdapters.value = addedAdaptersNew
+}
+
+const onChangeAdapterStatus = (adapterStatusNew: UI_I_AdapterStatus) => {
+  emits('change-adapter-status', adapterStatusNew)
+}
+
+const isShowNoConnectedActiveAdaptersModal = ref(false)
+const isShowNoActiveAdaptersModal = ref(false)
+
+const showNoConnectedActiveAdaptersModal = () => {
+  isShowNoConnectedActiveAdaptersModal.value = true
+}
+const onHideNoConnectedActiveAdaptersModal = () => {
+  isShowNoConnectedActiveAdaptersModal.value = false
+}
+const showNoActiveAdaptersModal = () => {
+  isShowNoActiveAdaptersModal.value = true
+}
+const onHideNoActiveAdaptersModal = () => {
+  isShowNoActiveAdaptersModal.value = false
+}
+
+const onSendManagePhysicalAdaptersData = (
+  adapterStatus: UI_I_AdapterStatus,
+  switchName: string,
+  hideModal: () => void
+) => {
+  emits(
+    'send-manage-physical-adapters-data',
+    adapterStatus,
+    switchName,
+    hideModal
+  )
+}
+
+const onConfirmNoActiveAdaptersModal = () => {
+  onSendManagePhysicalAdaptersData(
+    props.adapterStatus,
+    props.switchName,
+    onHideManagePhysicalAdaptersModal
+  )
+  onHideNoConnectedActiveAdaptersModal()
+  onHideNoActiveAdaptersModal()
+}
+
+const onSendManageAdapter = () => {
+  if (props.adapterStatus.active.length === 0) {
+    showNoActiveAdaptersModal()
+    return
+  }
+
+  const activeAndConnectedAdapters = props.adapterStatus.active.filter(
+    (adapterName: string) =>
+      props.adapters.items.find(
+        (ad: UI_I_SwitchAdapterItem) => ad.name === adapterName
+      )?.carrier
+  )
+  if (activeAndConnectedAdapters.length === 0) {
+    showNoConnectedActiveAdaptersModal()
+    return
+  }
+
+  onSendManagePhysicalAdaptersData(
+    props.adapterStatus,
+    props.switchName,
+    onHideManagePhysicalAdaptersModal
+  )
+}
+
+const onGetFreeAdapters = (showModal: () => void) => {
+  emits('get-free-adapters', showModal)
+}
+
+const onHideManagePhysicalAdaptersModal = (): void => {
+  addedAdapters.value = []
+  emits('change-adapter-status', props.initialAdapterStatus)
+  emits('hide')
+}
+</script>