bfg-common 1.6.81 → 1.6.82

package/components/common/diagramMain/Diagram.vue

@@ -6,129 +6,88 @@
       'diagram-in-portlet': props.inPortlet,
     }"
   >
-    <common-diagram-main-header
-      v-if="!props.inPortlet"
-      :project="props.project"
-      :is-show-diagram="props.isShowDiagram"
-      :diagram-name="props.diagramData.diagramName"
-      :test-id="props.diagramData.testId"
-      @toggle-diagram="emits('toggle-diagram')"
-      @show-modal="onShowModal"
-    />
-
-    <div
-      :class="[
-        'diagrams',
-        {
-          'is-show-diagram': props.isShowDiagram,
-        },
-      ]"
-    >
-      <div class="diagram-second-container">
-        <svg
-          v-if="props.diagramData && props.isShowDiagram"
-          xmlns="http://www.w3.org/2000/svg"
-          :height="diagramHeight"
-          :width="diagramWidth"
-          :viewBox="viewBox"
-          :preserveAspectRatio="preserveAspectRatio"
-          :class="svgClasses"
-          @click.capture="onClickDiagram"
-        >
-          <common-diagram-main-switch
-            :networks-count="props.networksCount"
-            :main-rect-height="props.mainRectHeight"
-            :main-switch-line="props.mainSwitchLine"
-            :selected-main-line="props.selectedMainLine"
-            :is-visible-line="hasActiveAdapter"
-            :is-selected-linked-with-adapter="isSelectedLinkedWithAdapter"
-            :adapter-line-y="props.adaptersWithPositions.adaptersConnectLineY"
-            :first-and-last-network-lines-y="firstAndLastNetworkLinesY"
-            :networks-with-positions="props.networksWithPositions"
-          />
-          <common-diagram-main-adapter
-            :networks-count="props.networksCount"
-            :adapters-with-positions="props.adaptersWithPositions"
-            :selected-main-line="props.selectedMainLine"
-            :selected-port="props.selectedPort"
-            :selected-adapter="props.selectedAdapter"
-            :selected-network="props.selectedNetwork"
-            :is-visible-line="hasActiveAdapter"
-            :is-dark-mode="props.isDarkMode"
-            :test-id="props.diagramData.testId"
-            :is-selected-linked-with-adapter="isSelectedLinkedWithAdapter"
-            :networks-with-positions="props.networksWithPositions"
-            :first-and-last-network-lines-y="firstAndLastNetworkLinesY"
-            :in-network-lines-y="inNetworkLinesY"
-            @toggle-adapters="onToggleAdapters"
-            @select-adapter="onSelectAdapter"
-            @show-modal="onShowModal"
-          />
-          <template v-if="!!props.networksWithPositions.length">
-            <template
-              v-for="network in props.networksWithPositions"
-              :key="network.id"
-            >
-              <common-diagram-main-network
-                :network="network"
-                :selected-port="props.selectedPort"
-                :selected-adapter="props.selectedAdapter"
-                :selected-network="props.selectedNetwork"
-                :selected-main-line="props.selectedMainLine"
-                :diagram-id="props.diagramData.id"
-                :in-portlet="props.inPortlet"
-                :is-visible-line="hasActiveAdapter"
-                :is-dark-mode="props.isDarkMode"
-                :first-and-last-network-lines-y="firstAndLastNetworkLinesY"
-                :adapter-line-y="
-                  props.adaptersWithPositions.adaptersConnectLineY
-                "
-                :adapters-positions-y="adaptersPositionsY"
-                @toggle-ports="onTogglePorts"
-                @select-port="onSelectPort"
-                @select-network="onSelectNetwork"
-                @show-modal="onShowModal"
-              />
-            </template>
+    <div class="diagram-second-container">
+      <svg
+        v-if="props.diagramData && props.isShowDiagram"
+        xmlns="http://www.w3.org/2000/svg"
+        :height="diagramHeight"
+        :width="diagramWidth"
+        :viewBox="viewBox"
+        :preserveAspectRatio="preserveAspectRatio"
+        :class="svgClasses"
+        @click.capture="onClickDiagram"
+      >
+        <common-diagram-main-switch
+          :networks-count="props.networksCount"
+          :main-rect-height="props.mainRectHeight"
+          :main-switch-line="props.mainSwitchLine"
+          :selected-main-line="props.selectedMainLine"
+          :is-visible-line="hasActiveAdapter"
+          :is-selected-linked-with-adapter="isSelectedLinkedWithAdapter"
+          :adapter-line-y="props.adaptersWithPositions.adaptersConnectLineY"
+          :first-and-last-network-lines-y="firstAndLastNetworkLinesY"
+          :networks-with-positions="props.networksWithPositions"
+        />
+        <common-diagram-main-adapter
+          :networks-count="props.networksCount"
+          :adapters-with-positions="props.adaptersWithPositions"
+          :selected-main-line="props.selectedMainLine"
+          :selected-port="props.selectedPort"
+          :selected-adapter="props.selectedAdapter"
+          :selected-network="props.selectedNetwork"
+          :is-visible-line="hasActiveAdapter"
+          :is-dark-mode="props.isDarkMode"
+          :test-id="props.diagramData.testId"
+          :is-selected-linked-with-adapter="isSelectedLinkedWithAdapter"
+          :networks-with-positions="props.networksWithPositions"
+          :first-and-last-network-lines-y="firstAndLastNetworkLinesY"
+          :in-network-lines-y="inNetworkLinesY"
+          @toggle-adapters="onToggleAdapters"
+          @select-adapter="onSelectAdapter"
+          @show-modal="onShowModal"
+        />
+        <template v-if="!!props.networksWithPositions.length">
+          <template
+            v-for="network in props.networksWithPositions"
+            :key="network.id"
+          >
+            <common-diagram-main-network
+              :network="network"
+              :selected-port="props.selectedPort"
+              :selected-adapter="props.selectedAdapter"
+              :selected-network="props.selectedNetwork"
+              :selected-main-line="props.selectedMainLine"
+              :diagram-id="props.diagramData.id"
+              :in-portlet="props.inPortlet"
+              :is-visible-line="hasActiveAdapter"
+              :is-dark-mode="props.isDarkMode"
+              :first-and-last-network-lines-y="firstAndLastNetworkLinesY"
+              :adapter-line-y="props.adaptersWithPositions.adaptersConnectLineY"
+              :adapters-positions-y="adaptersPositionsY"
+              @toggle-ports="onTogglePorts"
+              @select-port="onSelectPort"
+              @select-network="onSelectNetwork"
+              @show-modal="onShowModal"
+            />
           </template>
-          <template v-else>
-            <common-diagram-main-network-no-network />
-          </template>
-          <common-diagram-main-switch-selected
-            :selected-switch-line-y="props.selectedSwitchLineY"
-            :is-visible-line="hasActiveAdapter && isSelectedLinkedWithAdapter"
-            :adapters-positions-y="adaptersPositionsY"
-            :adapter-line-y="props.adaptersWithPositions.adaptersConnectLineY"
-            :is-highlighted-adapter-line="isHighlightedAdapterLine"
-            :in-network-lines-y="inNetworkLinesY"
-          />
-        </svg>
-      </div>
+        </template>
+        <template v-else>
+          <common-diagram-main-network-no-network />
+        </template>
+        <common-diagram-main-switch-selected
+          :selected-switch-line-y="props.selectedSwitchLineY"
+          :is-visible-line="hasActiveAdapter && isSelectedLinkedWithAdapter"
+          :adapters-positions-y="adaptersPositionsY"
+          :adapter-line-y="props.adaptersWithPositions.adaptersConnectLineY"
+          :is-highlighted-adapter-line="isHighlightedAdapterLine"
+          :in-network-lines-y="inNetworkLinesY"
+        />
+      </svg>
     </div>
   </div>
-  <div
-    v-if="isNewView && props.isShowDiagram && !props.inPortlet"
-    class="virtual-switch-remove"
-  >
-    <ui-button
-      :test-id="`${props.diagramData.testId}-remove`"
-      variant="text"
-      type="error"
-      is-without-sizes
-      is-without-height
-      v-permission="'Networks.RemoveSwitch'"
-      @click="emits('show-modal', 'switch-remove')"
-    >
-      <span class="virtual-switch-remove-btn">
-        <ui-icon name="delete" width="20" height="20" />
-        {{ localization.common.remove }}
-      </span>
-    </ui-button>
-  </div>
 </template>
 
 <script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type {
   UI_I_AdaptersWithPositions,
   UI_I_DiagramData,
@@ -139,7 +98,6 @@ import type {
   UI_I_SwitchLine,
   UI_I_Network,
 } from '~/components/common/diagramMain/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
 import { UI_E_PositionsY } from '~/components/common/diagramMain/lib/models/enums'
 
 const props = defineProps<{
@@ -157,7 +115,6 @@ const props = defineProps<{
   selectedSwitchLineY: UI_I_SwitchLine
   isDarkMode: boolean
   networksCount: number
-  project: UI_T_Project
 }>()
 
 const emits = defineEmits<{
@@ -177,15 +134,12 @@ const emits = defineEmits<{
   ): void
   (event: 'select-port', networkId: string, portId: string): void
   (event: 'select-network', networkId: string): void
-  (event: 'toggle-diagram'): void
 }>()
 
 const { $store }: any = useNuxtApp()
 
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
-const localization = computed<UI_I_Localization>(() => useLocal())
-
 const inNetworkLinesY = computed(() => {
   const linesY = []
   props.networksWithPositions.forEach((net, index) => {
@@ -370,19 +324,8 @@ const onSelectNetwork = (networkId: string): void => {
 <style scoped lang="scss">
 .diagram {
   &-container {
-    //display: flex;
-    //justify-content: center;
-    .diagram-second-container {
-      display: flex;
-      justify-content: center;
-      min-width: 725px;
-    }
-
-    &.diagram-in-portlet {
-      .diagram-second-container {
-        min-width: 560px;
-      }
-    }
+    display: flex;
+    justify-content: center;
 
     .diagram-portlet {
       margin-top: 10px;
@@ -392,21 +335,16 @@ const onSelectNetwork = (networkId: string): void => {
 
 .diagram {
   &-container-new:not(.diagram-in-portlet) {
-    .diagrams.is-show-diagram {
-      margin-top: 24px;
-    }
+    display: flex;
+    justify-content: center;
+    margin: 16px 16px 30px;
+    padding: 16px;
+    border-radius: 8px;
+    background: var(--diagram-container-bg);
+    box-shadow: 0 1px 4px 0 #00000014;
 
     .diagram-second-container {
       overflow-x: auto;
-      display: flex;
-      justify-content: center;
-      min-width: 760px;
-
-      &.diagram-in-portlet {
-        .diagram-second-container {
-          min-width: 560px;
-        }
-      }
 
       .diagram-svg {
         margin: 22.5px 17.5px;
@@ -419,28 +357,6 @@ const onSelectNetwork = (networkId: string): void => {
     }
   }
 }
-
-.diagrams {
-  overflow-y: auto;
-}
-
-.virtual-switch-remove {
-  padding: 16px 0 0;
-  display: flex;
-  justify-content: flex-end;
-
-  &-btn {
-    height: 20px;
-    font-weight: 500;
-    font-size: 14px;
-    line-height: 17px;
-    letter-spacing: 0;
-    display: flex;
-    align-items: center;
-    column-gap: 8px;
-    color: var(--text-red);
-  }
-}
 </style>
 <style lang="scss">
 .diagram-actions__popup.navbar-dropdown-menu {

package/components/common/diagramMain/DiagramMain.vue

@@ -3,17 +3,17 @@
     v-if="props.diagramData"
     :class="{ 'diagram-min-width': !props.inPortlet }"
   >
-    <div
-      :class="[
-        'diagram-main-container',
-        {
-          'is-new-view': isNewView,
-          'in-portlet': props.inPortlet,
-        },
-      ]"
-    >
-      <common-diagram-main-diagram
+    <div class="diagram-main-container">
+      <common-diagram-main-header
         :project="props.project"
+        :in-portlet="props.inPortlet"
+        :is-show-diagram="isShowDiagram"
+        :diagram-name="props.diagramData.diagramName"
+        :test-id="props.diagramData.testId"
+        @toggle-diagram="onToggleDiagram"
+        @show-modal="onShowModal"
+      />
+      <common-diagram-main-diagram
         :diagram-data="props.diagramData"
         :is-show-diagram="isShowDiagram"
         :in-portlet="props.inPortlet"
@@ -28,7 +28,6 @@
         :selected-switch-line-y="selectedSwitchLineY"
         :is-dark-mode="props.isDarkMode"
         :networks-count="networksCount"
-        @toggle-diagram="onToggleDiagram"
         @click-diagram="onClickDiagram"
         @toggle-adapters="onToggleAdapters"
         @select-adapter="onSelectAdapter"
@@ -75,8 +74,6 @@
       :selected-switch-id="selectedSwitchId"
       :tcp-stacks="props.tcpStacks"
       :is-networking-loading="props.isNetworkingLoading"
-      :is-get-existing-switches-loading="props.isGetExistingSwitchesLoading"
-      :is-get-tcp-stack-loading="props.isGetTcpStackLoading"
       :networks-list="props.networksList"
       :is-migrate-adapter-loading="props.isMigrateAdapterLoading"
       :diagrams-data="props.diagramsData"
@@ -175,8 +172,6 @@ const props = withDefaults(
     diagramsData?: UI_I_DiagramData[]
     isManageAdaptersModalLoading?: boolean
     isNetworkingLoading?: boolean
-    isGetExistingSwitchesLoading?: boolean
-    isGetTcpStackLoading?: boolean
     isRemoveModalLoading?: boolean
     isEditModalLoading?: boolean
     isMigrateAdapterLoading?: boolean
@@ -198,18 +193,12 @@ const props = withDefaults(
     diagramsData: [],
     isManageAdaptersModalLoading: false,
     isNetworkingLoading: false,
-    isGetExistingSwitchesLoading: false,
-    isGetTcpStackLoading: false,
     isRemoveModalLoading: false,
     isEditModalLoading: false,
     isMigrateAdapterLoading: false,
   }
 )
 
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
 const initialData = ref<UI_I_ModalsInitialData>({})
 const switchInitialData = ref<UI_I_ModalsInitialData>({})
 
@@ -891,30 +880,11 @@ const onClickDiagram = (ev: MouseEvent): void => {
   &-min-width {
     //min-width: 745px;
     //min-width: 764px;
-    &:not(:first-of-type) {
-      margin-top: 16px;
-    }
   }
   &-main-container {
     padding-top: 5px;
   }
 }
-
-.diagram-main-container.is-new-view {
-  //display: flex;
-  //justify-content: center;
-  //margin: 16px 16px 30px;
-
-  padding: 16px;
-  border-radius: 8px;
-  background: var(--diagram-container-bg);
-  box-shadow: 0 1px 4px 0 #00000014;
-
-  &.in-portlet {
-    box-shadow: none;
-    padding: 0;
-  }
-}
 </style>
 <style lang="scss">
 .diagram-main-actions__popup.navbar-dropdown-menu {

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

@@ -1,67 +1,69 @@
 <template>
-  <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"
+  <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"
         />
+        <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>
-  </div>
-  <hr class="horizontal-separator" />
+    <hr class="horizontal-separator" />
+  </template>
 </template>
 
 <script setup lang="ts">
@@ -75,6 +77,7 @@ import { switchMainNavigationFunc } from '~/components/common/diagramMain/modals
 
 const props = withDefaults(
   defineProps<{
+    inPortlet: boolean
     isShowDiagram: boolean
     diagramName: string
     testId: string
@@ -100,11 +103,12 @@ const switchMainNavigation = computed<UI_I_NavigationItem[]>(() =>
   switchMainNavigationFunc(localization.value, props.testId)
 )
 
-const onShowModal = (modalName: string, diagramName?: string) => {
+const onToggleDiagram = () => emits('toggle-diagram')
+
+const onShowModal = (modalName: string, diagramName?: string) =>
   diagramName
     ? emits('show-modal', modalName, { switch_name: diagramName })
     : emits('show-modal', modalName)
-}
 </script>
 
 <style scoped lang="scss">
@@ -136,18 +140,7 @@ const onShowModal = (modalName: string, diagramName?: string) => {
 
 .diagram-header {
   display: flex;
-  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;
-  }
-
+  padding-left: 8px;
   a {
     color: #0072a3;
     cursor: pointer;
@@ -156,7 +149,6 @@ const onShowModal = (modalName: string, diagramName?: string) => {
     line-height: 20px;
     span {
       font-weight: 700;
-      white-space: nowrap;
     }
   }
 
@@ -168,9 +160,7 @@ 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;
@@ -223,7 +213,6 @@ const onShowModal = (modalName: string, diagramName?: string) => {
   height: 0;
   overflow: visible;
   border-top: 0px solid #eee;
-  width: 100%;
 }
 
 .vertical-separator {