bfg-common 1.4.579 → 1.4.581

package/components/common/diagramMain/Header.vue

@@ -1,211 +1,211 @@
-<template>
-  <template v-if="!props.inPortlet">
-    <div class="diagram-header">
-      <div class="diagram-header-left">
-        <atoms-the-icon
-          name="angle"
-          :class="[
-            'diagram-header__arrow-icon',
-            {
-              open: props.isShowDiagram,
-            },
-          ]"
-          :data-id="`${props.testId}-toggle-icon`"
-          @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"
-          :data-id="`${props.testId}-add-networking-button`"
-          type="button"
-          @click="onShowModal('add-networking', props.diagramName)"
-        >
-          {{ localization.common.addNetworking }}
-        </button>
-        <button
-          id="switch-edit-button"
-          :data-id="`${props.testId}-edit-button`"
-          type="button"
-          @click="onShowModal('switch-edit')"
-        >
-          {{ localization.common.edit }}
-        </button>
-        <button
-          id="switch-manage-physical-adapters-button"
-          :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
-            popup-class="diagram-main-actions__popup"
-            :close-after-click="true"
-            :items="switchMainNavigation"
-            :test-id="`${props.testId}-actions`"
-            @change="onShowModal"
-          />
-        </div>
-      </div>
-    </div>
-    <hr class="horizontal-separator" />
-  </template>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_NavigationItem,
-  UI_I_ModalsInitialData,
-} from '~/components/common/diagramMain/lib/models/interfaces'
-import { switchMainNavigationFunc } from '~/components/common/diagramMain/modals/lib/config'
-
-const props = defineProps<{
-  inPortlet: boolean
-  isShowDiagram: boolean
-  diagramName: string
-  testId: string
-}>()
-
-const emits = defineEmits<{
-  (event: 'toggle-diagram'): void
-  (
-    event: 'show-modal',
-    modalName: string,
-    properties?: UI_I_ModalsInitialData
-  ): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const switchMainNavigation = computed<UI_I_NavigationItem[]>(() =>
-  switchMainNavigationFunc(localization.value, props.testId)
-)
-
-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">
-:root.dark-theme {
-  .diagram-header {
-    &-left {
-      a {
-        span {
-          color: #79c6e6;
-
-          &:hover {
-            color: #49afd9;
-          }
-        }
-      }
-    }
-
-    &__btn-container {
-      button {
-        color: #89cbdf;
-
-        &:hover {
-          color: #57c8ea;
-        }
-      }
-    }
-  }
-}
-
-.diagram-header {
-  display: flex;
-  padding-left: 8px;
-  a {
-    color: #0072a3;
-    cursor: pointer;
-    font-weight: 700;
-    user-select: none;
-    line-height: 20px;
-    span {
-      font-weight: 700;
-    }
-  }
-
-  &-left {
-    display: flex;
-    flex-wrap: nowrap;
-    color: #49afd9;
-  }
-
-  &__arrow-icon {
-    width: 16px;
-    height: 16px;
-    margin-right: 4px;
-    transform: rotate(90deg);
-    align-self: center;
-    fill: var(--triger-icon-color);
-    cursor: pointer;
-    &.open {
-      transform: rotate(180deg);
-    }
-  }
-
-  &__btn-container {
-    display: flex;
-
-    button {
-      font-size: 11px;
-      height: 24px;
-      border: none;
-      background: none;
-      margin-right: 0;
-      cursor: pointer;
-      display: inline-block;
-      white-space: nowrap;
-      text-align: center;
-      text-transform: uppercase;
-      color: #49afd9;
-      line-height: 20px;
-      max-height: 16.8px;
-      padding: 0 14px;
-      font-weight: 500;
-      letter-spacing: 1px;
-
-      &:hover {
-        color: #004d8a;
-      }
-    }
-  }
-}
-
-.diagram-main-actions-dots {
-  position: relative;
-  transform: translate(62px, -11px);
-}
-
-.horizontal-separator {
-  margin: 5px 10px 10px;
-  border-left: 0;
-  border-right: 0;
-  border-color: #ddd;
-  box-sizing: content-box;
-  height: 0;
-  overflow: visible;
-  border-top: 0px solid #eee;
-}
-
-.vertical-separator {
-  border: 1px solid #ddd;
-  border-left: none;
-  margin: 0 3px 0 14px;
-}
-</style>
+<template>
+  <template v-if="!props.inPortlet">
+    <div class="diagram-header">
+      <div class="diagram-header-left">
+        <atoms-the-icon
+          name="angle"
+          :class="[
+            'diagram-header__arrow-icon',
+            {
+              open: props.isShowDiagram,
+            },
+          ]"
+          :data-id="`${props.testId}-toggle-icon`"
+          @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"
+          :data-id="`${props.testId}-add-networking-button`"
+          type="button"
+          @click="onShowModal('add-networking', props.diagramName)"
+        >
+          {{ localization.common.addNetworking }}
+        </button>
+        <button
+          id="switch-edit-button"
+          :data-id="`${props.testId}-edit-button`"
+          type="button"
+          @click="onShowModal('switch-edit')"
+        >
+          {{ localization.common.edit }}
+        </button>
+        <button
+          id="switch-manage-physical-adapters-button"
+          :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
+            popup-class="diagram-main-actions__popup"
+            :close-after-click="true"
+            :items="switchMainNavigation"
+            :test-id="`${props.testId}-actions`"
+            @change="onShowModal"
+          />
+        </div>
+      </div>
+    </div>
+    <hr class="horizontal-separator" />
+  </template>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_NavigationItem,
+  UI_I_ModalsInitialData,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+import { switchMainNavigationFunc } from '~/components/common/diagramMain/modals/lib/config'
+
+const props = defineProps<{
+  inPortlet: boolean
+  isShowDiagram: boolean
+  diagramName: string
+  testId: string
+}>()
+
+const emits = defineEmits<{
+  (event: 'toggle-diagram'): void
+  (
+    event: 'show-modal',
+    modalName: string,
+    properties?: UI_I_ModalsInitialData
+  ): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const switchMainNavigation = computed<UI_I_NavigationItem[]>(() =>
+  switchMainNavigationFunc(localization.value, props.testId)
+)
+
+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">
+:root.dark-theme {
+  .diagram-header {
+    &-left {
+      a {
+        span {
+          color: #79c6e6;
+
+          &:hover {
+            color: #49afd9;
+          }
+        }
+      }
+    }
+
+    &__btn-container {
+      button {
+        color: #89cbdf;
+
+        &:hover {
+          color: #57c8ea;
+        }
+      }
+    }
+  }
+}
+
+.diagram-header {
+  display: flex;
+  padding-left: 8px;
+  a {
+    color: #0072a3;
+    cursor: pointer;
+    font-weight: 700;
+    user-select: none;
+    line-height: 20px;
+    span {
+      font-weight: 700;
+    }
+  }
+
+  &-left {
+    display: flex;
+    flex-wrap: nowrap;
+    color: #49afd9;
+  }
+
+  &__arrow-icon {
+    width: 16px;
+    height: 16px;
+    margin-right: 4px;
+    transform: rotate(90deg);
+    align-self: center;
+    fill: var(--triger-icon-color);
+    cursor: pointer;
+    &.open {
+      transform: rotate(180deg);
+    }
+  }
+
+  &__btn-container {
+    display: flex;
+
+    button {
+      font-size: 11px;
+      height: 24px;
+      border: none;
+      background: none;
+      margin-right: 0;
+      cursor: pointer;
+      display: inline-block;
+      white-space: nowrap;
+      text-align: center;
+      text-transform: uppercase;
+      color: #49afd9;
+      line-height: 20px;
+      max-height: 16.8px;
+      padding: 0 14px;
+      font-weight: 500;
+      letter-spacing: 1px;
+
+      &:hover {
+        color: #004d8a;
+      }
+    }
+  }
+}
+
+.diagram-main-actions-dots {
+  position: relative;
+  transform: translate(62px, -11px);
+}
+
+.horizontal-separator {
+  margin: 5px 10px 10px;
+  border-left: 0;
+  border-right: 0;
+  border-color: #ddd;
+  box-sizing: content-box;
+  height: 0;
+  overflow: visible;
+  border-top: 0px solid #eee;
+}
+
+.vertical-separator {
+  border: 1px solid #ddd;
+  border-left: none;
+  margin: 0 3px 0 14px;
+}
+</style>

package/components/common/diagramMain/adapter/AdapterItem.vue

@@ -402,6 +402,8 @@ const onHide = (): void => {
 
 :root.is-new-view {
   .adapter-name {
+    user-select: none;
+    -webkit-user-select: none;
     color: var(--diagram-content-text);
 
     &:hover {

package/components/common/diagramMain/adapter/AdapterItems.vue

@@ -1,61 +1,61 @@
-<template>
-  <g data-title="adapter-items-group">
-    <template v-if="props.adaptersWithPositions.toggle">
-      <template
-        v-for="(adapter, key) in props.adaptersWithPositions.adapters"
-        :key="adapter.id"
-      >
-        <common-diagram-main-adapter-item
-          :adapter="adapter"
-          :selected-port="props.selectedPort"
-          :selected-adapter="props.selectedAdapter"
-          :networks-count="props.networksCount"
-          :is-dark-mode="props.isDarkMode"
-          :networks-with-positions="props.networksWithPositions"
-          @select-adapter="onSelectAdapter"
-          @show-modal="onShowModal"
-        />
-      </template>
-    </template>
-  </g>
-</template>
-
-<script setup lang="ts">
-import {
-  UI_I_AdaptersWithPositions,
-  UI_I_ModalsInitialData,
-  UI_I_SelectedAdapter,
-  UI_I_SelectedPort,
-  UI_I_NetworksWithPositions,
-} from '~/components/common/diagramMain/lib/models/interfaces'
-
-const props = defineProps<{
-  adaptersWithPositions: UI_I_AdaptersWithPositions
-  networksWithPositions: UI_I_NetworksWithPositions[]
-  selectedPort: UI_I_SelectedPort
-  selectedAdapter: UI_I_SelectedAdapter
-  networksCount: number
-  isDarkMode: boolean
-}>()
-
-const emits = defineEmits<{
-  (event: 'select-adapter', adapterId: string): void
-  (
-    event: 'show-modal',
-    value: string,
-    properties?: UI_I_ModalsInitialData
-  ): void
-}>()
-
-const onSelectAdapter = (adapterId: string): void => {
-  emits('select-adapter', adapterId)
-}
-const onShowModal = (
-  value: string,
-  properties?: UI_I_ModalsInitialData
-): void => {
-  emits('show-modal', value, properties)
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <g data-title="adapter-items-group">
+    <template v-if="props.adaptersWithPositions.toggle">
+      <template
+        v-for="(adapter, key) in props.adaptersWithPositions.adapters"
+        :key="adapter.id"
+      >
+        <common-diagram-main-adapter-item
+          :adapter="adapter"
+          :selected-port="props.selectedPort"
+          :selected-adapter="props.selectedAdapter"
+          :networks-count="props.networksCount"
+          :is-dark-mode="props.isDarkMode"
+          :networks-with-positions="props.networksWithPositions"
+          @select-adapter="onSelectAdapter"
+          @show-modal="onShowModal"
+        />
+      </template>
+    </template>
+  </g>
+</template>
+
+<script setup lang="ts">
+import {
+  UI_I_AdaptersWithPositions,
+  UI_I_ModalsInitialData,
+  UI_I_SelectedAdapter,
+  UI_I_SelectedPort,
+  UI_I_NetworksWithPositions,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+
+const props = defineProps<{
+  adaptersWithPositions: UI_I_AdaptersWithPositions
+  networksWithPositions: UI_I_NetworksWithPositions[]
+  selectedPort: UI_I_SelectedPort
+  selectedAdapter: UI_I_SelectedAdapter
+  networksCount: number
+  isDarkMode: boolean
+}>()
+
+const emits = defineEmits<{
+  (event: 'select-adapter', adapterId: string): void
+  (
+    event: 'show-modal',
+    value: string,
+    properties?: UI_I_ModalsInitialData
+  ): void
+}>()
+
+const onSelectAdapter = (adapterId: string): void => {
+  emits('select-adapter', adapterId)
+}
+const onShowModal = (
+  value: string,
+  properties?: UI_I_ModalsInitialData
+): void => {
+  emits('show-modal', value, properties)
+}
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/diagramMain/adapter/Contents.vue

@@ -46,7 +46,7 @@
       font-weight="500"
       :x="positions.adapterTextX"
       :y="props.adaptersWithPositions.titlePosition"
-      class="diagram__heading"
+      :class="['diagram__heading', { 'is-new': isNewView }]"
     >
       {{ headerText }}
     </text>
@@ -100,7 +100,9 @@ const hasAdapters = computed<boolean>(
   () => props.adaptersWithPositions.adaptersCount > 0
 )
 
-const isShowArrow = computed<boolean>(() => (isNewView.value ? true : hasAdapters.value))
+const isShowArrow = computed<boolean>(() =>
+  isNewView.value ? true : hasAdapters.value
+)
 
 const headerText = computed<string>(() =>
   isNewView.value
@@ -111,7 +113,7 @@ const headerText = computed<string>(() =>
 )
 
 const arrawIconPosition = computed<number>(
-  () => props.adaptersWithPositions.titlePosition + 1
+  () => props.adaptersWithPositions.titlePosition - 0.5
 )
 
 const onToggleAdapters = (networkId: string, portId: string): void => {
@@ -125,6 +127,9 @@ const onToggleAdapters = (networkId: string, portId: string): void => {
 :root.dark-theme {
   .diagram__heading {
     fill: #c1cdd4;
+    &.is-new {
+      fill: var(--diagram-content-text);
+    }
   }
   .no-physical-adapters {
     fill: #c1cdd4;
@@ -154,6 +159,8 @@ const onToggleAdapters = (networkId: string, portId: string): void => {
   fill: var(--triger-icon-color);
 
   &.is-new {
+    width: 20px;
+    height: 20px;
     fill: none;
     color: var(--diagram-content-second-text);
   }
@@ -173,6 +180,11 @@ const onToggleAdapters = (networkId: string, portId: string): void => {
   fill: #565656;
   letter-spacing: normal;
   line-height: 1.2rem;
+
+  &.is-new {
+    line-height: 16.94px;
+    fill: var(--diagram-content-text);
+  }
 }
 .no-physical-adapters {
   fill: #565656;
@@ -186,4 +198,10 @@ const onToggleAdapters = (networkId: string, portId: string): void => {
     color: var(--diagram-content-text);
   }
 }
+
+:root.is-new-view.dark-theme {
+  .text-ellipsis {
+    color: var(--diagram-content-text);
+  }
+}
 </style>