bfg-common 1.5.869 → 1.5.871

package/components/common/wizards/network/add/mappers/mappers.ts

@@ -1,199 +1,199 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_EditFieldsData,
-  UI_I_OverrideValue,
-  UI_I_PropertiesFields,
-  UI_I_SecurityFields,
-  UI_I_TeamingFailoverWithAdaptersFields,
-  UI_I_TrafficShapingFields,
-  API_UI_I_Security,
-  API_UI_I_Teaming,
-  UI_I_ModalsInitialData,
-  UI_I_NetworkEditSendData,
-} from '~/components/common/diagramMain/lib/models/interfaces'
-
-export const networkEditDataFunc = (
-  networkData: UI_I_EditFieldsData,
-  initialData: UI_I_ModalsInitialData,
-  vlanLocal: [string, string]
-): UI_I_NetworkEditSendData => {
-  const { vlanId, networkLabel } =
-    networkData.properties as UI_I_PropertiesFields
-  const { promiscuousMode, macAddressChanges, forgedTransmits } =
-    networkData.security as UI_I_SecurityFields
-  const {
-    status: shapingStatus,
-    average,
-    burstSize,
-    peak,
-  } = networkData.trafficShaping as UI_I_TrafficShapingFields
-  const {
-    loadBalancing,
-    networkFailureDetection,
-    notifySwitches,
-    failback,
-    failoverOrder,
-    adapters: { active, unused, standby },
-  } = networkData.teamingFailover as UI_I_TeamingFailoverWithAdaptersFields
-
-  const vlan: number =
-    vlanId === vlanLocal[0]
-      ? 0
-      : vlanId === vlanLocal[1]
-      ? 4095
-      : Number(vlanId)
-
-  const security: API_UI_I_Security = {}
-
-  if (promiscuousMode.checked) {
-    security.promiscuous = promiscuousMode.selected
-  } else {
-    security.promiscuous_computed = promiscuousMode.selected
-  }
-
-  if (forgedTransmits.checked) {
-    security.forged_transmits = forgedTransmits.selected
-  } else {
-    security.forged_transmits_computed = forgedTransmits.selected
-  }
-
-  if (macAddressChanges.checked) {
-    security.mac_change = macAddressChanges.selected
-  } else {
-    security.mac_change_computed = macAddressChanges.selected
-  }
-
-  const shaping = {
-    inherit: !shapingStatus.checked,
-    enabled: !!shapingStatus.selected,
-    average_bw: average,
-    peak_bw: peak,
-    burst_size: burstSize,
-  }
-
-  const teaming: API_UI_I_Teaming = {}
-
-  if (loadBalancing.checked) {
-    teaming.mode = loadBalancing.selected
-  } else {
-    teaming.mode_computed = loadBalancing.selected
-  }
-
-  if (networkFailureDetection.checked) {
-    teaming.link_detection_mode = networkFailureDetection.selected
-  } else {
-    teaming.link_detection_mode_computed = networkFailureDetection.selected
-  }
-
-  if (notifySwitches.checked) {
-    teaming.notify_switches = notifySwitches.selected
-  } else {
-    teaming.notify_switches_computed = notifySwitches.selected
-  }
-
-  if (failback.checked) {
-    teaming.failback = failback.selected
-  } else {
-    teaming.failback_computed = failback.selected
-  }
-
-  return {
-    id: initialData.id || '',
-    name: networkLabel,
-    switch: initialData.switch_name || '',
-    nics: {
-      active,
-      standby,
-      unused,
-      inherit: !failoverOrder.checked,
-    },
-    security,
-    shaping,
-    vlan,
-    teaming,
-  }
-}
-
-export const networkInitialDataFunc = (
-  networkInitialData: UI_I_ModalsInitialData,
-  vlanLocal: [string, string]
-): UI_I_NetworkEditSendData => {
-  const prMode = networkInitialData.securityPolicy?.find(
-    (policy) => policy.id === 'promiscuous_mode'
-  )?.initialValue as UI_I_OverrideValue
-
-  const mAChMode = networkInitialData.securityPolicy?.find(
-    (policy) => policy.id === 'mac_change'
-  )?.initialValue as UI_I_OverrideValue
-
-  const fTMode = networkInitialData.securityPolicy?.find(
-    (policy) => policy.id === 'forged_transmits'
-  )?.initialValue as UI_I_OverrideValue
-
-  const failback = networkInitialData.nicTeamingPolicy?.find(
-    (team) => team.id === 'failback'
-  )?.initialValue as UI_I_OverrideValue
-
-  const notifySwitches = networkInitialData.nicTeamingPolicy?.find(
-    (team) => team.id === 'notify_switches'
-  )?.initialValue as UI_I_OverrideValue
-
-  const loadBalancing = networkInitialData.nicTeamingPolicy?.find(
-    (team) => team.id === 'mode'
-  )?.initialValue as UI_I_OverrideValue
-
-  const networkDetection = networkInitialData.nicTeamingPolicy?.find(
-    (team) => team.id === 'link_detect'
-  )?.initialValue as UI_I_OverrideValue
-
-  const vlan: number =
-    networkInitialData.vlanId === vlanLocal[0]
-      ? 0
-      : networkInitialData.vlanId === vlanLocal[1]
-      ? 4095
-      : Number(networkInitialData.vlanId)
-
-  const security = {
-    promiscuous_mode: prMode.override ? (prMode.value as string) : 'inherit',
-    mac_change: mAChMode.override ? (mAChMode.value as string) : 'inherit',
-    forged_transmits: fTMode.override ? (fTMode.value as string) : 'inherit',
-  }
-
-  const shaping = {
-    inherit: !(
-      networkInitialData.shapingPolicy?.[0].initialValue as UI_I_OverrideValue
-    ).override,
-    enabled: !!Number(
-      (networkInitialData.shapingPolicy?.[0].initialValue as UI_I_OverrideValue)
-        .value
-    ),
-    average_bw: networkInitialData.average_bw!,
-    peak_bw: networkInitialData.peak_bw!,
-    burst_size: networkInitialData.burst_size!,
-  }
-
-  const teaming = {
-    mode: loadBalancing.override ? (loadBalancing.value as string) : 'inherit',
-    link_detect: networkDetection.override
-      ? (networkDetection.value as string)
-      : 'inherit',
-    notify_switches: notifySwitches.override
-      ? (notifySwitches.value as string)
-      : 'inherit',
-    failback: failback.override ? (failback.value as string) : 'inherit',
-  }
-
-  return {
-    name: networkInitialData.networkLabel!,
-    vlan,
-    security,
-    shaping,
-    teaming,
-    override_nics: !!networkInitialData.nics_override,
-    nics: {
-      active: networkInitialData.activeAdapters as string[],
-      standby: networkInitialData.standbyAdapters as string[],
-      unused: networkInitialData.unusedAdapters as string[],
-    },
-  }
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_EditFieldsData,
+  UI_I_OverrideValue,
+  UI_I_PropertiesFields,
+  UI_I_SecurityFields,
+  UI_I_TeamingFailoverWithAdaptersFields,
+  UI_I_TrafficShapingFields,
+  API_UI_I_Security,
+  API_UI_I_Teaming,
+  UI_I_ModalsInitialData,
+  UI_I_NetworkEditSendData,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+
+export const networkEditDataFunc = (
+  networkData: UI_I_EditFieldsData,
+  initialData: UI_I_ModalsInitialData,
+  vlanLocal: [string, string]
+): UI_I_NetworkEditSendData => {
+  const { vlanId, networkLabel } =
+    networkData.properties as UI_I_PropertiesFields
+  const { promiscuousMode, macAddressChanges, forgedTransmits } =
+    networkData.security as UI_I_SecurityFields
+  const {
+    status: shapingStatus,
+    average,
+    burstSize,
+    peak,
+  } = networkData.trafficShaping as UI_I_TrafficShapingFields
+  const {
+    loadBalancing,
+    networkFailureDetection,
+    notifySwitches,
+    failback,
+    failoverOrder,
+    adapters: { active, unused, standby },
+  } = networkData.teamingFailover as UI_I_TeamingFailoverWithAdaptersFields
+
+  const vlan: number =
+    vlanId === vlanLocal[0]
+      ? 0
+      : vlanId === vlanLocal[1]
+      ? 4095
+      : Number(vlanId)
+
+  const security: API_UI_I_Security = {}
+
+  if (promiscuousMode.checked) {
+    security.promiscuous = promiscuousMode.selected
+  } else {
+    security.promiscuous_computed = promiscuousMode.selected
+  }
+
+  if (forgedTransmits.checked) {
+    security.forged_transmits = forgedTransmits.selected
+  } else {
+    security.forged_transmits_computed = forgedTransmits.selected
+  }
+
+  if (macAddressChanges.checked) {
+    security.mac_change = macAddressChanges.selected
+  } else {
+    security.mac_change_computed = macAddressChanges.selected
+  }
+
+  const shaping = {
+    inherit: !shapingStatus.checked,
+    enabled: !!shapingStatus.selected,
+    average_bw: average,
+    peak_bw: peak,
+    burst_size: burstSize,
+  }
+
+  const teaming: API_UI_I_Teaming = {}
+
+  if (loadBalancing.checked) {
+    teaming.mode = loadBalancing.selected
+  } else {
+    teaming.mode_computed = loadBalancing.selected
+  }
+
+  if (networkFailureDetection.checked) {
+    teaming.link_detection_mode = networkFailureDetection.selected
+  } else {
+    teaming.link_detection_mode_computed = networkFailureDetection.selected
+  }
+
+  if (notifySwitches.checked) {
+    teaming.notify_switches = notifySwitches.selected
+  } else {
+    teaming.notify_switches_computed = notifySwitches.selected
+  }
+
+  if (failback.checked) {
+    teaming.failback = failback.selected
+  } else {
+    teaming.failback_computed = failback.selected
+  }
+
+  return {
+    id: initialData.id || '',
+    name: networkLabel,
+    switch: initialData.switch_name || '',
+    nics: {
+      active,
+      standby,
+      unused,
+      inherit: !failoverOrder.checked,
+    },
+    security,
+    shaping,
+    vlan,
+    teaming,
+  }
+}
+
+export const networkInitialDataFunc = (
+  networkInitialData: UI_I_ModalsInitialData,
+  vlanLocal: [string, string]
+): UI_I_NetworkEditSendData => {
+  const prMode = networkInitialData.securityPolicy?.find(
+    (policy) => policy.id === 'promiscuous_mode'
+  )?.initialValue as UI_I_OverrideValue
+
+  const mAChMode = networkInitialData.securityPolicy?.find(
+    (policy) => policy.id === 'mac_change'
+  )?.initialValue as UI_I_OverrideValue
+
+  const fTMode = networkInitialData.securityPolicy?.find(
+    (policy) => policy.id === 'forged_transmits'
+  )?.initialValue as UI_I_OverrideValue
+
+  const failback = networkInitialData.nicTeamingPolicy?.find(
+    (team) => team.id === 'failback'
+  )?.initialValue as UI_I_OverrideValue
+
+  const notifySwitches = networkInitialData.nicTeamingPolicy?.find(
+    (team) => team.id === 'notify_switches'
+  )?.initialValue as UI_I_OverrideValue
+
+  const loadBalancing = networkInitialData.nicTeamingPolicy?.find(
+    (team) => team.id === 'mode'
+  )?.initialValue as UI_I_OverrideValue
+
+  const networkDetection = networkInitialData.nicTeamingPolicy?.find(
+    (team) => team.id === 'link_detect'
+  )?.initialValue as UI_I_OverrideValue
+
+  const vlan: number =
+    networkInitialData.vlanId === vlanLocal[0]
+      ? 0
+      : networkInitialData.vlanId === vlanLocal[1]
+      ? 4095
+      : Number(networkInitialData.vlanId)
+
+  const security = {
+    promiscuous_mode: prMode.override ? (prMode.value as string) : 'inherit',
+    mac_change: mAChMode.override ? (mAChMode.value as string) : 'inherit',
+    forged_transmits: fTMode.override ? (fTMode.value as string) : 'inherit',
+  }
+
+  const shaping = {
+    inherit: !(
+      networkInitialData.shapingPolicy?.[0].initialValue as UI_I_OverrideValue
+    ).override,
+    enabled: !!Number(
+      (networkInitialData.shapingPolicy?.[0].initialValue as UI_I_OverrideValue)
+        .value
+    ),
+    average_bw: networkInitialData.average_bw!,
+    peak_bw: networkInitialData.peak_bw!,
+    burst_size: networkInitialData.burst_size!,
+  }
+
+  const teaming = {
+    mode: loadBalancing.override ? (loadBalancing.value as string) : 'inherit',
+    link_detect: networkDetection.override
+      ? (networkDetection.value as string)
+      : 'inherit',
+    notify_switches: notifySwitches.override
+      ? (notifySwitches.value as string)
+      : 'inherit',
+    failback: failback.override ? (failback.value as string) : 'inherit',
+  }
+
+  return {
+    name: networkInitialData.networkLabel!,
+    vlan,
+    security,
+    shaping,
+    teaming,
+    override_nics: !!networkInitialData.nics_override,
+    nics: {
+      active: networkInitialData.activeAdapters as string[],
+      standby: networkInitialData.standbyAdapters as string[],
+      unused: networkInitialData.unusedAdapters as string[],
+    },
+  }
+}

package/components/common/wizards/network/add/steps/connectionSettings/ConnectionSettings.vue

@@ -1,84 +1,89 @@
-<template>
-  <component
-    :is="currentComponent"
-    v-model:fields="fields"
-    :messages-fields="props.messagesFields"
-    :alert-messages="props.alertMessages"
-    @hide-alert="onHideAlert"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_ErrorFields } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
-import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
-import type {
-  UI_I_ArbitraryObject,
-  UI_I_Localization,
-} from '~/lib/models/interfaces'
-import type { UI_I_ConnectionSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
-import {
-  validateNetworkConnectionSettingsLocal,
-  validateVlanIdConnectionSettingsLocal,
-} from '~/components/common/wizards/network/add/validations/validations'
-
-const props = defineProps<{
-  wizard: Wizard
-  connectionSettings: UI_I_ConnectionSettings
-  alertMessages: string[]
-  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./ConnectionSettingsNew.vue'))
-    : defineAsyncComponent(() => import('./ConnectionSettingsOld.vue'))
-)
-
-const emits = defineEmits<{
-  (
-    event: 'change-connection-settings',
-    connectionSettings: UI_I_ConnectionSettings
-  ): void
-  (event: 'hide-alert', stepId: 5): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const fields = ref<UI_I_ConnectionSettings>(
-  useDeepCopy(props.connectionSettings)
-)
-
-let oldFields = useDeepCopy(fields.value)
-
-watch(
-  fields,
-  (newFields: UI_I_ConnectionSettings) => {
-    oldFields.vlanId !== newFields.vlanId &&
-      validateVlanIdConnectionSettingsLocal(
-        localization.value,
-        newFields,
-        props.wizard
-      )
-
-    oldFields.networkLabel !== newFields.networkLabel &&
-      validateNetworkConnectionSettingsLocal(
-        localization.value,
-        newFields,
-        props.wizard
-      )
-
-    oldFields = useDeepCopy(fields.value)
-
-    emits('change-connection-settings', newFields)
-  },
-  { deep: true, immediate: true }
-)
-
-const onHideAlert = (): void => {
-  emits('hide-alert', 5)
-}
-</script>
+<template>
+  <component
+    :is="currentComponent"
+    v-model:fields="fields"
+    :is-processing="props.isProcessing"
+    :messages-fields="props.messagesFields"
+    :alert-messages="props.alertMessages"
+    @hide-alert="onHideAlert"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_ErrorFields } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
+import type {
+  UI_I_ArbitraryObject,
+  UI_I_Localization,
+} from '~/lib/models/interfaces'
+import type { UI_I_ConnectionSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import {
+  validateNetworkConnectionSettingsLocal,
+  validateVlanIdConnectionSettingsLocal,
+} from '~/components/common/wizards/network/add/validations/validations'
+
+const props = withDefaults(
+  defineProps<{
+    wizard: Wizard
+    connectionSettings: UI_I_ConnectionSettings
+    alertMessages: string[]
+    messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+    isProcessing?: boolean
+  }>(),
+  { isProcessing: false }
+)
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./ConnectionSettingsNew.vue'))
+    : defineAsyncComponent(() => import('./ConnectionSettingsOld.vue'))
+)
+
+const emits = defineEmits<{
+  (
+    event: 'change-connection-settings',
+    connectionSettings: UI_I_ConnectionSettings
+  ): void
+  (event: 'hide-alert', stepId: 5): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const fields = ref<UI_I_ConnectionSettings>(
+  useDeepCopy(props.connectionSettings)
+)
+
+let oldFields = useDeepCopy(fields.value)
+
+watch(
+  fields,
+  (newFields: UI_I_ConnectionSettings) => {
+    oldFields.vlanId !== newFields.vlanId &&
+      validateVlanIdConnectionSettingsLocal(
+        localization.value,
+        newFields,
+        props.wizard
+      )
+
+    oldFields.networkLabel !== newFields.networkLabel &&
+      validateNetworkConnectionSettingsLocal(
+        localization.value,
+        newFields,
+        props.wizard
+      )
+
+    oldFields = useDeepCopy(fields.value)
+
+    emits('change-connection-settings', newFields)
+  },
+  { deep: true, immediate: true }
+)
+
+const onHideAlert = (): void => {
+  emits('hide-alert', 5)
+}
+</script>

package/components/common/wizards/network/add/steps/connectionSettings/ConnectionSettingsNew.vue

@@ -14,6 +14,7 @@
           :placeholder="localization.common.networkLabel"
           size="md"
           :error="props.messagesFields.name.field"
+          :disabled="props.isProcessing"
         />
       </div>
     </div>
@@ -34,6 +35,7 @@
           :placeholder="localization.common.vlanId"
           :error="!!props.messagesFields.vlan.field"
           :error-text="props.messagesFields.vlan.field"
+          :disabled="props.isProcessing"
           error-type="default"
           width="auto"
         />
@@ -54,6 +56,7 @@ import { vlanIdSelectDataFunc } from '~/components/common/wizards/network/add/li
 const props = defineProps<{
   fields: UI_I_ConnectionSettings
   messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+  isProcessing: boolean
 }>()
 
 const emits = defineEmits<{