bfg-common 1.4.582 → 1.4.583

package/components/common/diagramMain/DiagramMain.vue

@@ -645,6 +645,7 @@ watch(
     }
 
     if (selectedNetwork.value !== '-1') {
+      cashedNetworkId.value = '-1'
       onSelectNetwork(selectedNetwork.value)
       return
     }
@@ -675,7 +676,15 @@ const onSelectPort = (networkId: string, portId: string): void => {
   selectedPort.value = selectPortData.selectedPort
 }
 
+const cashedNetworkId = ref<string>('-1')
+
 const onSelectNetwork = (networkId: string): void => {
+  if (cashedNetworkId.value === networkId) {
+    resetSelection()
+    cashedNetworkId.value = '-1'
+    return
+  }
+
   selectedNetwork.value = networkId
 
   const selectNetworkData = getSelectNetworkDataFunc(
@@ -684,6 +693,8 @@ const onSelectNetwork = (networkId: string): void => {
     adaptersWithPositions.value
   )
 
+  cashedNetworkId.value = networkId
+
   if (!selectNetworkData) return
 
   selectedSwitchLineY.value = selectNetworkData.selectedSwitchLineY
@@ -798,6 +809,8 @@ const onTogglePorts = (
 }
 
 const handlePortToggle = () => {
+  cashedNetworkId.value = '-1'
+
   selectedPort.value.portId !== '-1' &&
     onSelectPort(selectedPort.value.networkId, selectedPort.value.portId)
   selectedAdapter.value.adapterId !== '-1' &&
@@ -813,6 +826,8 @@ const handlePortToggle = () => {
 }
 
 const onToggleAdapters = (): void => {
+  cashedNetworkId.value = '-1'
+
   const newState = !adaptersWithPositions.value.toggle
   const payload: Omit<UI_I_ToggleDiagramAdaptersPayload, 'paths'> = {
     isToggle: newState,
@@ -830,6 +845,11 @@ const onToggleAdapters = (): void => {
 const onClickDiagram = (ev: MouseEvent): void => {
   const target = ev.target as HTMLElement
   const targetClassList = target.classList
+
+  if (!targetClassList.contains('network-title')) {
+    cashedNetworkId.value = '-1'
+  }
+
   if (targetClassList.contains('main-line__handler')) {
     resetSelection()
     selectedMainLine.value = true
@@ -846,7 +866,8 @@ const onClickDiagram = (ev: MouseEvent): void => {
 <style scoped lang="scss">
 .diagram {
   &-min-width {
-    min-width: 745px;
+    //min-width: 745px;
+    //min-width: 764px;
   }
   &-main-container {
     padding-top: 5px;

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/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>

package/components/common/diagramMain/lib/config/positions.ts

@@ -103,7 +103,7 @@ export const networkContentPositionsFunc = (
         portX: 68,
         actionY: networkTitlePosition + 1.5,
         actionX: 266.5,
-        portsArrowPosition: networkPortsPosition - 2,
+        portsArrowPosition: networkPortsPosition - 0.5,
       }
     : {
         blockX: 18.5,

package/components/common/diagramMain/lib/models/enums.ts

@@ -6,7 +6,7 @@ export const enum UI_E_NetworkType {
 
 export const enum UI_E_PositionsY {
   DIAGRAM_TOP = 1.5,
-  DIAGRAM_BOTTOM = 30,
+  DIAGRAM_BOTTOM = 1.5,
   BETWEEN_RECTS = 16,
   TITLE_FROM_RECT_TOP = 9.5,
   VLAN_FROM_RECT_TOP = 35.5,

package/components/common/diagramMain/modals/viewSettings/info/InfoNew.vue

@@ -107,9 +107,10 @@ const viewSettingsTabContent = (tab: number): UI_I_ViewSettingsFields[] =>
 }
 
 .table-fixed-height {
-  min-height: 400px;
-  max-height: 400px;
+  min-height: min(calc(100vh - 270px), 400px);
+  max-height: min(calc(100vh - 270px), 400px);
   overflow-y: auto;
+  overflow-x: hidden;
   padding-right: 32px;
   padding-top: 16px;
 

package/components/common/diagramMain/modals/viewSettings/viewSettingsModal/ViewSettingsModalNew.vue

@@ -60,4 +60,9 @@ const emits = defineEmits<{
 }>()
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+:deep(.modal-body) {
+  max-height: unset;
+  overflow-y: unset;
+}
+</style>

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

@@ -16,6 +16,7 @@
       style="text-decoration: none"
       cursor="pointer"
       data-title="network-name-link"
+      class="network-title-link"
       @click="onSelectNetwork(props.network.id)"
     >
       <foreignObject
@@ -430,6 +431,8 @@ const onTogglePorts = (
 
 :root.is-new-view {
   .network-title {
+    user-select: none;
+    -webkit-user-select: none;
     line-height: 26px;
     color: var(--diagram-content-text);
 
@@ -440,7 +443,7 @@ const onTogglePorts = (
     &.is-selected {
       color: var(--diagram-content-text-selected);
       &:hover {
-        color: var(--diagram-content-text-selected);
+        color: var(--diagram-content-text-selected-hover);
         text-decoration: unset;
       }
     }

package/components/common/diagramMain/network/noNetwork/NoNetworkNew.vue

@@ -81,7 +81,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 
   .no-associated-port-groups {
     font-size: 14px;
-    font-weight: 400;
+    font-weight: 300;
     line-height: 16.94px;
     text-align: center;
   }

package/components/common/diagramMain/port/Port.vue

@@ -532,6 +532,8 @@ const onSelectPort = (networkId: string, portId: string): void => {
 
 :root.is-new-view {
   .port-text.text-ellipsis {
+    user-select: none;
+    -webkit-user-select: none;
     line-height: 25px;
     padding-left: 18px;
     color: var(--diagram-content-text);

package/components/common/layout/theHeader/helpMenu/About.vue

@@ -1,85 +1,85 @@
-<template>
-  <Teleport to="body">
-    <common-layout-the-header-help-menu-about-new
-      v-if="isNewView"
-      :title="title"
-      :subtitle="subtitle"
-      :about-heading-text="aboutHeadingText"
-      :about-desc-one="aboutDesc1"
-      :about-desc-second="aboutDesc2"
-      :is-beta-version="props.isBeta"
-      :is-dev="props.isDev"
-      :project-name="props.projectName"
-      :url="companyWebSitePath"
-      @hide="emits('hide')"
-    />
-
-    <common-layout-the-header-help-menu-about-old
-      v-else
-      :title="title"
-      :subtitle="subtitle"
-      :about-heading-text="aboutHeadingText"
-      :about-desc-one="aboutDesc1"
-      :about-desc-second="aboutDesc2"
-      :is-beta-version="props.isBeta"
-      :is-dev="props.isDev"
-      :project-name="props.projectName"
-      :url="companyWebSitePath"
-      @hide="emits('hide')"
-    />
-  </Teleport>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const props = defineProps<{
-  version: string
-  isBeta: boolean
-  isDev: boolean
-  projectName: string
-}>()
-const emits = defineEmits<{
-  (event: 'hide'): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store }: any = useNuxtApp()
-const config = useRuntimeConfig()
-
-const companyName = computed<string>(
-  () => config.public[`COMPANY_NAME_${useEnvLanguage()}`]
-)
-const brandName = computed<string>(
-  () => config.public[`TRADEMARK_${useEnvLanguage()}`]
-)
-
-const companyWebSitePath = ref<string>('https://iridium-soft.com/')
-
-const title = computed<string>(() => `${brandName.value}® ${props.projectName}`)
-const subtitle = computed<string>(() =>
-  localization.value.layout.aboutWebClientVersion
-    .replace('{0}', props.projectName)
-    .replace('{1}', props.version)
-)
-
-const aboutHeadingText = computed<string>(() =>
-  localization.value.layout.aboutHeading.replaceAll(
-    '{companyName}',
-    companyName.value
-  )
-)
-
-const aboutDesc1 = computed<string>(() =>
-  localization.value.layout.aboutDesc1
-    .replaceAll('{companyName}', companyName.value)
-    .replaceAll('{trademark}', brandName.value)
-)
-const aboutDesc2 = computed<string>(() =>
-  localization.value.layout.aboutDesc2
-    .replaceAll('{companyName}', companyName.value)
-    .replaceAll('{trademark}', brandName.value)
-)
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-</script>
+<template>
+  <Teleport to="body">
+    <common-layout-the-header-help-menu-about-new
+      v-if="isNewView"
+      :title="title"
+      :subtitle="subtitle"
+      :about-heading-text="aboutHeadingText"
+      :about-desc-one="aboutDesc1"
+      :about-desc-second="aboutDesc2"
+      :is-beta-version="props.isBeta"
+      :is-dev="props.isDev"
+      :project-name="props.projectName"
+      :url="companyWebSitePath"
+      @hide="emits('hide')"
+    />
+
+    <common-layout-the-header-help-menu-about-old
+      v-else
+      :title="title"
+      :subtitle="subtitle"
+      :about-heading-text="aboutHeadingText"
+      :about-desc-one="aboutDesc1"
+      :about-desc-second="aboutDesc2"
+      :is-beta-version="props.isBeta"
+      :is-dev="props.isDev"
+      :project-name="props.projectName"
+      :url="companyWebSitePath"
+      @hide="emits('hide')"
+    />
+  </Teleport>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  version: string
+  isBeta: boolean
+  isDev: boolean
+  projectName: string
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $store }: any = useNuxtApp()
+const config = useRuntimeConfig()
+
+const companyName = computed<string>(
+  () => config.public[`COMPANY_NAME_${useEnvLanguage()}`]
+)
+const brandName = computed<string>(
+  () => config.public[`TRADEMARK_${useEnvLanguage()}`]
+)
+
+const companyWebSitePath = ref<string>('https://iridium-soft.com/')
+
+const title = computed<string>(() => `${brandName.value}® ${props.projectName}`)
+const subtitle = computed<string>(() =>
+  localization.value.layout.aboutWebClientVersion
+    .replace('{0}', props.projectName)
+    .replace('{1}', props.version)
+)
+
+const aboutHeadingText = computed<string>(() =>
+  localization.value.layout.aboutHeading.replaceAll(
+    '{companyName}',
+    companyName.value
+  )
+)
+
+const aboutDesc1 = computed<string>(() =>
+  localization.value.layout.aboutDesc1
+    .replaceAll('{companyName}', companyName.value)
+    .replaceAll('{trademark}', brandName.value)
+)
+const aboutDesc2 = computed<string>(() =>
+  localization.value.layout.aboutDesc2
+    .replaceAll('{companyName}', companyName.value)
+    .replaceAll('{trademark}', brandName.value)
+)
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+</script>

package/components/common/layout/theHeader/helpMenu/aboutNew/AboutNew.vue

@@ -1,103 +1,103 @@
-<template>
-  <ui-modal
-    test-id="about-modal"
-    width="720px"
-    :title="props.title"
-    :subtitle="props.subtitle"
-    class="about-modal"
-    @hide="onHideModal"
-  >
-    <template #content>
-      <ui-modal-block-standard>
-        <div class="about-modal__text">
-          <p>{{ aboutHeadingText }}</p>
-
-          <p>{{ localization.layout.aboutSubtitle }}</p>
-        </div>
-
-        <div class="about-modal__description">
-          {{ props.aboutDescOne }}
-
-          (<a
-            id="about-description-link"
-            data-id="about-description-link"
-            :href="url"
-            target="_blank"
-            class="about-modal__description-link"
-          >
-            {{ props.url }} </a
-          >)
-
-          {{ props.aboutDescSecond }}
-        </div>
-      </ui-modal-block-standard>
-    </template>
-    <template #footerContent><span /></template>
-    <template #footerLeftContent><span /></template>
-  </ui-modal>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const props = defineProps<{
-  title: string
-  subtitle: string
-  aboutHeadingText: string
-  aboutDescOne: string
-  aboutDescSecond: string
-  isBetaVersion: boolean
-  isDev: boolean
-  projectName: string
-  url: string
-}>()
-const emits = defineEmits<{
-  (event: 'hide'): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const onHideModal = (): void => {
-  emits('hide')
-}
-</script>
-
-<style>
-:root {
-  --about-text-color: #4d5d69;
-}
-:root.dark-theme {
-  --about-text-color: #9da6ad;
-}
-</style>
-
-<style lang="scss" scoped>
-.about-modal {
-  &__text {
-    color: var(--about-text-color);
-    font-size: 13px;
-    font-weight: 400;
-    line-height: 15.73px;
-
-    p:last-child {
-      margin: 16px 0;
-    }
-  }
-  &__description {
-    color: var(--about-text-color);
-    font-size: 13px;
-    font-weight: 400;
-    line-height: 15.73px;
-
-    &-link {
-      color: #0786d2;
-      &:hover {
-        color: #0081c1;
-      }
-    }
-  }
-}
-:deep(.title-wrapper__subtitle) {
-  max-width: 400px;
-}
-</style>
+<template>
+  <ui-modal
+    test-id="about-modal"
+    width="720px"
+    :title="props.title"
+    :subtitle="props.subtitle"
+    class="about-modal"
+    @hide="onHideModal"
+  >
+    <template #content>
+      <ui-modal-block-standard>
+        <div class="about-modal__text">
+          <p>{{ aboutHeadingText }}</p>
+
+          <p>{{ localization.layout.aboutSubtitle }}</p>
+        </div>
+
+        <div class="about-modal__description">
+          {{ props.aboutDescOne }}
+
+          (<a
+            id="about-description-link"
+            data-id="about-description-link"
+            :href="url"
+            target="_blank"
+            class="about-modal__description-link"
+          >
+            {{ props.url }} </a
+          >)
+
+          {{ props.aboutDescSecond }}
+        </div>
+      </ui-modal-block-standard>
+    </template>
+    <template #footerContent><span /></template>
+    <template #footerLeftContent><span /></template>
+  </ui-modal>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  title: string
+  subtitle: string
+  aboutHeadingText: string
+  aboutDescOne: string
+  aboutDescSecond: string
+  isBetaVersion: boolean
+  isDev: boolean
+  projectName: string
+  url: string
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const onHideModal = (): void => {
+  emits('hide')
+}
+</script>
+
+<style>
+:root {
+  --about-text-color: #4d5d69;
+}
+:root.dark-theme {
+  --about-text-color: #9da6ad;
+}
+</style>
+
+<style lang="scss" scoped>
+.about-modal {
+  &__text {
+    color: var(--about-text-color);
+    font-size: 13px;
+    font-weight: 400;
+    line-height: 15.73px;
+
+    p:last-child {
+      margin: 16px 0;
+    }
+  }
+  &__description {
+    color: var(--about-text-color);
+    font-size: 13px;
+    font-weight: 400;
+    line-height: 15.73px;
+
+    &-link {
+      color: #0786d2;
+      &:hover {
+        color: #0081c1;
+      }
+    }
+  }
+}
+:deep(.title-wrapper__subtitle) {
+  max-width: 400px;
+}
+</style>