bfg-common 1.6.74 → 1.6.75

package/components/common/diagramMain/{Header.vue → header/HeaderOld.vue}

@@ -1,69 +1,67 @@
 <template>
-  <template v-if="!props.inPortlet">
-    <div class="diagram-header">
-      <div class="diagram-header-left">
-        <atoms-the-icon
-          :class="[
-            'diagram-header__arrow-icon',
-            {
-              open: props.isShowDiagram,
-            },
-          ]"
-          :data-id="`${props.testId}-toggle-icon`"
-          name="angle"
-          @click="onToggleDiagram"
+  <div class="diagram-header">
+    <div class="diagram-header-left">
+      <atoms-the-icon
+        :class="[
+          'diagram-header__arrow-icon',
+          {
+            open: props.isShowDiagram,
+          },
+        ]"
+        :data-id="`${props.testId}-toggle-icon`"
+        name="angle"
+        @click="emits('toggle-diagram')"
+      />
+      <a>
+        <span>
+          {{ localization.common.standardSwitch }}:
+          {{ props.diagramName }}
+        </span>
+      </a>
+    </div>
+    <div v-if="props.isShowDiagram" class="diagram-header__btn-container">
+      <span class="vertical-separator"></span>
+      <button
+        id="add-networking-button"
+        v-permission="
+          'Networks.CreateSysx Networks.CreatePortGroup Networks.UpdateSwitch Networks.CreateSwitch'
+        "
+        :data-id="`${props.testId}-add-networking-button`"
+        type="button"
+        @click="onShowModal('add-networking', props.diagramName)"
+      >
+        {{ localization.common.addNetworking }}
+      </button>
+      <button
+        id="switch-edit-button"
+        v-permission="'Networks.UpdateSwitch'"
+        :data-id="`${props.testId}-edit-button`"
+        type="button"
+        @click="onShowModal('switch-edit')"
+      >
+        {{ localization.common.edit }}
+      </button>
+      <button
+        id="switch-manage-physical-adapters-button"
+        v-permission="'Networks.UpdateSwitch'"
+        :data-id="`${props.testId}-manage-physical-adapters-button`"
+        type="button"
+        @click="onShowModal('switch-manage-physical-adapters')"
+      >
+        {{ localization.common.managePhysicalAdapters }}
+      </button>
+      <div class="diagram-main-actions-dots">
+        <atoms-collapse-nav
+          :close-after-click="true"
+          :items="switchMainNavigation"
+          :test-id="`${props.testId}-actions`"
+          popup-class="diagram-main-actions__popup"
+          @change="onShowModal"
         />
-        <a>
-          <span>
-            {{ localization.common.standardSwitch }}:
-            {{ props.diagramName }}
-          </span>
-        </a>
-      </div>
-      <div v-if="props.isShowDiagram" class="diagram-header__btn-container">
-        <span class="vertical-separator"></span>
-        <button
-          id="add-networking-button"
-          v-permission="
-            'Networks.CreateSysx Networks.CreatePortGroup Networks.UpdateSwitch Networks.CreateSwitch'
-          "
-          :data-id="`${props.testId}-add-networking-button`"
-          type="button"
-          @click="onShowModal('add-networking', props.diagramName)"
-        >
-          {{ localization.common.addNetworking }}
-        </button>
-        <button
-          id="switch-edit-button"
-          v-permission="'Networks.UpdateSwitch'"
-          :data-id="`${props.testId}-edit-button`"
-          type="button"
-          @click="onShowModal('switch-edit')"
-        >
-          {{ localization.common.edit }}
-        </button>
-        <button
-          id="switch-manage-physical-adapters-button"
-          v-permission="'Networks.UpdateSwitch'"
-          :data-id="`${props.testId}-manage-physical-adapters-button`"
-          type="button"
-          @click="onShowModal('switch-manage-physical-adapters')"
-        >
-          {{ localization.common.managePhysicalAdapters }}
-        </button>
-        <div class="diagram-main-actions-dots">
-          <atoms-collapse-nav
-            :close-after-click="true"
-            :items="switchMainNavigation"
-            :test-id="`${props.testId}-actions`"
-            popup-class="diagram-main-actions__popup"
-            @change="onShowModal"
-          />
-        </div>
       </div>
     </div>
-    <hr class="horizontal-separator" />
-  </template>
+  </div>
+  <hr class="horizontal-separator" />
 </template>
 
 <script setup lang="ts">
@@ -77,7 +75,6 @@ import { switchMainNavigationFunc } from '~/components/common/diagramMain/modals
 
 const props = withDefaults(
   defineProps<{
-    inPortlet: boolean
     isShowDiagram: boolean
     diagramName: string
     testId: string
@@ -103,12 +100,11 @@ const switchMainNavigation = computed<UI_I_NavigationItem[]>(() =>
   switchMainNavigationFunc(localization.value, props.testId)
 )
 
-const onToggleDiagram = () => emits('toggle-diagram')
-
-const onShowModal = (modalName: string, diagramName?: string) =>
+const onShowModal = (modalName: string, diagramName?: string) => {
   diagramName
     ? emits('show-modal', modalName, { switch_name: diagramName })
     : emits('show-modal', modalName)
+}
 </script>
 
 <style scoped lang="scss">
@@ -140,7 +136,18 @@ const onShowModal = (modalName: string, diagramName?: string) =>
 
 .diagram-header {
   display: flex;
-  padding-left: 8px;
+  justify-self: flex-start;
+  width: 100%;
+  padding: 24px 16px 0;
+  overflow-x: auto;
+  overflow-y: hidden;
+  scrollbar-width: none;
+  -ms-overflow-style: none;
+
+  &::-webkit-scrollbar {
+    display: none;
+  }
+
   a {
     color: #0072a3;
     cursor: pointer;
@@ -149,6 +156,7 @@ const onShowModal = (modalName: string, diagramName?: string) =>
     line-height: 20px;
     span {
       font-weight: 700;
+      white-space: nowrap;
     }
   }
 
@@ -160,7 +168,9 @@ const onShowModal = (modalName: string, diagramName?: string) =>
 
   &__arrow-icon {
     width: 16px;
+    min-width: 16px;
     height: 16px;
+    min-height: 16px;
     margin-right: 4px;
     transform: rotate(90deg);
     align-self: center;
@@ -213,6 +223,7 @@ const onShowModal = (modalName: string, diagramName?: string) =>
   height: 0;
   overflow: visible;
   border-top: 0px solid #eee;
+  width: 100%;
 }
 
 .vertical-separator {

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

@@ -183,6 +183,8 @@
       :tcp-stacks="props.tcpStacks"
       :diagrams-data="props.diagramsData"
       :is-networking-loading="props.isNetworkingLoading"
+      :is-get-existing-switches-loading="props.isGetExistingSwitchesLoading"
+      :is-get-tcp-stack-loading="props.isGetTcpStackLoading"
       :host-name="props.hostName"
       :project="props.project"
       @check-network-label="onCheckNetworkLabel"
@@ -274,6 +276,8 @@ const props = defineProps<{
   selectedSwitchId: string
   tcpStacks: UI_I_TCPStack[]
   isNetworkingLoading: boolean
+  isGetExistingSwitchesLoading: boolean
+  isGetTcpStackLoading: boolean
   networksList: UI_I_Network[]
   isMigrateAdapterLoading: boolean
   diagramsData: UI_I_DiagramData[]

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>