bfg-common 1.6.65 → 1.6.67

package/components/common/diagramMain/modals/editSettings/{confirmTeamingSettingsModal/ConfirmTeamingSettingsModalOld.vue → ConfirmTeamingSettingsModal.vue}

@@ -4,8 +4,8 @@
     :title="localization.common.confirmTeamingAndFailoverSettings"
     class="alert-modal"
     width="576px"
-    @hide="emits('hide')"
-    @submit="emits('submit')"
+    @hide="onHide"
+    @submit="onSubmit"
   >
     <template #modalBody>
       <atoms-alert
@@ -36,5 +36,8 @@ const emits = defineEmits<{
   (event: 'submit'): void
 }>()
 
+const onHide = () => emits('hide')
+const onSubmit = () => emits('submit')
+
 const localization = computed<UI_I_Localization>(() => useLocal())
 </script>

package/components/common/diagramMain/modals/editSettings/EditSettings.vue

@@ -1,37 +1,91 @@
 <template>
-  <div class="edit-settings">
-    <component
-      :is="currentComponent"
-      v-model="selectedTab"
-      v-model:network-edit-data="networkEditData"
-      :is-network="isNetwork"
-      :is-switch="isSwitch"
-      :is-port="isPort"
-      :items="props.items"
-      :has-error-messages="hasErrorMessages"
-      :is-show-error-message-alert="isShowErrorMessageAlert"
-      :is-show-error-message-alert-new="isShowErrorMessageAlertNew"
-      :initial-data="props.initialData"
-      :network-already-exists="networkAlreadyExists"
-      :adapters="props.adapters"
-      :is-dark-mode="props.isDarkMode"
-      :is-show-without-active-adapter-modal="isShowWithoutActiveAdapterModal"
-      :adapter-status="adapterStatus"
-      :error-messages="errorMessages"
-      :flag-send-data="props.flagSendData"
-      @change-network-edit-properties-data="onChangeNetworkEditPropertiesData"
-      @change-switch-edit-properties-data="onChangeSwitchEditPropertiesData"
-      @change-port-edit-properties-data="onChangePortEditPropertiesData"
-      @change-edit-security-data="onChangeEditSecurityData"
-      @change-edit-traffic-shaping-data="onChangeEditTrafficShapingData"
-      @change-edit-teaming-failover-data="onChangeEditTeamingFailoverData"
-      @change-port-ipv-four-data="onChangePortEditIpvFourData"
-      @change-adapter-status="onChangeAdapterStatus"
-      @change-error-messages="onChangeErrorMessages"
-      @hide-error-message-alert="onHideErrorMessageAlert"
-      @show-error-message-alert="onShowErrorMessageAlert"
-      @hide-without-active-adapter-modal="onHideWithoutActiveAdapterModal"
-      @approve-without-active-adapter-modal="onApproveWithoutActiveAdapterModal"
+  <div class="wizard-tab__container">
+    <div class="vertical-tabs__fixed-position">
+      <atoms-tabs-vertical-tabs
+        v-model="selectedTab"
+        :items="props.items"
+        :has-error-messages="hasErrorMessages"
+        @set-alert="onShowErrorMessageAlert"
+      />
+    </div>
+    <template v-if="isNetwork || isSwitch">
+      <common-diagram-main-modals-edit-settings-tabs-network-properties
+        v-if="isNetwork"
+        v-show="selectedTab === '1'"
+        :is-show-error-message-alert="isShowErrorMessageAlert"
+        :error-messages="errorMessages"
+        :initial-data="props.initialData"
+        :has-error-messages="hasErrorMessages"
+        :network-already-exists="networkAlreadyExists"
+        @change-edit-properties-data="onChangeNetworkEditPropertiesData"
+        @change-error-messages="onChangeErrorMessages"
+        @hide-error-message-alert="onHideErrorMessageAlert"
+      />
+      <common-diagram-main-modals-edit-settings-tabs-switch-properties
+        v-if="isSwitch"
+        v-show="selectedTab === '1'"
+        :is-show-error-message-alert="isShowErrorMessageAlert"
+        :error-messages="errorMessages"
+        :initial-data="props.initialData"
+        :has-error-messages="hasErrorMessages"
+        @change-edit-properties-data="onChangeSwitchEditPropertiesData"
+        @change-error-messages="onChangeErrorMessages"
+        @hide-error-message-alert="onHideErrorMessageAlert"
+      />
+      <common-diagram-main-modals-edit-settings-tabs-security
+        v-show="selectedTab === '2'"
+        :is-switch="isSwitch"
+        :initial-data="props.initialData"
+        @change-edit-security-data="onChangeEditSecurityData"
+      />
+      <common-diagram-main-modals-edit-settings-tabs-traffic-shaping
+        v-show="selectedTab === '3'"
+        :is-show-error-message-alert="isShowErrorMessageAlert"
+        :error-messages="errorMessages"
+        :initial-data="props.initialData"
+        :has-error-messages="hasErrorMessages"
+        :is-switch="isSwitch"
+        @change-edit-traffic-shaping-data="onChangeEditTrafficShapingData"
+        @change-error-messages="onChangeErrorMessages"
+        @hide-error-message-alert="onHideErrorMessageAlert"
+      />
+      <common-diagram-main-modals-edit-settings-tabs-teaming-failover
+        v-show="selectedTab === '4'"
+        :is-switch="isSwitch"
+        :adapters="props.adapters"
+        :initial-data="props.initialData"
+        :adapter-status="adapterStatus"
+        :is-dark-mode="props.isDarkMode"
+        @change-edit-teaming-failover-data="onChangeEditTeamingFailoverData"
+        @change-adapter-status="onChangeAdapterStatus"
+      />
+    </template>
+    <template v-if="isPort">
+      <common-diagram-main-modals-edit-settings-tabs-port-properties
+        v-show="selectedTab === '1'"
+        :is-show-error-message-alert="isShowErrorMessageAlert"
+        :error-messages="errorMessages"
+        :initial-data="props.initialData"
+        :has-error-messages="hasErrorMessages"
+        @change-error-messages="onChangeErrorMessages"
+        @change-port-edit-properties-data="onChangePortEditPropertiesData"
+        @hide-error-message-alert="onHideErrorMessageAlert"
+      />
+      <common-diagram-main-modals-edit-settings-tabs-port-ipv-four-settings
+        v-show="selectedTab === '2'"
+        :is-show-error-message-alert="isShowErrorMessageAlert"
+        :error-messages="errorMessages"
+        :initial-data="props.initialData"
+        :has-error-messages="hasErrorMessages"
+        @change-error-messages="onChangeErrorMessages"
+        @change-port-ipv-four-data="onChangePortEditIpvFourData"
+        @hide-error-message-alert="onHideErrorMessageAlert"
+      />
+    </template>
+    <common-diagram-main-modals-edit-settings-confirm-teaming-settings-modal
+      :is-show="isShowWithoutActiveAdapterModal"
+      @hide="onHideWithoutActiveAdapterModal"
+      @submit="onApproveWithoutActiveAdapterModal"
     />
   </div>
 </template>
@@ -53,6 +107,7 @@ import type {
   UI_I_IpvFourSettingsFields,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 
+// Props from up
 const props = withDefaults(
   defineProps<{
     viewName: string
@@ -81,22 +136,15 @@ const emits = defineEmits<{
   (event: 'send-edit-data', type: string): void
 }>()
 
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./EditSettingsNew.vue'))
-    : defineAsyncComponent(() => import('./EditSettingsOld.vue'))
-)
-
+// View for the switch or the network
 const isSwitch = computed<boolean>(() => props.viewName === 'switch-edit')
 const isNetwork = computed<boolean>(() => props.viewName === 'network-edit')
 const isPort = computed<boolean>(() => props.viewName === 'port-edit')
 
+// Modal selected tab number
 const selectedTab = ref<string>('1')
 
+// Error notification from the nexted components validation
 const errorMessages = ref<UI_I_EditSettingsErrorMessage>({
   networkLabel: '',
   vlanId: '',
@@ -120,53 +168,18 @@ const hasErrorMessages = computed(
   () => !!Object.values(errorMessages.value).filter((err) => err !== '').length
 )
 
+// flag: to show error message
 const isShowErrorMessageAlert = ref<boolean>(false)
-const isShowErrorMessageAlertNew = ref<boolean[]>([])
-
-const onShowErrorMessageAlert = (tab?: number): void => {
-  if (isNewView.value && tab === undefined) {
-    if (isNetwork.value || isSwitch.value) {
-      isShowErrorMessageAlertNew.value = [
-        !!(
-          errorMessages.value.networkLabel ||
-          errorMessages.value.vlanId ||
-          errorMessages.value.mtu
-        ),
-        false,
-        !!(
-          errorMessages.value.average ||
-          errorMessages.value.peak ||
-          errorMessages.value.burstSize
-        ),
-        false,
-      ]
-    } else {
-      isShowErrorMessageAlertNew.value = [
-        !!errorMessages.value.mtu,
-        !!(
-          errorMessages.value.ipFourAddress ||
-          errorMessages.value.subnetMask ||
-          errorMessages.value.defaultGateway
-        ),
-      ]
-    }
-  } else if (isNewView.value) {
-    isShowErrorMessageAlertNew.value[tab] = true
-  } else {
-    isShowErrorMessageAlert.value = true
-  }
-}
 
-const onHideErrorMessageAlert = (tab?: string): void => {
-  if (isNewView.value) {
-    isShowErrorMessageAlertNew.value[tab] = false
-  } else {
-    isShowErrorMessageAlert.value = false
-  }
+const onShowErrorMessageAlert = (): void => {
+  isShowErrorMessageAlert.value = true
 }
 
-const networkEditData = defineModel<UI_I_EditFieldsData>('network-edit-data')
+const onHideErrorMessageAlert = (): void => {
+  isShowErrorMessageAlert.value = false
+}
 
+const networkEditData = ref<UI_I_EditFieldsData>({})
 const initialNetworkLabel = ref<string>('-initial-networkLabel-123')
 
 const isFailoverOrderOverride = computed<string | number | boolean | undefined>(
@@ -178,7 +191,6 @@ const adapterStatus = ref<UI_I_AdapterStatus>({
   standby: [],
   unused: [],
 })
-
 const adapterStatusInitial = ref<UI_I_AdapterStatus>({
   active: [],
   standby: [],
@@ -375,13 +387,13 @@ watch(selectedTab, (newSelectedTab: string, oldSelectedTab: string) => {
         return
       }
 
-      !isNewView.value && stopTabChanging(newSelectedTab)
+      stopTabChanging(newSelectedTab)
     } else if (
       selectedTabInAlertModal.value &&
       !isApprovedAdapterStatus.value &&
       isFailoverOrderOverride.value
     ) {
-      !isNewView.value && stopTabChanging(newSelectedTab)
+      stopTabChanging(newSelectedTab)
     } else if (selectedTabInAlertModal.value) {
       selectedTabInAlertModal.value = ''
     }
@@ -392,9 +404,7 @@ watch(selectedTab, (newSelectedTab: string, oldSelectedTab: string) => {
     newSelectedTab !== '1' &&
     !isCheckedNetworkLabel.value
   ) {
-    if (!isNewView.value) {
-      selectedTab.value = '1'
-    }
+    selectedTab.value = '1'
     if (
       networkLabel.value !== initialNetworkLabel.value &&
       networkLabel.value !== ''
@@ -403,9 +413,7 @@ watch(selectedTab, (newSelectedTab: string, oldSelectedTab: string) => {
         checkNetworkLabelCallback('tab', message, newSelectedTab)
       )
     } else if (networkLabel.value === '') {
-      if (!isNewView.value) {
-        onShowErrorMessageAlert()
-      }
+      onShowErrorMessageAlert()
     } else {
       isCheckedNetworkLabel.value = true
       selectedTab.value = newSelectedTab
@@ -448,12 +456,6 @@ onMounted(() => {
   }
   adapterStatus.value = adapterStatusInit
   adapterStatusInitial.value = adapterStatusInit
-
-  if (isNetwork.value || isSwitch.value) {
-    isShowErrorMessageAlertNew.value = [false, false, false, false]
-  } else {
-    isShowErrorMessageAlertNew.value = [false, false]
-  }
 })
 </script>
 
@@ -492,8 +494,4 @@ onMounted(() => {
     left: unset;
   }
 }
-
-.edit-settings {
-  height: 100%;
-}
 </style>

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>