bfg-common 1.6.76 → 1.6.77

package/components/common/diagramMain/modals/editSettings/tabs/{trafficShaping/TrafficShapingOld.vue → TrafficShaping.vue}

@@ -2,11 +2,11 @@
   <div class="wizard-content__container">
     <div class="wizard-content">
       <atoms-alert
-        v-if="props.isShowErrorMessage"
+        v-if="isShowErrorMessage"
         :items="validationMessagesArray"
         status="alert-danger"
         test-id="traffic-shaping-alert"
-        @remove="emits('hide-error-message-alert')"
+        @remove="onHideErrorMessageAlert"
       />
       <form id="traffic-shaping-form" action="">
         <div class="horizontal-flex-container">
@@ -249,29 +249,151 @@
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type {
+  UI_I_ModalsInitialData,
   UI_I_TrafficShapingFields,
   UI_I_EditSettingsErrorMessage,
 } from '~/components/common/diagramMain/lib/models/interfaces'
+import type { UI_T_TrafficShapingFieldName } from '~/components/common/diagramMain/lib/models/types'
 import { validationMessagesArrayFunc } from '~/components/common/diagramMain/modals/lib/utils'
+import { trafficShapingFieldsInitialFunc } from '~/components/common/diagramMain/modals/lib/config'
 
-const props = defineProps<{
-  isShowErrorMessage: boolean
-  errorMessages: UI_I_EditSettingsErrorMessage
-  isSwitch: boolean
-}>()
+// Props from up
+const props = withDefaults(
+  defineProps<{
+    isShowErrorMessageAlert: boolean
+    errorMessages: UI_I_EditSettingsErrorMessage
+    isSwitch: boolean
+    initialData?: UI_I_ModalsInitialData
+    hasErrorMessages?: boolean
+  }>(),
+  {
+    initialData: () => ({}),
+    isSwitch: false,
+    hasErrorMessages: undefined,
+  }
+)
 
+// Validation
 const emits = defineEmits<{
+  (
+    event: 'change-error-messages',
+    errorMessage: string,
+    fieldName: keyof UI_I_EditSettingsErrorMessage
+  ): void
   (event: 'hide-error-message-alert'): void
+  (
+    event: 'change-edit-traffic-shaping-data',
+    trafficShapingData: UI_I_TrafficShapingFields
+  ): void
 }>()
 
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const fieldsValues = defineModel<UI_I_TrafficShapingFields>()
-
-const validationMessagesArray = computed<string[]>(() =>
+const validationMessagesArray = computed(() =>
   validationMessagesArrayFunc(
     ['average', 'peak', 'burstSize'],
     props.errorMessages
   )
 )
+
+// UI_I_Localization
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+// For showing component validation errors on the top of modal
+const isShowErrorMessage = computed<boolean>(
+  () => props.isShowErrorMessageAlert && props.hasErrorMessages
+)
+
+const fieldsValues = ref<UI_I_TrafficShapingFields>(
+  trafficShapingFieldsInitialFunc(props.isSwitch, props.initialData)
+)
+
+const onHideErrorMessageAlert = (): void => emits('hide-error-message-alert')
+
+const onChangeData = (data: UI_I_TrafficShapingFields) =>
+  emits('change-edit-traffic-shaping-data', data)
+
+const messageTexts = (local: UI_I_Localization) => ({
+  average: local.common.averageInvalidError,
+  peak: local.common.peakInvalidError,
+  burstSize: local.common.burstSizeInvalidError,
+  averageBig: local.common.averageBigInvalidError,
+  peakBig: local.common.peakBigInvalidError,
+  burstSizeBig: local.common.burstSizeBigInvalidError,
+})
+
+const changeErrorMessage = (
+  errorMessage: string,
+  fieldName: keyof UI_I_EditSettingsErrorMessage
+) => emits('change-error-messages', errorMessage, fieldName)
+
+const MAX_BANDWIDTH = 9_007_199_254_740_991
+const setMessageOnChangedField = (
+  values: number[],
+  index: number,
+  name: UI_T_TrafficShapingFieldName,
+  text1: string,
+  text2: string
+): void => {
+  if (
+    !fieldsValues.value.status.checked ||
+    fieldsValues.value.status.selected === 0
+  ) {
+    changeErrorMessage('', 'average')
+    changeErrorMessage('', 'peak')
+    changeErrorMessage('', 'burstSize')
+    return
+  }
+
+  if (values[index] >= 1 && values[index] <= MAX_BANDWIDTH) {
+    changeErrorMessage('', name)
+  } else if (values[index] < 1) {
+    changeErrorMessage(text1, name)
+  } else if (values[index] > MAX_BANDWIDTH) {
+    changeErrorMessage(text2, name)
+  }
+}
+
+watch(
+  fieldsValues,
+  (newFieldsValues: UI_I_TrafficShapingFields): void => {
+    const { average, peak, burstSize } = newFieldsValues
+    const arrayValues = [average, peak, burstSize]
+
+    setMessageOnChangedField(
+      arrayValues,
+      0,
+      'average',
+      messageTexts(localization.value).average,
+      messageTexts(localization.value).averageBig
+    )
+    setMessageOnChangedField(
+      arrayValues,
+      1,
+      'peak',
+      messageTexts(localization.value).peak,
+      messageTexts(localization.value).peakBig
+    )
+    setMessageOnChangedField(
+      arrayValues,
+      2,
+      'burstSize',
+      messageTexts(localization.value).burstSize,
+      messageTexts(localization.value).burstSizeBig
+    )
+
+    onChangeData(newFieldsValues)
+    !props.hasErrorMessages && onHideErrorMessageAlert()
+  },
+  {
+    deep: true,
+  }
+)
+
+onMounted(() => {
+  onChangeData(fieldsValues.value)
+})
+onUnmounted((): void => {
+  onHideErrorMessageAlert()
+})
 </script>
+
+<style scoped lang="scss"></style>

package/components/common/diagramMain/modals/editSettings/tabs/port/{ipvFourSettings/IpvFourSettingsOld.vue → IpvFourSettings.vue}

@@ -2,11 +2,11 @@
   <div class="wizard-content__container">
     <div class="wizard-content wizard-content-port">
       <atoms-alert
-        v-if="props.isShowErrorMessage"
+        v-if="isShowErrorMessage"
         :items="validationMessagesArray"
         status="alert-danger"
         test-id="ipv-four-settings-alert"
-        @remove="emits('hide-error-message-alert')"
+        @remove="onHideErrorMessageAlert"
       />
       <form>
         <div class="radio">
@@ -185,26 +185,167 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type {
   UI_I_EditSettingsErrorMessage,
   UI_I_IpvFourSettingsFields,
+  UI_I_ModalsInitialData,
 } from '~/components/common/diagramMain/lib/models/interfaces'
+import type { UI_T_IpFourSettingsFieldName } from '~/components/common/wizards/network/add/lib/models/types'
 import { validationMessagesArrayFunc } from '~/components/common/diagramMain/modals/lib/utils'
 
-const props = defineProps<{
-  isShowErrorMessage: boolean
-  errorMessages: UI_I_EditSettingsErrorMessage
-}>()
+const props = withDefaults(
+  defineProps<{
+    isShowErrorMessageAlert: boolean
+    errorMessages: UI_I_EditSettingsErrorMessage
+    initialData?: UI_I_ModalsInitialData
+    hasErrorMessages?: boolean
+  }>(),
+  {
+    initialData: () => ({}),
+    hasErrorMessages: undefined,
+  }
+)
 
+// Validation
 const emits = defineEmits<{
+  (
+    event: 'change-error-messages',
+    errorMessage: string,
+    fieldName: keyof UI_I_EditSettingsErrorMessage
+  ): void
   (event: 'hide-error-message-alert'): void
+  (
+    event: 'change-port-ipv-four-data',
+    newPortEditIpvFourData: UI_I_IpvFourSettingsFields
+  ): void
 }>()
 
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const fieldsValues = defineModel<UI_I_IpvFourSettingsFields>()
-
-const validationMessagesArray = computed<string[]>(() =>
+const validationMessagesArray = computed(() =>
   validationMessagesArrayFunc(
     ['ipFourAddress', 'subnetMask', 'defaultGateway'],
     props.errorMessages
   )
 )
+
+// UI_I_Localization
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+// For showing component validation errors on the top of modal
+const isShowErrorMessage = computed<boolean>(
+  () => props.isShowErrorMessageAlert && props.hasErrorMessages
+)
+
+const fieldsValues = ref<UI_I_IpvFourSettingsFields>(
+  useDeepCopy(props.initialData.tcpConfig)
+)
+
+const onHideErrorMessageAlert = (): void => emits('hide-error-message-alert')
+
+const onChangeData = (data: UI_I_IpvFourSettingsFields) =>
+  emits('change-port-ipv-four-data', data)
+
+const changeErrorMessage = (
+  errorMessage: string,
+  fieldName: keyof UI_I_EditSettingsErrorMessage
+) => emits('change-error-messages', errorMessage, fieldName)
+
+const checkIfValidIP = (str: string) => {
+  const regexExp =
+    /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/gi
+
+  return regexExp.test(str)
+}
+
+const messageTexts = (local: UI_I_Localization) => ({
+  ipFourAddressEmpty: local.common.ipFourAddressEmpty,
+  subnetMaskEmpty: local.common.subnetMaskEmpty,
+  defaultGatewayEmpty: local.common.defaultGatewayEmpty,
+  ipFourAddressInvalid: local.common.ipFourAddressInvalid,
+  subnetMaskInvalid: local.common.subnetMaskInvalid,
+  defaultGatewayInvalid: local.common.defaultGatewayInvalid,
+})
+
+const setMessageOnChangedField = (
+  values: string,
+  name: UI_T_IpFourSettingsFieldName,
+  ipSettings: string,
+  override?: boolean
+) => {
+  if (ipSettings === '0') {
+    changeErrorMessage('', name)
+    return
+  }
+
+  if (name === 'ipFourAddress') {
+    if (!values) {
+      changeErrorMessage(messageTexts(localization.value)[`${name}Empty`], name)
+      return
+    }
+    if (!checkIfValidIP(values)) {
+      changeErrorMessage(
+        messageTexts(localization.value)[`${name}Invalid`],
+        name
+      )
+      return
+    }
+  }
+  if (name === 'subnetMask') {
+    if (!values) {
+      changeErrorMessage(messageTexts(localization.value)[`${name}Empty`], name)
+      return
+    }
+    if (!checkIfValidIP(values)) {
+      changeErrorMessage(
+        messageTexts(localization.value)[`${name}Invalid`],
+        name
+      )
+      return
+    }
+  }
+  if (name === 'defaultGateway' && override) {
+    if (!values) {
+      changeErrorMessage(messageTexts(localization.value)[`${name}Empty`], name)
+      return
+    }
+    if (!checkIfValidIP(values)) {
+      changeErrorMessage(
+        messageTexts(localization.value)[`${name}Invalid`],
+        name
+      )
+      return
+    }
+  }
+  changeErrorMessage('', name)
+}
+
+// Changing data and validate they
+watch(
+  fieldsValues,
+  (newValues: UI_I_IpvFourSettingsFields) => {
+    setMessageOnChangedField(
+      newValues.ipv4Address,
+      'ipFourAddress',
+      newValues.ipv4Settings
+    )
+    setMessageOnChangedField(
+      newValues.subnetMask,
+      'subnetMask',
+      newValues.ipv4Settings
+    )
+    setMessageOnChangedField(
+      newValues.defaultGateway.value,
+      'defaultGateway',
+      newValues.ipv4Settings,
+      newValues.defaultGateway.checked
+    )
+    onChangeData(newValues)
+    !props.hasErrorMessages && onHideErrorMessageAlert()
+  },
+  { deep: true }
+)
+
+onMounted(() => {
+  onChangeData(fieldsValues.value)
+})
+
+onUnmounted(() => {
+  onHideErrorMessageAlert()
+})
 </script>

package/components/common/diagramMain/modals/editSettings/tabs/port/{portProperties/PortPropertiesOld.vue → PortProperties.vue}

@@ -2,11 +2,11 @@
   <div class="wizard-content__container">
     <div class="wizard-content wizard-content-port">
       <atoms-alert
-        v-if="props.isShowErrorMessage"
+        v-if="isShowErrorMessage"
         :items="validationMessagesArray"
         status="alert-danger"
         test-id="port-properties-alert"
-        @remove="emits('hide-error-message-alert')"
+        @remove="onHideErrorMessageAlert"
       />
       <form id="port-properties-form">
         <b class="property-label-group">
@@ -58,7 +58,7 @@
             {{ localization.common.availableServices }}
           </b>
           <template
-            v-for="(enabledService, key) in props.portPropertiesEnabledServices"
+            v-for="(enabledService, key) in portPropertiesEnabledServices"
             :key="enabledService.modelValue"
           >
             <div class="horizontal-flex-container">
@@ -90,26 +90,117 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type {
   UI_I_PortPropertiesFields,
+  UI_I_ModalsInitialData,
   UI_I_EditSettingsErrorMessage,
 } from '~/components/common/diagramMain/lib/models/interfaces'
+import type { UI_T_PortPropertiesFieldName } from '~/components/common/diagramMain/lib/models/types'
+import { portPropertiesEnabledServicesFunc } from '~/components/common/diagramMain/modals/lib/config'
 import { validationMessagesArrayFunc } from '~/components/common/diagramMain/modals/lib/utils'
 
-const props = defineProps<{
-  isShowErrorMessage: boolean
-  errorMessages: UI_I_EditSettingsErrorMessage
-  validationMessagesArray: string[]
-  portPropertiesEnabledServices: any
-}>()
+// Props from up
+const props = withDefaults(
+  defineProps<{
+    isShowErrorMessageAlert: boolean
+    errorMessages: UI_I_EditSettingsErrorMessage
+    initialData?: UI_I_ModalsInitialData
+    hasErrorMessages?: boolean
+  }>(),
+  {
+    initialData: () => ({}),
+    hasErrorMessages: undefined,
+  }
+)
 
+// Validation
 const emits = defineEmits<{
+  (
+    event: 'change-error-messages',
+    errorMessage: string,
+    fieldName: keyof UI_I_EditSettingsErrorMessage
+  ): void
   (event: 'hide-error-message-alert'): void
+  (
+    event: 'change-port-edit-properties-data',
+    newPortEditPropertiesData: UI_I_PortPropertiesFields
+  ): void
 }>()
 
+const validationMessagesArray = computed(() =>
+  validationMessagesArrayFunc(['mtu'], props.errorMessages)
+)
+
+// UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const fieldsValues = defineModel<UI_I_PortPropertiesFields>()
+// Enabled services data with localization
+const portPropertiesEnabledServices = computed(() =>
+  portPropertiesEnabledServicesFunc(localization.value)
+)
 
-const validationMessagesArray = computed(() =>
-    validationMessagesArrayFunc(['mtu'], props.errorMessages)
+// For showing component validation errors on the top of modal
+const isShowErrorMessage = computed<boolean>(
+  () => props.isShowErrorMessageAlert && props.hasErrorMessages
 )
+
+const fieldsValues = ref<UI_I_PortPropertiesFields>(
+  useDeepCopy({
+    tcpIp: props.initialData.tcpIp,
+    mtu: props.initialData.mtu,
+    services: props.initialData.services,
+  }) as UI_I_PortPropertiesFields
+)
+
+const onHideErrorMessageAlert = (): void => emits('hide-error-message-alert')
+
+const onChangeData = (data: UI_I_PortPropertiesFields): void =>
+  emits('change-port-edit-properties-data', data)
+
+const changeErrorMessage = (
+  errorMessage: string,
+  fieldName: keyof UI_I_EditSettingsErrorMessage
+) => emits('change-error-messages', errorMessage, fieldName)
+
+const messageTexts = (local: UI_I_Localization) => ({
+  mtu: local.common.mtuInvalidError,
+})
+
+const setMessageOnChangedField = (
+  values: number[],
+  index: number,
+  name: UI_T_PortPropertiesFieldName,
+  text: string
+) => {
+  if (values[index] >= 1280 && values[index] <= 65535) {
+    changeErrorMessage('', name)
+  } else {
+    changeErrorMessage(text, name)
+  }
+}
+
+watch(
+  fieldsValues,
+  (newValues: UI_I_PortPropertiesFields): void => {
+    setMessageOnChangedField(
+      [newValues.mtu],
+      0,
+      'mtu',
+      messageTexts(localization.value).mtu
+    )
+    onChangeData(newValues)
+    !props.hasErrorMessages && onHideErrorMessageAlert()
+  },
+  {
+    deep: true,
+  }
+)
+
+onMounted(() => {
+  onChangeData(fieldsValues.value)
+})
+
+onUnmounted((): void => {
+  onHideErrorMessageAlert()
+})
 </script>
+
+<style scoped lang="scss"></style>

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

@@ -1,4 +1,3 @@
-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'
 
@@ -10,7 +9,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,
@@ -21,46 +20,6 @@ export const switchMainNavigationFunc = (
     text: localization.common.remove,
     value: 'switch-remove',
     testId: `${testId}-remove`,
-    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`,
+    permission: 'Networks.RemoveSwitch'
   },
 ]

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

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

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: `${localization.common.none2} (0)` },
+      { name: localization.common.vlanId, value: `${localization.common.none} (0)` },
       { name: localization.common.tcpIpStack, value: 'Default' },
       { name: localization.common.enabledServices },
     ],

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

@@ -2,42 +2,12 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_EditSettingsErrorMessage } from '~/components/common/diagramMain/lib/models/interfaces'
 
 export const validationMessagesArrayFunc = (
-  keyArray: (keyof UI_I_EditSettingsErrorMessage)[],
+  arr: (keyof UI_I_EditSettingsErrorMessage)[],
   errorMessages: UI_I_EditSettingsErrorMessage
 ) =>
-  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
-    )
+  arr
+    .map((ar: keyof UI_I_EditSettingsErrorMessage) => errorMessages[ar])
+    .filter((err) => err !== '')
 
 export const getNicSpeed = (
   speedInitial: number = 0,

package/components/common/diagramMain/modals/migrateVmkernelAdapter/MigrateVmkernelAdapter.vue

@@ -112,7 +112,7 @@ const title = computed<string>(
 
 const connectionSettings = ref<UI_I_ConnectionSettings>({
   networkLabel: 'VM Network',
-  vlanId: `${localization.value.common.none2} (0)`,
+  vlanId: `${localization.value.common.none} (0)`,
 })
 
 const vmkernelAdapter = ref<UI_I_SelectVmkernelAdapter>({
@@ -262,7 +262,7 @@ const reset = (): void => {
   wizard.reset()
   connectionSettings.value = {
     networkLabel: 'VM Network',
-    vlanId: `${localization.value.common.none2} (0)`,
+    vlanId: `${localization.value.common.none} (0)`,
   }
   vmkernelAdapter.value = {
     vm: '',

package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/common.ts

@@ -14,6 +14,6 @@ export const checkVlanId = (
   vlanId: string,
   localization: UI_I_Localization
 ): boolean =>
-  vlanId !== `${localization.common.none2} (0)` &&
+  vlanId !== `${localization.common.none} (0)` &&
   vlanId !== `${localization.common.all} (4095)` &&
   (isIntegerNumberInRange(vlanId, 0, 4095) || vlanId === '')

package/components/common/layout/theHeader/ThemeSwitch.vue

@@ -2,7 +2,7 @@
   <ui-tooltip
     id="tooltip-theme-mode-toggle-button"
     test-id="tooltip-theme-mode-toggle-button"
-    size="md"
+    size="sm"
     position="bottom"
     position-by-tooltip="center"
   >