bfg-common 1.5.233 → 1.5.234

package/components/atoms/nav/NavBar.vue

@@ -66,8 +66,6 @@ const setTriggerElementWidth = (): void => {
       : 0
 }
 
-const spaceForCollapseBtn = ref<number>(60)
-
 let outputSize = (): void => {
   const el = document.getElementById(id.value)
   if (!el) return
@@ -80,7 +78,7 @@ let outputSize = (): void => {
   const elItemsMarginRight = parseInt(getComputedStyle(elItems[0]).marginRight)
   const childrenMarginY = elItemsMarginLeft + elItemsMarginRight
 
-  let childrenWidth = spaceForCollapseBtn.value
+  let childrenWidth = 0
   let count = 0
   for (let i = 0; i < elItems.length; i++) {
     childrenWidth += elItems[i].clientWidth + childrenMarginY
@@ -96,7 +94,7 @@ let outputSize = (): void => {
   if (element) {
     element.style.paddingRight =
       collapsedItems.value.length && !props.notCollapse
-        ? `${spaceForCollapseBtn.value}px`
+        ? `${triggerElementWidth}px`
         : ''
   }
 }

package/components/atoms/tabs/Tabs.vue

@@ -1,6 +1,6 @@
 <template>
   <nav :id="id" class="btn-group">
-    <ul class="nav" :style="{ paddingRight: spaceForCollapseBtn + 'px' }">
+    <ul class="nav">
       <li
         v-for="(item, key) in props.items"
         :key="item.path"
@@ -94,8 +94,6 @@ const setTriggerElementWidth = (): void => {
   }
 }
 
-const spaceForCollapseBtn = ref<number>(60)
-
 const outputSize = (): void => {
   const el = document.getElementById(id.value)
   if (!el) return
@@ -106,7 +104,7 @@ const outputSize = (): void => {
   const elItemsMarginRight = parseInt(getComputedStyle(elItems[0]).marginRight)
   const childrenMarginY = elItemsMarginLeft + elItemsMarginRight
 
-  let childrenWidth = spaceForCollapseBtn.value
+  let childrenWidth = 0
   let count = 0
   setTriggerElementWidth()
   for (let i = 0; i < elItems.length; i++) {
@@ -121,12 +119,12 @@ const outputSize = (): void => {
 
   visibleCount.value = count
 
-  // const element = document.querySelector(`#${id.value} ul`)
-  // if (element) {
-  //   element.style.paddingRight = collapsedItems.value.length
-  //     ? `${triggerElementWidth}px`
-  //     : ''
-  // }
+  const element = document.querySelector(`#${id.value} ul`)
+  if (element) {
+    element.style.paddingRight = collapsedItems.value.length
+      ? `${triggerElementWidth}px`
+      : ''
+  }
 }
 
 const id = ref<string>(`tabs-${useUniqueId()}`)

package/components/common/browse/blocks/lib/models/types.ts

@@ -1 +1 @@
-export type UI_T_BlocksWidth = [number, number, number]
+export type UI_T_BlocksWidth = [number, number, number]

package/components/common/browse/lib/models/interfaces.ts

@@ -1,5 +1,5 @@
-export interface UI_I_FileInfo {
-  type: string
-  title: string
-  value: string | number
-}
+export interface UI_I_FileInfo {
+  type: string
+  title: string
+  value: string | number
+}

package/components/common/context/recursion/RecursionNew.vue

@@ -18,7 +18,12 @@
       @mouseleave="emits('toggle-items', [item, false, $event])"
     >
       <span
-        class="context-link"
+        :class="[
+          'context-link',
+          {
+            'without-children': allInBlockWithoutChildren,
+          },
+        ]"
         :style="item.style"
         :data-id="`${item.testId}-context-link`"
         @mousedown="emits('select-item', item)"
@@ -68,6 +73,13 @@ const emits = defineEmits<{
     value: [UI_I_ContextMenuItem, boolean, I_HTMLLiElement]
   ): void
 }>()
+
+const allInBlockWithoutChildren = computed<boolean>(
+  () =>
+    !props.items.filter(
+      (item: UI_I_ContextMenuItem) => item.items && item.items.length > 0
+    ).length
+)
 </script>
 
 <style>
@@ -203,6 +215,10 @@ const emits = defineEmits<{
       border-radius: 4px;
       padding: 6px 24px 6px 8px;
 
+      &.without-children {
+        padding: 6px 10px 6px 8px;
+      }
+
       .menu-item-text {
         flex: 1 1 0;
         font-size: 13px;
@@ -230,7 +246,7 @@ const emits = defineEmits<{
 
       .shortcut {
         color: #9da6ad;
-        padding-left: 10px;
+        padding-left: 16px;
       }
     }
 

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/lib/config/initial.ts

@@ -1,50 +1,50 @@
-import type {
-  UI_I_AdapterStatus,
-  UI_I_MainRectHeights,
-  UI_I_SelectedAdapter,
-  UI_I_SelectedPort,
-  UI_I_SwitchLine,
-  UI_I_NetworkPositionsConst,
-} from '~/components/common/diagramMain/lib/models/interfaces'
-
-export const managePhysicalAdapterStatusInitial: UI_I_AdapterStatus = {
-  active: [],
-  standby: [],
-  unused: [],
-}
-
-export const mainRectHeightsInitial: UI_I_MainRectHeights = {
-  networksHeight: 0,
-  adaptersHeight: 0,
-}
-
-export const switchLineInitial: UI_I_SwitchLine = {
-  y1: 0,
-  y2: 0,
-  ay: 0,
-}
-
-export const selectedPortInitial: UI_I_SelectedPort = {
-  networkId: '-1',
-  portId: '-1',
-  activeAdapters: [],
-}
-
-export const selectedAdapterInitial: UI_I_SelectedAdapter = {
-  adapterId: '-1',
-  connectedPorts: [],
-}
-
-export const selectedSwitchLineYInitial: UI_I_SwitchLine = {
-  y1: 0,
-  y2: 0,
-}
-
-export const NETWORK_POSITIONS: UI_I_NetworkPositionsConst = {
-  EMPTY_PORTS_PADDING_BOTTOM: 7.5,
-  FROM_VLAN_ID_TO_GROUP_NAME: 22,
-  VMS_AND_PORTS_HEIGHT: 22,
-  V_CENTER_HEIGHT: 32,
-  BETWEEN_VMS_AND_PORTS: 7.5,
-  BETWEEN_V_CENTERS: 12.5,
-} as const
+import type {
+  UI_I_AdapterStatus,
+  UI_I_MainRectHeights,
+  UI_I_SelectedAdapter,
+  UI_I_SelectedPort,
+  UI_I_SwitchLine,
+  UI_I_NetworkPositionsConst,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+
+export const managePhysicalAdapterStatusInitial: UI_I_AdapterStatus = {
+  active: [],
+  standby: [],
+  unused: [],
+}
+
+export const mainRectHeightsInitial: UI_I_MainRectHeights = {
+  networksHeight: 0,
+  adaptersHeight: 0,
+}
+
+export const switchLineInitial: UI_I_SwitchLine = {
+  y1: 0,
+  y2: 0,
+  ay: 0,
+}
+
+export const selectedPortInitial: UI_I_SelectedPort = {
+  networkId: '-1',
+  portId: '-1',
+  activeAdapters: [],
+}
+
+export const selectedAdapterInitial: UI_I_SelectedAdapter = {
+  adapterId: '-1',
+  connectedPorts: [],
+}
+
+export const selectedSwitchLineYInitial: UI_I_SwitchLine = {
+  y1: 0,
+  y2: 0,
+}
+
+export const NETWORK_POSITIONS: UI_I_NetworkPositionsConst = {
+  EMPTY_PORTS_PADDING_BOTTOM: 7.5,
+  FROM_VLAN_ID_TO_GROUP_NAME: 22,
+  VMS_AND_PORTS_HEIGHT: 22,
+  V_CENTER_HEIGHT: 32,
+  BETWEEN_VMS_AND_PORTS: 7.5,
+  BETWEEN_V_CENTERS: 12.5,
+} as const

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

@@ -1,21 +1,21 @@
-import type {
-  UI_I_Adapter,
-  UI_I_AdapterWithError,
-} from '~/components/common/diagramMain/lib/models/interfaces'
-
-export type UI_T_AdapterStatusNames = 'active' | 'standby' | 'unused'
-export type UI_T_PropertiesFieldName = 'vlanId' | 'networkLabel'
-export type UI_T_TrafficShapingFieldName = 'average' | 'peak' | 'burstSize'
-export type UI_T_PortPropertiesFieldName = 'mtu'
-
-export type UI_T_LoadBalancingMode =
-  | 'inherit'
-  | 'active-backup'
-  | 'balance-slb'
-  | 'balance-tcp'
-export type UI_T_IYN = 'inherit' | 'yes' | 'no'
-export type UI_T_Carier = 'inherit' | 'carier' | 'beakon'
-
-export type UI_T_Adapters = (UI_I_Adapter | UI_I_AdapterWithError) & {
-  adapterPosition: number
-}
+import type {
+  UI_I_Adapter,
+  UI_I_AdapterWithError,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+
+export type UI_T_AdapterStatusNames = 'active' | 'standby' | 'unused'
+export type UI_T_PropertiesFieldName = 'vlanId' | 'networkLabel'
+export type UI_T_TrafficShapingFieldName = 'average' | 'peak' | 'burstSize'
+export type UI_T_PortPropertiesFieldName = 'mtu'
+
+export type UI_T_LoadBalancingMode =
+  | 'inherit'
+  | 'active-backup'
+  | 'balance-slb'
+  | 'balance-tcp'
+export type UI_T_IYN = 'inherit' | 'yes' | 'no'
+export type UI_T_Carier = 'inherit' | 'carier' | 'beakon'
+
+export type UI_T_Adapters = (UI_I_Adapter | UI_I_AdapterWithError) & {
+  adapterPosition: number
+}