bfg-common 1.6.77 → 1.6.78

package/components/common/diagramMain/modals/UnsavedChangesModal.vue

@@ -0,0 +1,32 @@
+<template>
+  <ui-popup
+    v-if="props.isShow"
+    test-id="unsaved-changes"
+    icon-name="circle-warning"
+    :texts="texts"
+    :title="localization.common.unsavedChanges"
+    :message="localization.common.unsavedChangesModalDescription"
+    @hide="emits('hide')"
+    @submit="emits('leave')"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  isShow: boolean
+}>()
+
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'leave'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const texts = computed(() => ({
+  button1: localization.value.common.cancel,
+  button2: localization.value.common.leave,
+}))
+</script>

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

@@ -1,91 +1,37 @@
 <template>
-  <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 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>
 </template>
@@ -107,7 +53,6 @@ import type {
   UI_I_IpvFourSettingsFields,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 
-// Props from up
 const props = withDefaults(
   defineProps<{
     viewName: string
@@ -136,15 +81,22 @@ const emits = defineEmits<{
   (event: 'send-edit-data', type: string): void
 }>()
 
-// View for the switch or the network
+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'))
+)
+
 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: '',
@@ -168,18 +120,53 @@ const hasErrorMessages = computed(
   () => !!Object.values(errorMessages.value).filter((err) => err !== '').length
 )
 
-// flag: to show error message
 const isShowErrorMessageAlert = ref<boolean>(false)
-
-const onShowErrorMessageAlert = (): void => {
-  isShowErrorMessageAlert.value = true
+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 = (): void => {
-  isShowErrorMessageAlert.value = false
+const onHideErrorMessageAlert = (tab?: string): void => {
+  if (isNewView.value) {
+    isShowErrorMessageAlertNew.value[tab] = false
+  } else {
+    isShowErrorMessageAlert.value = false
+  }
 }
 
-const networkEditData = ref<UI_I_EditFieldsData>({})
+const networkEditData = defineModel<UI_I_EditFieldsData>('network-edit-data')
+
 const initialNetworkLabel = ref<string>('-initial-networkLabel-123')
 
 const isFailoverOrderOverride = computed<string | number | boolean | undefined>(
@@ -191,6 +178,7 @@ const adapterStatus = ref<UI_I_AdapterStatus>({
   standby: [],
   unused: [],
 })
+
 const adapterStatusInitial = ref<UI_I_AdapterStatus>({
   active: [],
   standby: [],
@@ -387,13 +375,13 @@ watch(selectedTab, (newSelectedTab: string, oldSelectedTab: string) => {
         return
       }
 
-      stopTabChanging(newSelectedTab)
+      !isNewView.value && stopTabChanging(newSelectedTab)
     } else if (
       selectedTabInAlertModal.value &&
       !isApprovedAdapterStatus.value &&
       isFailoverOrderOverride.value
     ) {
-      stopTabChanging(newSelectedTab)
+      !isNewView.value && stopTabChanging(newSelectedTab)
     } else if (selectedTabInAlertModal.value) {
       selectedTabInAlertModal.value = ''
     }
@@ -404,7 +392,9 @@ watch(selectedTab, (newSelectedTab: string, oldSelectedTab: string) => {
     newSelectedTab !== '1' &&
     !isCheckedNetworkLabel.value
   ) {
-    selectedTab.value = '1'
+    if (!isNewView.value) {
+      selectedTab.value = '1'
+    }
     if (
       networkLabel.value !== initialNetworkLabel.value &&
       networkLabel.value !== ''
@@ -413,7 +403,9 @@ watch(selectedTab, (newSelectedTab: string, oldSelectedTab: string) => {
         checkNetworkLabelCallback('tab', message, newSelectedTab)
       )
     } else if (networkLabel.value === '') {
-      onShowErrorMessageAlert()
+      if (!isNewView.value) {
+        onShowErrorMessageAlert()
+      }
     } else {
       isCheckedNetworkLabel.value = true
       selectedTab.value = newSelectedTab
@@ -456,6 +448,12 @@ onMounted(() => {
   }
   adapterStatus.value = adapterStatusInit
   adapterStatusInitial.value = adapterStatusInit
+
+  if (isNetwork.value || isSwitch.value) {
+    isShowErrorMessageAlertNew.value = [false, false, false, false]
+  } else {
+    isShowErrorMessageAlertNew.value = [false, false]
+  }
 })
 </script>
 
@@ -494,4 +492,8 @@ onMounted(() => {
     left: unset;
   }
 }
+
+.edit-settings {
+  height: 100%;
+}
 </style>

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

@@ -0,0 +1,285 @@
+<template>
+  <div class="edit-settings">
+    <ui-tabs-step
+      v-model="selectedTab"
+      :items="tabs"
+      :errors="tabsErrors"
+      :has-error-messages="props.hasErrorMessages"
+      @set-alert="emits('show-error-message-alert', selectedTab - 1)"
+    />
+
+    <div class="edit-settings-content">
+      <div class="edit-settings-content-container">
+        <template v-if="props.isNetwork || props.isSwitch">
+          <common-diagram-main-modals-edit-settings-tabs-network-properties
+            v-if="props.isNetwork"
+            v-show="selectedTab === '1'"
+            :is-show-error-message-alert="props.isShowErrorMessageAlertNew"
+            :error-messages="props.errorMessages"
+            :initial-data="props.initialData"
+            :has-error-messages="props.hasErrorMessages"
+            :network-already-exists="props.networkAlreadyExists"
+            :flag-send-data="props.flagSendData"
+            @change-edit-properties-data="onChangeNetworkEditPropertiesData"
+            @change-error-messages="onChangeErrorMessages"
+            @hide-error-message-alert="emits('hide-error-message-alert', 0)"
+          />
+          <common-diagram-main-modals-edit-settings-tabs-switch-properties
+            v-if="props.isSwitch"
+            v-show="selectedTab === '1'"
+            :is-show-error-message-alert="props.isShowErrorMessageAlertNew"
+            :error-messages="props.errorMessages"
+            :initial-data="props.initialData"
+            :has-error-messages="props.hasErrorMessages"
+            @change-edit-properties-data="onChangeSwitchEditPropertiesData"
+            @change-error-messages="onChangeErrorMessages"
+            @hide-error-message-alert="emits('hide-error-message-alert', 0)"
+          />
+          <common-diagram-main-modals-edit-settings-tabs-security
+            v-show="selectedTab === '2'"
+            :is-switch="props.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="props.isShowErrorMessageAlertNew"
+            :error-messages="props.errorMessages"
+            :initial-data="props.initialData"
+            :has-error-messages="props.hasErrorMessages"
+            :is-switch="props.isSwitch"
+            :flag-send-data="props.flagSendData"
+            @change-edit-traffic-shaping-data="onChangeEditTrafficShapingData"
+            @change-error-messages="onChangeErrorMessages"
+            @hide-error-message-alert="emits('hide-error-message-alert', 2)"
+          />
+          <common-diagram-main-modals-edit-settings-tabs-teaming-failover
+            v-show="selectedTab === '4'"
+            :is-switch="props.isSwitch"
+            :adapters="props.adapters"
+            :initial-data="props.initialData"
+            :adapter-status="props.adapterStatus"
+            :is-dark-mode="props.isDarkMode"
+            @change-edit-teaming-failover-data="onChangeEditTeamingFailoverData"
+            @change-adapter-status="onChangeAdapterStatus"
+          />
+        </template>
+        <template v-if="props.isPort">
+          <common-diagram-main-modals-edit-settings-tabs-port-port-properties
+            v-show="selectedTab === '1'"
+            :is-show-error-message-alert="props.isShowErrorMessageAlertNew"
+            :error-messages="props.errorMessages"
+            :initial-data="props.initialData"
+            :has-error-messages="props.hasErrorMessages"
+            @change-error-messages="onChangeErrorMessages"
+            @change-port-edit-properties-data="onChangePortEditPropertiesData"
+            @hide-error-message-alert="emits('hide-error-message-alert', 0)"
+          />
+          <common-diagram-main-modals-edit-settings-tabs-port-ipv-four-settings
+            v-show="selectedTab === '2'"
+            :is-show-error-message-alert="props.isShowErrorMessageAlertNew"
+            :error-messages="props.errorMessages"
+            :initial-data="props.initialData"
+            :has-error-messages="props.hasErrorMessages"
+            :flag-send-data="props.flagSendData"
+            @change-error-messages="onChangeErrorMessages"
+            @change-port-ipv-four-data="onChangePortEditIpvFourData"
+            @hide-error-message-alert="emits('hide-error-message-alert', 1)"
+          />
+        </template>
+      </div>
+      <div class="edit-settings-content-transparent-block"></div>
+    </div>
+
+    <common-diagram-main-modals-edit-settings-confirm-teaming-settings-modal
+      :is-show="props.isShowWithoutActiveAdapterModal"
+      @hide="emits('hide-without-active-adapter-modal')"
+      @submit="emits('approve-without-active-adapter-modal')"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_ItemsWithTotalCounts } from '~/lib/models/interfaces'
+import type {
+  UI_I_AdapterStatus,
+  UI_I_ModalsInitialData,
+  UI_I_SwitchAdapterItem,
+  UI_I_SecurityFields,
+  UI_I_TrafficShapingFields,
+  UI_I_TeamingFailoverFields,
+  UI_I_PropertiesFields,
+  UI_I_EditSettingsErrorMessage,
+  UI_I_SwitchPropertiesFields,
+  UI_I_PortPropertiesFields,
+  UI_I_IpvFourSettingsFields,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+
+const props = defineProps<{
+  items: {
+    value: string
+    text: string
+  }[]
+  adapters: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
+  initialData: UI_I_ModalsInitialData
+  isDarkMode: boolean
+  isSwitch: boolean
+  isNetwork: boolean
+  isPort: boolean
+  hasErrorMessages: boolean
+  isShowErrorMessageAlertNew: boolean[]
+  networkAlreadyExists: boolean
+  isShowWithoutActiveAdapterModal: boolean
+  adapterStatus: UI_I_AdapterStatus
+  errorMessages: UI_I_EditSettingsErrorMessage
+  flagSendData: boolean
+}>()
+
+const emits = defineEmits<{
+  (event: 'show-error-message-alert', tab?: number): void
+  (event: 'hide-error-message-alert', tab?: number): void
+  (
+    event: 'change-error-messages',
+    newErrorMessage: string,
+    fieldName: keyof UI_I_EditSettingsErrorMessage
+  ): void
+  (event: 'change-adapter-status', newAdapterStatus: UI_I_AdapterStatus): void
+  (
+    event: 'change-network-edit-properties-data',
+    newNetworkEditPropertiesData: UI_I_PropertiesFields
+  ): void
+  (
+    event: 'change-switch-edit-properties-data',
+    newSwitchEditPropertiesData: UI_I_SwitchPropertiesFields
+  ): void
+  (
+    event: 'change-port-edit-properties-data',
+    newSwitchEditPropertiesData: UI_I_SwitchPropertiesFields
+  ): void
+  (
+    event: 'change-port-ipv-four-data',
+    newPortEditIpvFourData: UI_I_IpvFourSettingsFields
+  ): void
+  (
+    event: 'change-edit-security-data',
+    newEditSecurityData: UI_I_SecurityFields
+  ): void
+  (
+    event: 'change-edit-traffic-shaping-data',
+    newEditTrafficShapingData: UI_I_TrafficShapingFields
+  ): void
+  (
+    event: 'change-edit-teaming-failover-data',
+    newEditTeamingFailoverData: UI_I_TeamingFailoverFields
+  ): void
+  (event: 'hide-without-active-adapter-modal'): void
+  (event: 'approve-without-active-adapter-modal'): void
+}>()
+
+const selectedTab = defineModel<string>()
+
+const tabs = computed<UI_I_TabItem[]>(() =>
+  props.items.map((item) => ({ name: item.text, value: item.value }))
+)
+
+const tabsErrors = computed<boolean[]>(() =>
+  props.isPort
+    ? [
+        props.errorMessages.mtu,
+        props.errorMessages.ipFourAddress ||
+          props.errorMessages.subnetMask ||
+          props.errorMessages.defaultGateway,
+      ]
+    : [
+        props.errorMessages.networkLabel ||
+          props.errorMessages.vlanId ||
+          props.errorMessages.mtu,
+        false,
+        props.errorMessages.average ||
+          props.errorMessages.peak ||
+          props.errorMessages.burstSize,
+        false,
+      ]
+)
+
+const onChangeErrorMessages = (
+  newErrorMessage: string,
+  fieldName: keyof UI_I_EditSettingsErrorMessage
+): void => {
+  emits('change-error-messages', newErrorMessage, fieldName)
+}
+
+const onChangeAdapterStatus = (newAdapterStatus: UI_I_AdapterStatus) => {
+  emits('change-adapter-status', newAdapterStatus)
+}
+
+const onChangeNetworkEditPropertiesData = (
+  newNetworkEditPropertiesData: UI_I_PropertiesFields
+) => {
+  emits('change-network-edit-properties-data', newNetworkEditPropertiesData)
+}
+const onChangeSwitchEditPropertiesData = (
+  newSwitchEditPropertiesData: UI_I_SwitchPropertiesFields
+) => {
+  emits('change-switch-edit-properties-data', newSwitchEditPropertiesData)
+}
+const onChangePortEditPropertiesData = (
+  newPortEditPropertiesData: UI_I_PortPropertiesFields
+) => {
+  emits('change-port-edit-properties-data', newPortEditPropertiesData)
+}
+const onChangePortEditIpvFourData = (
+  newPortEditIpvFourData: UI_I_IpvFourSettingsFields
+) => {
+  emits('change-port-ipv-four-data', newPortEditIpvFourData)
+}
+
+const onChangeEditSecurityData = (newEditSecurityData: UI_I_SecurityFields) => {
+  emits('change-edit-security-data', newEditSecurityData)
+}
+const onChangeEditTrafficShapingData = (
+  newEditTrafficShapingData: UI_I_TrafficShapingFields
+) => {
+  emits('change-edit-traffic-shaping-data', newEditTrafficShapingData)
+}
+const onChangeEditTeamingFailoverData = (
+  newEditTeamingFailoverData: UI_I_TeamingFailoverFields
+) => {
+  emits('change-edit-teaming-failover-data', newEditTeamingFailoverData)
+}
+</script>
+
+<style scoped lang="scss">
+.edit-settings {
+  display: flex;
+  height: 100%;
+
+  &-content {
+    margin-left: 16px;
+    overflow: hidden;
+    width: 100%;
+    height: 100%;
+    position: relative;
+
+    &-container {
+      overflow-y: auto;
+      width: 100%;
+      height: 100%;
+      padding-right: 18px;
+      padding-bottom: 16px;
+      scrollbar-gutter: stable;
+    }
+
+    &-transparent-block {
+      position: absolute;
+      background: red;
+      height: 16px;
+      width: 100%;
+      bottom: 0;
+      right: 14px;
+      background: linear-gradient(rgba(250, 250, 250, 0), var(--modal-bg));
+      z-index: var(--z-modal-transparent-block);
+    }
+  }
+}
+</style>