bfg-common 1.6.77 → 1.6.79

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

@@ -1,90 +1,90 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_ModalTabs,
-  UI_I_VmkernelAdapterTableData,
-} from '~/components/common/diagramMain/lib/models/interfaces'
-import type {
-  UI_I_BodyItems,
-  UI_I_ReadyCompleteFields,
-  UI_I_TableHead,
-} from '~/components/common/wizards/network/add/lib/models/interfaces'
-
-export const vmKernelAdapterViewSettingsFunc = (
-  localization: UI_I_Localization
-): UI_I_ReadyCompleteFields[] => [
-  {
-    id: 0,
-    title: localization.common.portProperties,
-    type: 0,
-    rows: [
-      { name: localization.common.networkLabel, value: '' },
-      { name: localization.common.vlanId, value: `${localization.common.none} (0)` },
-      { name: localization.common.tcpIpStack, value: 'Default' },
-      { name: localization.common.enabledServices },
-    ],
-  },
-  {
-    id: 1,
-    title: localization.common.nicSettings,
-    type: 0,
-    rows: [
-      { name: localization.common.macAddress, value: '00:50:56:62:d7:8d' },
-      { name: localization.common.mtu, value: '1500' },
-    ],
-  },
-  {
-    id: 2,
-    title: localization.common.ipV4Settings,
-    type: 1,
-    rows: [
-      { name: localization.common.dhcp, value: 'Enabled' },
-      { name: localization.common.ipv4address, value: '169.254.195.224 (DHCP)' },
-      { name: localization.common.subnetMask, value: '255.255.0.0' },
-      { name: localization.common.defaultGateway, value: '10.10.101.1' },
-      { name: localization.common.dnsServerAddresses, value: '10.10.101.1' },
-    ],
-  },
-]
-
-export const vmKernelAdapterViewSettingsModalTabsFunc = (
-  localization: UI_I_Localization
-): UI_I_ModalTabs[] => [
-  { text: localization.common.properties, value: 0 },
-  { text: localization.common.ipSettings, value: 1 },
-]
-
-export const vmKernelAdapterViewSettingsTableHeadFunc = (
-  localization: UI_I_Localization
-): UI_I_TableHead[] => [
-  { text: localization.common.device },
-  { text: localization.common.networkLabel },
-  { text: localization.common.switch },
-  { text: localization.common.ipAddress },
-  { text: localization.common.tcpIpStack },
-]
-
-export const vmKernelAdapterTableBodyMapperFunc = (
-  vmkernelAdapterData: UI_I_VmkernelAdapterTableData
-): UI_I_BodyItems[] => [
-  {
-    editable: false,
-    text: vmkernelAdapterData.name,
-    id: vmkernelAdapterData.name,
-  },
-  {
-    editable: false,
-    text: vmkernelAdapterData.networkLabel,
-  },
-  {
-    editable: false,
-    text: vmkernelAdapterData.switch,
-  },
-  {
-    editable: false,
-    text: vmkernelAdapterData.ipAddress,
-  },
-  {
-    editable: false,
-    text: vmkernelAdapterData.tcp,
-  },
-]
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_ModalTabs,
+  UI_I_VmkernelAdapterTableData,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+import type {
+  UI_I_BodyItems,
+  UI_I_ReadyCompleteFields,
+  UI_I_TableHead,
+} from '~/components/common/wizards/network/add/lib/models/interfaces'
+
+export const vmKernelAdapterViewSettingsFunc = (
+  localization: UI_I_Localization
+): UI_I_ReadyCompleteFields[] => [
+  {
+    id: 0,
+    title: localization.common.portProperties,
+    type: 0,
+    rows: [
+      { name: localization.common.networkLabel, value: '' },
+      { name: localization.common.vlanId, value: `${localization.common.none2} (0)` },
+      { name: localization.common.tcpIpStack, value: 'Default' },
+      { name: localization.common.enabledServices },
+    ],
+  },
+  {
+    id: 1,
+    title: localization.common.nicSettings,
+    type: 0,
+    rows: [
+      { name: localization.common.macAddress, value: '00:50:56:62:d7:8d' },
+      { name: localization.common.mtu, value: '1500' },
+    ],
+  },
+  {
+    id: 2,
+    title: localization.common.ipV4Settings,
+    type: 1,
+    rows: [
+      { name: localization.common.dhcp, value: 'Enabled' },
+      { name: localization.common.ipv4address, value: '169.254.195.224 (DHCP)' },
+      { name: localization.common.subnetMask, value: '255.255.0.0' },
+      { name: localization.common.defaultGateway, value: '10.10.101.1' },
+      { name: localization.common.dnsServerAddresses, value: '10.10.101.1' },
+    ],
+  },
+]
+
+export const vmKernelAdapterViewSettingsModalTabsFunc = (
+  localization: UI_I_Localization
+): UI_I_ModalTabs[] => [
+  { text: localization.common.properties, value: 0 },
+  { text: localization.common.ipSettings, value: 1 },
+]
+
+export const vmKernelAdapterViewSettingsTableHeadFunc = (
+  localization: UI_I_Localization
+): UI_I_TableHead[] => [
+  { text: localization.common.device },
+  { text: localization.common.networkLabel },
+  { text: localization.common.switch },
+  { text: localization.common.ipAddress },
+  { text: localization.common.tcpIpStack },
+]
+
+export const vmKernelAdapterTableBodyMapperFunc = (
+  vmkernelAdapterData: UI_I_VmkernelAdapterTableData
+): UI_I_BodyItems[] => [
+  {
+    editable: false,
+    text: vmkernelAdapterData.name,
+    id: vmkernelAdapterData.name,
+  },
+  {
+    editable: false,
+    text: vmkernelAdapterData.networkLabel,
+  },
+  {
+    editable: false,
+    text: vmkernelAdapterData.switch,
+  },
+  {
+    editable: false,
+    text: vmkernelAdapterData.ipAddress,
+  },
+  {
+    editable: false,
+    text: vmkernelAdapterData.tcp,
+  },
+]

package/components/common/diagramMain/modals/lib/mappers/mappers.ts

@@ -1,88 +1,88 @@
-import type {
-  UI_I_EditFieldsData,
-  UI_I_PortEditSendData,
-  UI_I_PortPropertiesFields,
-  UI_I_IpvFourSettingsFields,
-  UI_I_SwitchEditSendData,
-} from '~/components/common/diagramMain/lib/models/interfaces'
-
-export const portEditDataFunc = (
-  editFieldsData: UI_I_EditFieldsData,
-  id: string
-): UI_I_PortEditSendData => {
-  const { $binary } = useNuxtApp()
-
-  const properties = editFieldsData.properties as UI_I_PortPropertiesFields
-  const ipvFourSettings: UI_I_IpvFourSettingsFields | undefined =
-    editFieldsData.ipvFourSettings
-
-  const body: UI_I_PortEditSendData = {
-    id,
-    mtu: properties?.mtu,
-    services: {
-      Management: !!properties?.services.management,
-      VMotion: !!properties?.services.vMotion,
-      Provisioning: !!properties?.services.provisioning,
-      VSAN: !!properties?.services.vSAN,
-    },
-    tcp_stack: properties?.tcpIp,
-    ipv4_settings: {
-      auto: ipvFourSettings?.ipv4Settings === '0',
-    },
-  }
-
-  if (ipvFourSettings?.ipv4Settings === '1') {
-    body.ipv4_settings = {
-      auto: false,
-      ipv4: ipvFourSettings?.ipv4Address
-        ? $binary.stringToByteIP(ipvFourSettings?.ipv4Address)
-        : 0,
-      mask: ipvFourSettings?.subnetMask
-        ? $binary.stringToByteIP(ipvFourSettings?.subnetMask)
-        : 0,
-      gateway_override: !!ipvFourSettings?.defaultGateway?.checked,
-      gateway: ipvFourSettings?.defaultGateway?.checked
-        ? ipvFourSettings?.defaultGateway?.value
-          ? $binary.stringToByteIP(ipvFourSettings?.defaultGateway?.value)
-          : 0
-        : 0,
-    }
-  }
-
-  return body
-}
-
-export const switchEditDataFunc = (
-  editFieldsData: UI_I_EditFieldsData,
-  id: string
-): UI_I_SwitchEditSendData => {
-  const body: UI_I_SwitchEditSendData = {
-    id,
-    mtu: editFieldsData.properties?.mtu,
-    nics: editFieldsData.teamingFailover?.adapters || {},
-    security: {
-      forged_transmits: editFieldsData.security?.forgedTransmits.selected,
-      mac_change: editFieldsData.security?.macAddressChanges.selected,
-      promiscuous: editFieldsData.security?.promiscuousMode.selected,
-    },
-    shaping: {},
-    teaming: {
-      mode: editFieldsData.teamingFailover?.loadBalancing.selected,
-      link_detection_mode:
-        editFieldsData.teamingFailover?.networkFailureDetection.selected,
-      notify_switches: editFieldsData.teamingFailover?.notifySwitches.selected,
-      failback: editFieldsData.teamingFailover?.failback.selected,
-    },
-  }
-
-  if (editFieldsData.trafficShaping?.status?.selected) {
-    body.shaping = {
-      enabled: true,
-      average_bw: editFieldsData.trafficShaping?.average,
-      peak_bw: editFieldsData.trafficShaping?.peak,
-      burst_size: editFieldsData.trafficShaping?.burstSize,
-    }
-  }
-
-  return body
-}
+import type {
+  UI_I_EditFieldsData,
+  UI_I_PortEditSendData,
+  UI_I_PortPropertiesFields,
+  UI_I_IpvFourSettingsFields,
+  UI_I_SwitchEditSendData,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+
+export const portEditDataFunc = (
+  editFieldsData: UI_I_EditFieldsData,
+  id: string
+): UI_I_PortEditSendData => {
+  const { $binary } = useNuxtApp()
+
+  const properties = editFieldsData.properties as UI_I_PortPropertiesFields
+  const ipvFourSettings: UI_I_IpvFourSettingsFields | undefined =
+    editFieldsData.ipvFourSettings
+
+  const body: UI_I_PortEditSendData = {
+    id,
+    mtu: properties?.mtu,
+    services: {
+      Management: !!properties?.services.management,
+      VMotion: !!properties?.services.vMotion,
+      Provisioning: !!properties?.services.provisioning,
+      VSAN: !!properties?.services.vSAN,
+    },
+    tcp_stack: properties?.tcpIp,
+    ipv4_settings: {
+      auto: ipvFourSettings?.ipv4Settings === '0',
+    },
+  }
+
+  if (ipvFourSettings?.ipv4Settings === '1') {
+    body.ipv4_settings = {
+      auto: false,
+      ipv4: ipvFourSettings?.ipv4Address
+        ? $binary.stringToByteIP(ipvFourSettings?.ipv4Address)
+        : 0,
+      mask: ipvFourSettings?.subnetMask
+        ? $binary.stringToByteIP(ipvFourSettings?.subnetMask)
+        : 0,
+      gateway_override: !!ipvFourSettings?.defaultGateway?.checked,
+      gateway: ipvFourSettings?.defaultGateway?.checked
+        ? ipvFourSettings?.defaultGateway?.value
+          ? $binary.stringToByteIP(ipvFourSettings?.defaultGateway?.value)
+          : 0
+        : 0,
+    }
+  }
+
+  return body
+}
+
+export const switchEditDataFunc = (
+  editFieldsData: UI_I_EditFieldsData,
+  id: string
+): UI_I_SwitchEditSendData => {
+  const body: UI_I_SwitchEditSendData = {
+    id,
+    mtu: editFieldsData.properties?.mtu,
+    nics: editFieldsData.teamingFailover?.adapters || {},
+    security: {
+      forged_transmits: editFieldsData.security?.forgedTransmits.selected,
+      mac_change: editFieldsData.security?.macAddressChanges.selected,
+      promiscuous: editFieldsData.security?.promiscuousMode.selected,
+    },
+    shaping: {},
+    teaming: {
+      mode: editFieldsData.teamingFailover?.loadBalancing.selected,
+      link_detection_mode:
+        editFieldsData.teamingFailover?.networkFailureDetection.selected,
+      notify_switches: editFieldsData.teamingFailover?.notifySwitches.selected,
+      failback: editFieldsData.teamingFailover?.failback.selected,
+    },
+  }
+
+  if (editFieldsData.trafficShaping?.status?.selected) {
+    body.shaping = {
+      enabled: true,
+      average_bw: editFieldsData.trafficShaping?.average,
+      peak_bw: editFieldsData.trafficShaping?.peak,
+      burst_size: editFieldsData.trafficShaping?.burstSize,
+    }
+  }
+
+  return body
+}

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>