bfg-common 1.6.73 → 1.6.74

package/components/common/diagramMain/modals/editSettings/{modal/EditSettingsModalOld.vue → EditSettingsModal.vue}

@@ -4,7 +4,7 @@
       :width="props.width"
       :height="props.height"
       :show="props.show"
-      :title="props.modalTitle"
+      :title="title"
       :modal-loading="props.isEditModalLoading"
       :class="[
         'diagram-action__edit',
@@ -13,16 +13,15 @@
         },
       ]"
       @hide="onHideEditSettingsModal"
-      @submit="emits('change-flag-send-data')"
+      @submit="onSendDataRequest"
     >
       <template #modalBody>
         <common-diagram-main-modals-edit-settings
-          v-model:network-edit-data="networkEditData"
           :items="props.items"
           :view-name="props.viewName"
           :initial-data="props.initialData"
           :adapters="props.adapters"
-          :flag-send-data="props.flagSendData"
+          :flag-send-data="flagSendData"
           :is-dark-mode="props.isDarkMode"
           @send-edit-data="onSendData"
           @change-edit-fields-data="onChangeEditFieldsData"
@@ -34,24 +33,45 @@
 </template>
 
 <script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_EditFieldsData } from '~/components/common/diagramMain/lib/models/interfaces'
-import type { UI_I_PortViewSettingsModalExtendedProps } from '~/components/common/diagramMain/modals/editSettings/lib/models/interfaces'
-
-const props = defineProps<UI_I_PortViewSettingsModalExtendedProps>()
-
+import type { UI_I_PortViewSettingsModalProps } from '~/components/common/diagramMain/modals/editSettings/lib/models/interfaces'
+
+const props = withDefaults(defineProps<UI_I_PortViewSettingsModalProps>(), {
+  initialData: () => ({}),
+  title: 'Network',
+  adapters: () => ({
+    total_pages: 0,
+    total_items: 0,
+    items: [],
+  }),
+  isEditModalLoading: false,
+})
+
+// Modal hiding
 const emits = defineEmits<{
   (event: 'hide'): void
   (event: 'change-edit-fields-data', editFieldsData: UI_I_EditFieldsData): void
-  (event: 'send-edit-data', type: string): void
+  (
+    event: 'send-edit-data',
+    type: string,
+    hideModal: () => void,
+    id?: string
+  ): void
   (
     event: 'check-network-label',
     label: string,
     sendMessage: (message: string) => void
   ): void
-  (event: 'change-flag-send-data'): void
 }>()
 
-const networkEditData = defineModel<UI_I_EditFieldsData>('network-edit-data')
+// UI_I_Localization
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+// Title
+const title = computed(
+  () => props.title + localization.value.common.networkEditSettings
+)
 
 const onCheckNetworkLabel = (
   label: string,
@@ -68,8 +88,27 @@ const onChangeEditFieldsData = (newEditFieldsData: UI_I_EditFieldsData) => {
   emits('change-edit-fields-data', newEditFieldsData)
 }
 
+const flagSendData = ref(true)
+
+const onSendDataRequest = () => {
+  flagSendData.value = !flagSendData.value
+}
+
+const isSphereProject = computed<boolean>(() => props.project === 'sphere')
+
 const onSendData = (type: string) => {
-  emits('send-edit-data', type)
+  const typeLocal = isSphereProject.value
+    ? props.networkType
+      ? `${type}${props.networkType}`
+      : type
+    : type
+
+  emits(
+    'send-edit-data',
+    typeLocal,
+    onHideEditSettingsModal,
+    props.initialData.id || props.title
+  )
 }
 </script>
 

package/components/common/diagramMain/modals/editSettings/lib/models/interfaces.ts

@@ -22,9 +22,3 @@ export interface UI_I_PortViewSettingsModalProps {
   networkType: string
   project: UI_T_Project
 }
-
-export interface UI_I_PortViewSettingsModalExtendedProps
-  extends UI_I_PortViewSettingsModalProps {
-  modalTitle?: string
-  flagSendData: boolean
-}

package/components/common/diagramMain/modals/editSettings/tabs/{networkProperties/NetworkPropertiesOld.vue → NetworkProperties.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="network-properties-alert"
-        @remove="emits('hide-error-message-alert')"
+        @remove="onHideErrorMessageAlert"
       />
       <form id="network-properties-form">
         <div class="horizontal-flex-container">
@@ -53,7 +53,7 @@
                 <div class="flex-align-center">
                   <atoms-combobox
                     v-model="fieldsValues.vlanId"
-                    :items="props.vlanIdSelectData"
+                    :items="vlanIdSelectDataLocal"
                     test-id="vlan-id-select-combobox"
                     @click.stop
                     @select="selectVlanId"
@@ -87,31 +87,132 @@
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type {
+  UI_I_ModalsInitialData,
   UI_I_EditSettingsErrorMessage,
   UI_I_PropertiesFields,
 } from '~/components/common/diagramMain/lib/models/interfaces'
-import type { UI_I_VlanIdData } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import type { UI_T_PropertiesFieldName } from '~/components/common/diagramMain/lib/models/types'
 import { validationMessagesArrayFunc } from '~/components/common/diagramMain/modals/lib/utils'
+import { vlanIdSelectDataFunc } from '~/components/common/wizards/network/add/lib/config/config'
 
-const props = defineProps<{
-  isShowErrorMessage: boolean
-  errorMessages: UI_I_EditSettingsErrorMessage
-  vlanIdSelectData: UI_I_VlanIdData[]
-}>()
+// Props from up
+const props = withDefaults(
+  defineProps<{
+    isShowErrorMessageAlert: boolean
+    errorMessages: UI_I_EditSettingsErrorMessage
+    networkAlreadyExists: boolean
+    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-edit-properties-data',
+    propertiesData: UI_I_PropertiesFields
+  ): void
 }>()
 
+const validationMessagesArray = computed(() =>
+  validationMessagesArrayFunc(['networkLabel', 'vlanId'], props.errorMessages)
+)
+
+// UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
+const vlanIdSelectDataLocal = computed<UI_I_Localization>(() =>
+  vlanIdSelectDataFunc(localization.value)
+)
 
-const fieldsValues = defineModel<UI_I_PropertiesFields>()
+// For showing component validation errors on the top of modal
+const isShowErrorMessage = computed<boolean>(
+  () => props.isShowErrorMessageAlert && props.hasErrorMessages
+)
+
+const fieldsValues = ref<UI_I_PropertiesFields>(
+  useDeepCopy({
+    vlanId: props.initialData.vlanId || `${localization.value.common.none} (0)`,
+    networkLabel: props.initialData.networkLabel || 'Network',
+  })
+)
 
 const selectVlanId = (id: string): void => {
   fieldsValues.value.vlanId = id
 }
 
-const validationMessagesArray = computed(() =>
-  validationMessagesArrayFunc(['networkLabel', 'vlanId'], props.errorMessages)
+const onHideErrorMessageAlert = () => emits('hide-error-message-alert')
+
+const onChangeData = (data: UI_I_PropertiesFields) =>
+  emits('change-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) => ({
+  vlanId: local.common.vlanIdInvalidMessage,
+  networkLabel: local.common.networkLabelInvalidMessage,
+})
+
+const isNumberInRange = (value: number | string, down: number, up: number) =>
+  isNaN(Number(value)) || Number(value) < down || Number(value) > up
+
+const setMessageOnChangedField = (
+  values: string | number,
+  name: UI_T_PropertiesFieldName,
+  text: string
+) => {
+  if (name === 'networkLabel' && !values) {
+    changeErrorMessage(text, name)
+    return
+  } else if (name === 'networkLabel' && props.networkAlreadyExists) return
+
+  if (
+    name === 'vlanId' &&
+    values !== `${localization.value.common.none} (0)` &&
+    values !== `${localization.value.common.all} (4095)` &&
+    (isNumberInRange(values, 0, 4095) || values === '')
+  ) {
+    changeErrorMessage(text, name)
+    return
+  }
+  changeErrorMessage('', name)
+}
+
+watch(
+  fieldsValues,
+  (newValues: UI_I_PropertiesFields) => {
+    setMessageOnChangedField(
+      newValues.vlanId,
+      'vlanId',
+      messageTexts(localization.value).vlanId
+    )
+    setMessageOnChangedField(
+      newValues.networkLabel,
+      'networkLabel',
+      messageTexts(localization.value).networkLabel
+    )
+    onChangeData(newValues)
+    !props.hasErrorMessages && onHideErrorMessageAlert()
+  },
+  { deep: true }
 )
+
+onMounted(() => {
+  onChangeData(fieldsValues.value)
+})
+onUnmounted(() => {
+  onHideErrorMessageAlert()
+})
 </script>

package/components/common/diagramMain/modals/editSettings/tabs/{security/SecurityOld.vue → Security.vue}

@@ -34,12 +34,11 @@
                         data-id="promiscuous-mode-select"
                         name="selectName"
                       >
-                        <option
-                          v-for="item in selectItems"
-                          :value="item.value"
-                          :label="item.text"
-                        >
-                          {{ item.text }}
+                        <option :value="2" :label="localization.common.reject">
+                          {{ localization.common.reject }}
+                        </option>
+                        <option :value="1" :label="localization.common.accept">
+                          {{ localization.common.accept }}
                         </option>
                       </select>
                     </div>
@@ -81,12 +80,11 @@
                         data-id="mac-address-select"
                         name="selectName"
                       >
-                        <option
-                          v-for="item in selectItems"
-                          :value="item.value"
-                          :label="item.text"
-                        >
-                          {{ item.text }}
+                        <option :value="2" :label="localization.common.reject">
+                          {{ localization.common.reject }}
+                        </option>
+                        <option :value="1" :label="localization.common.accept">
+                          {{ localization.common.accept }}
                         </option>
                       </select>
                     </div>
@@ -128,12 +126,11 @@
                         data-id="forged-transmits-select"
                         name="selectName"
                       >
-                        <option
-                          v-for="item in selectItems"
-                          :value="item.value"
-                          :label="item.text"
-                        >
-                          {{ item.text }}
+                        <option :value="2" :label="localization.common.reject">
+                          {{ localization.common.reject }}
+                        </option>
+                        <option :value="1" :label="localization.common.accept">
+                          {{ localization.common.accept }}
                         </option>
                       </select>
                     </div>
@@ -150,18 +147,44 @@
 
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_SecurityFields } from '~/components/common/diagramMain/lib/models/interfaces'
-import { selectItemFunc } from '~/components/common/diagramMain/modals/editSettings/lib/config/config'
+import type {
+  UI_I_ModalsInitialData,
+  UI_I_SecurityFields,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+import { securityFieldsInitialFunc } from '~/components/common/diagramMain/modals/lib/config'
 
-const props = defineProps<{
-  isSwitch: boolean
+// Props from up
+const props = withDefaults(
+  defineProps<{
+    isSwitch: boolean
+    initialData?: UI_I_ModalsInitialData
+  }>(),
+  {
+    isSwitch: false,
+    initialData: undefined,
+  }
+)
+
+const emits = defineEmits<{
+  (event: 'change-edit-security-data', securityData: UI_I_SecurityFields): void
 }>()
 
+// UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const fieldsValues = defineModel<UI_I_SecurityFields>()
+const fieldsValues = ref<UI_I_SecurityFields>(
+  securityFieldsInitialFunc(props.isSwitch, props.initialData)
+)
+
+onMounted(() => {
+  emits('change-edit-security-data', fieldsValues.value)
+})
 
-const selectItems = computed<{ text: string; value: number }[]>(() =>
-  selectItemFunc(localization.value)
+watch(
+  fieldsValues,
+  (newFieldsValues: UI_I_SecurityFields) => {
+    emits('change-edit-security-data', newFieldsValues)
+  },
+  { deep: true }
 )
 </script>

package/components/common/diagramMain/modals/editSettings/tabs/{switchProperties/SwitchPropertiesOld.vue → SwitchProperties.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="switch-properties-alert"
-        @remove="emits('hide-error-message-alert')"
+        @remove="onHideErrorMessageAlert"
       />
       <form id="switch-properties-form">
         <div class="horizontal-flex-container">
@@ -16,7 +16,7 @@
           <div class="margin-left-property-value-group">
             <div class="property-value-group">
               <fieldset>
-                {{ props.portsNumber }}
+                {{ props.initialData.num_ports }}
               </fieldset>
             </div>
           </div>
@@ -63,25 +63,102 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type {
   UI_I_SwitchPropertiesFields,
   UI_I_EditSettingsErrorMessage,
+  UI_I_ModalsInitialData,
 } from '~/components/common/diagramMain/lib/models/interfaces'
+import type { UI_T_PortPropertiesFieldName } from '~/components/common/diagramMain/lib/models/types'
 import { validationMessagesArrayFunc } from '~/components/common/diagramMain/modals/lib/utils'
 
-const props = defineProps<{
-  isShowErrorMessage: boolean
-  validationMessagesArray: string[]
-  errorMessages: UI_I_EditSettingsErrorMessage
-  portsNumber: string
-}>()
+// 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-edit-properties-data',
+    switchPropertiesData: UI_I_SwitchPropertiesFields
+  ): void
 }>()
 
+const validationMessagesArray = computed(() =>
+  validationMessagesArrayFunc(['mtu'], props.errorMessages)
+)
+
+// UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const fieldsValues = defineModel<UI_I_SwitchPropertiesFields>()
+// For showing component validation errors on the top of modal
+const isShowErrorMessage = computed<boolean>(
+  () => props.isShowErrorMessageAlert && props.hasErrorMessages
+)
 
-const validationMessagesArray = computed(() =>
-    validationMessagesArrayFunc(['mtu'], props.errorMessages)
+const fieldsValues = ref<UI_I_SwitchPropertiesFields>({
+  mtu: props.initialData.mtu || 0,
+  num_ports: props.initialData.num_ports || '',
+})
+
+const onHideErrorMessageAlert = () => emits('hide-error-message-alert')
+const onChangeData = (data: UI_I_SwitchPropertiesFields) =>
+  emits('change-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.mtuInvalidMessage,
+})
+
+const setMessageOnChangedField = (
+  values: number,
+  name: UI_T_PortPropertiesFieldName,
+  text: string
+) => {
+  if (values < 1280 || values > 65535) {
+    changeErrorMessage(text, name)
+    return
+  }
+  changeErrorMessage('', name)
+}
+
+watch(
+  fieldsValues,
+  (newValues: UI_I_SwitchPropertiesFields) => {
+    setMessageOnChangedField(
+      newValues.mtu,
+      'mtu',
+      messageTexts(localization.value).mtu
+    )
+    onChangeData(newValues)
+    !props.hasErrorMessages && onHideErrorMessageAlert()
+  },
+  {
+    deep: true,
+  }
 )
+
+onMounted(() => {
+  onChangeData(fieldsValues.value)
+})
+
+onUnmounted(() => {
+  onHideErrorMessageAlert()
+})
 </script>

package/components/common/diagramMain/modals/editSettings/tabs/{teamingFailover/TeamingFailoverOld.vue → TeamingFailover.vue}

@@ -4,7 +4,7 @@
       <form id="teaming-failover">
         <section class="form-block">
           <template
-            v-for="(item, key) in props.teamingAndFailoverTemplate"
+            v-for="(item, key) in teamingAndFailoverTemplate"
             :key="item.key"
           >
             <div class="horizontal-flex-container">
@@ -107,28 +107,65 @@ import type {
   UI_I_TeamingAndFailoverTemplate,
   UI_I_AdapterStatus,
 } from '~/components/common/diagramMain/lib/models/interfaces'
+import {
+  teamingFailoverFieldsInitialFunc,
+  teamingAndFailoverTemplateMakerFunc,
+} from '~/components/common/diagramMain/modals/lib/config'
 
-const props = defineProps<{
-  teamingAndFailoverTemplate: UI_I_TeamingAndFailoverTemplate[]
-  isSwitch: boolean
-  adapters: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
-  initialData: UI_I_ModalsInitialData
-  adapterStatus: UI_I_AdapterStatus
-  isDarkMode: boolean
-}>()
+// Props from up
+const props = withDefaults(
+  defineProps<{
+    adapters: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
+    adapterStatus: UI_I_AdapterStatus
+    isSwitch: boolean
+    initialData?: UI_I_ModalsInitialData
+    isDarkMode?: boolean
+  }>(),
+  {
+    initialData: () => ({}),
+    isSwitch: false,
+    isDarkMode: false,
+  }
+)
 
 const emits = defineEmits<{
+  (
+    event: 'change-edit-teaming-failover-data',
+    teamingFailoverData: UI_I_TeamingFailoverFields
+  ): void
   (event: 'change-adapter-status', adapterStatus: UI_I_AdapterStatus): void
 }>()
 
+// UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const fieldsValues = defineModel<UI_I_TeamingFailoverFields>()
+// Making fields template
+const teamingAndFailoverTemplate = computed<UI_I_TeamingAndFailoverTemplate[]>(
+  () => teamingAndFailoverTemplateMakerFunc(localization.value)
+)
+// Temporary data for this component
+const fieldsValues = ref<UI_I_TeamingFailoverFields>(
+  teamingFailoverFieldsInitialFunc(props.isSwitch, props.initialData)
+)
+
+const onChangeData = (data: UI_I_TeamingFailoverFields) =>
+  emits('change-edit-teaming-failover-data', data)
 
 const onChangeAdapterStatus = (adapterStatus: UI_I_AdapterStatus) =>
   emits('change-adapter-status', adapterStatus)
-</script>
 
+watch(
+  fieldsValues,
+  (newFieldsValues: UI_I_TeamingFailoverFields) => {
+    onChangeData(newFieldsValues)
+  },
+  { deep: true, immediate: true }
+)
+
+onMounted(() => {
+  onChangeData(fieldsValues.value)
+})
+</script>
 <style lang="scss" scoped>
 :deep(.diagram-action__edit) {
   .table-fixed-height {