bfg-common 1.6.89 → 1.6.91

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