bfg-common 1.4.165 → 1.4.166

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

@@ -1,213 +1,213 @@
-<template>
-  <ul class="context-wrap">
-    <span v-if="props.isLoading">
-      <atoms-loader-pre-loader
-        id="loader"
-        class="absolute-center context-menu__loading"
-        :show="true"
-      />
-    </span>
-    <li
-      v-for="(item, key) in props.items"
-      :key="key"
-      :class="[
-        'menu-item',
-        { disabled: item.disabled || isLoading },
-        { 'item-header': item.isHeader },
-        { 'has-border-top': item.hasBorderTop },
-      ]"
-      @mouseenter="emits('toggle-items', [item, true, $event])"
-      @mouseleave="emits('toggle-items', [item, false, $event])"
-    >
-      <span
-        class="context-link"
-        :style="item.style"
-        :data-id="`${item.testId}-context-link`"
-        @mousedown="emits('select-item', item)"
-      >
-        <span :class="['context-icon', item.iconClassName]" />
-        <span class="menu-item-text">{{ item.name }}</span>
-        <span v-if="item.items.length" class="arrow-icon" />
-        <span v-if="item.shortcut" class="shortcut">{{ item.shortcut }}</span>
-      </span>
-
-      <div class="context-children">
-        <common-context-recursion
-          v-show="item.isShowItems"
-          :action-loading="props.actionLoading"
-          :class="[{ 'child-show': item.isShowItems }]"
-          :items="item.items"
-          @select-item="emits('select-item', $event)"
-        />
-      </div>
-    </li>
-  </ul>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_ContextMenuItem } from '~/components/common/context/lib/models/interfaces'
-import type { I_HTMLLiElement } from '~/components/common/context/recursion/lib/models/interfaces'
-
-const props = defineProps<{
-  items: UI_I_ContextMenuItem[]
-  actionLoading: string | null
-  isLoading: boolean
-  testId?: string
-}>()
-
-const emits = defineEmits<{
-  (event: 'select-item', value: UI_I_ContextMenuItem): void
-  (
-    event: 'toggle-items',
-    value: [UI_I_ContextMenuItem, boolean, I_HTMLLiElement]
-  ): void
-}>()
-</script>
-
-<style scoped lang="scss">
-.loader-wrapper {
-  width: 100%;
-  height: 100%;
-  z-index: 100;
-}
-
-.context-menu__loading {
-  :deep(.spinner) {
-    width: 45px;
-    height: 45px;
-    min-width: 45px;
-    min-height: 45px;
-    z-index: 1000;
-  }
-}
-.context-wrap {
-  width: auto;
-  max-width: 400px;
-  background: var(--global-bg-color);
-  border-radius: 0;
-  color: #333;
-  border: 1px solid var(--context-menu-border-color);
-  user-select: none;
-  list-style: none;
-  max-height: 100vh;
-  overflow-y: auto;
-
-  .menu-item {
-    position: relative;
-    color: #565656;
-    border-bottom: 1px solid transparent;
-    cursor: pointer;
-    padding: 5px 0 3px;
-
-    &.has-border-top {
-      border-top: 1px solid var(--context-menu-inset-border-color);
-    }
-
-    &.item-header {
-      font-size: 11px;
-      background-color: var(--context-menu-item-header-color);
-      cursor: default;
-    }
-    &:not(.item-header):not(.disabled):hover {
-      background-color: var(--context-menu-hover-bg-color);
-      color: #454545;
-      border-bottom: 1px solid var(--context-menu-hover-border-color);
-    }
-    &.disabled {
-      opacity: 0.5;
-      user-select: none;
-      cursor: default;
-    }
-    &.left {
-      :deep(.context-children) {
-        left: 0;
-        background: red;
-
-        .context-wrap {
-          transform: translateX(-100%);
-          left: auto;
-        }
-      }
-    }
-
-    .context-link {
-      position: relative;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      display: flex;
-      align-items: center;
-      user-select: none;
-      padding: 3px 20px 4px 10px;
-
-      .menu-item-text {
-        flex: 1 1 0;
-      }
-
-      .context-icon {
-        display: inline-block;
-        margin: -2px 4px 0 0;
-        vertical-align: middle;
-        width: 18px;
-        height: 18px;
-      }
-
-      .arrow-icon {
-        position: absolute;
-        top: 50%;
-        margin-top: -8px;
-        right: 4px;
-        background-image: url('assets/img/icons/sprite.png');
-        display: inline-block;
-        width: 16px;
-        height: 16px;
-        overflow: hidden;
-        background-repeat: no-repeat;
-        font-size: 0;
-        line-height: 0;
-        text-align: center;
-        transform: rotate(90deg);
-      }
-
-      .shortcut {
-        padding-left: 10px;
-      }
-    }
-
-    .context-children {
-      position: absolute;
-      top: 0;
-      left: 100%;
-
-      .context-wrap {
-        position: fixed;
-      }
-    }
-  }
-}
-.context-menu__loading {
-  :deep(.spinner) {
-    width: 45px;
-    height: 45px;
-    min-width: 45px;
-    min-height: 45px;
-    z-index: 1000;
-  }
-}
-</style>
-<style>
-:root {
-  --context-menu-hover-bg-color: #e8e8e8;
-  --context-menu-border-color: #949494;
-  --context-menu-inset-border-color: #d4d5d6;
-  --context-menu-item-header-color: #eceff2;
-  --context-menu-hover-border-color: #666;
-}
-:root.dark-theme {
-  --context-menu-hover-bg-color: #324f61;
-  --context-menu-border-color: #495865;
-  --context-menu-inset-border-color: #485764;
-  --context-menu-item-header-color: #29414e;
-  --context-menu-hover-border-color: #fff;
-}
-</style>
+<template>
+  <ul class="context-wrap">
+    <span v-if="props.isLoading">
+      <atoms-loader-pre-loader
+        id="loader"
+        class="absolute-center context-menu__loading"
+        :show="true"
+      />
+    </span>
+    <li
+      v-for="(item, key) in props.items"
+      :key="key"
+      :class="[
+        'menu-item',
+        { disabled: item.disabled || isLoading },
+        { 'item-header': item.isHeader },
+        { 'has-border-top': item.hasBorderTop },
+      ]"
+      @mouseenter="emits('toggle-items', [item, true, $event])"
+      @mouseleave="emits('toggle-items', [item, false, $event])"
+    >
+      <span
+        class="context-link"
+        :style="item.style"
+        :data-id="`${item.testId}-context-link`"
+        @mousedown="emits('select-item', item)"
+      >
+        <span :class="['context-icon', item.iconClassName]" />
+        <span class="menu-item-text">{{ item.name }}</span>
+        <span v-if="item.items.length" class="arrow-icon" />
+        <span v-if="item.shortcut" class="shortcut">{{ item.shortcut }}</span>
+      </span>
+
+      <div class="context-children">
+        <common-context-recursion
+          v-show="item.isShowItems"
+          :action-loading="props.actionLoading"
+          :class="[{ 'child-show': item.isShowItems }]"
+          :items="item.items"
+          @select-item="emits('select-item', $event)"
+        />
+      </div>
+    </li>
+  </ul>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_ContextMenuItem } from '~/components/common/context/lib/models/interfaces'
+import type { I_HTMLLiElement } from '~/components/common/context/recursion/lib/models/interfaces'
+
+const props = defineProps<{
+  items: UI_I_ContextMenuItem[]
+  actionLoading: string | null
+  isLoading: boolean
+  testId?: string
+}>()
+
+const emits = defineEmits<{
+  (event: 'select-item', value: UI_I_ContextMenuItem): void
+  (
+    event: 'toggle-items',
+    value: [UI_I_ContextMenuItem, boolean, I_HTMLLiElement]
+  ): void
+}>()
+</script>
+
+<style scoped lang="scss">
+.loader-wrapper {
+  width: 100%;
+  height: 100%;
+  z-index: 100;
+}
+
+.context-menu__loading {
+  :deep(.spinner) {
+    width: 45px;
+    height: 45px;
+    min-width: 45px;
+    min-height: 45px;
+    z-index: 1000;
+  }
+}
+.context-wrap {
+  width: auto;
+  max-width: 400px;
+  background: var(--global-bg-color);
+  border-radius: 0;
+  color: #333;
+  border: 1px solid var(--context-menu-border-color);
+  user-select: none;
+  list-style: none;
+  max-height: 100vh;
+  overflow-y: auto;
+
+  .menu-item {
+    position: relative;
+    color: #565656;
+    border-bottom: 1px solid transparent;
+    cursor: pointer;
+    padding: 5px 0 3px;
+
+    &.has-border-top {
+      border-top: 1px solid var(--context-menu-inset-border-color);
+    }
+
+    &.item-header {
+      font-size: 11px;
+      background-color: var(--context-menu-item-header-color);
+      cursor: default;
+    }
+    &:not(.item-header):not(.disabled):hover {
+      background-color: var(--context-menu-hover-bg-color);
+      color: #454545;
+      border-bottom: 1px solid var(--context-menu-hover-border-color);
+    }
+    &.disabled {
+      opacity: 0.5;
+      user-select: none;
+      cursor: default;
+    }
+    &.left {
+      :deep(.context-children) {
+        left: 0;
+        background: red;
+
+        .context-wrap {
+          transform: translateX(-100%);
+          left: auto;
+        }
+      }
+    }
+
+    .context-link {
+      position: relative;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      display: flex;
+      align-items: center;
+      user-select: none;
+      padding: 3px 20px 4px 10px;
+
+      .menu-item-text {
+        flex: 1 1 0;
+      }
+
+      .context-icon {
+        display: inline-block;
+        margin: -2px 4px 0 0;
+        vertical-align: middle;
+        width: 18px;
+        height: 18px;
+      }
+
+      .arrow-icon {
+        position: absolute;
+        top: 50%;
+        margin-top: -8px;
+        right: 4px;
+        background-image: url('assets/img/icons/sprite.png');
+        display: inline-block;
+        width: 16px;
+        height: 16px;
+        overflow: hidden;
+        background-repeat: no-repeat;
+        font-size: 0;
+        line-height: 0;
+        text-align: center;
+        transform: rotate(90deg);
+      }
+
+      .shortcut {
+        padding-left: 10px;
+      }
+    }
+
+    .context-children {
+      position: absolute;
+      top: 0;
+      left: 100%;
+
+      .context-wrap {
+        position: fixed;
+      }
+    }
+  }
+}
+.context-menu__loading {
+  :deep(.spinner) {
+    width: 45px;
+    height: 45px;
+    min-width: 45px;
+    min-height: 45px;
+    z-index: 1000;
+  }
+}
+</style>
+<style>
+:root {
+  --context-menu-hover-bg-color: #e8e8e8;
+  --context-menu-border-color: #949494;
+  --context-menu-inset-border-color: #d4d5d6;
+  --context-menu-item-header-color: #eceff2;
+  --context-menu-hover-border-color: #666;
+}
+:root.dark-theme {
+  --context-menu-hover-bg-color: #324f61;
+  --context-menu-border-color: #495865;
+  --context-menu-inset-border-color: #485764;
+  --context-menu-item-header-color: #29414e;
+  --context-menu-hover-border-color: #fff;
+}
+</style>

package/components/common/layout/theHeader/TheHeaderNew.vue

@@ -30,9 +30,12 @@
             </div>
           </template>
           <template #content>
-            <span class="header-tooltip-text">{{
-              localization.common.openMenu
-            }}</span>
+            <span class="header-tooltip-text">
+              <template v-if="!props.isShowMainMenu">{{
+                localization.common.openMenu
+              }}</template>
+              <template v-else>{{ localization.common.closeMenu }}</template>
+            </span>
           </template>
         </ui-tooltip>
         <nuxt-link

package/components/common/mainNavigationPanel/MainNavigationPanelNew.vue

@@ -60,7 +60,9 @@
             :id="`tooltip-nav-${key}-${key2}`"
             :key="item2.id"
             :test-id="`tooltip-nav-${key}-${key2}`"
+            :menu-selected="isActiveNode(item2.to)"
             size="md"
+            class="node-tooltip-container"
             menu
           >
             <template #target>
@@ -86,7 +88,7 @@
               </div>
             </template>
             <template #content>
-              {{ item2.title }}
+              <span class="node-tooltip-text">{{ item2.title }}</span>
             </template>
           </ui-tooltip>
           <div
@@ -119,6 +121,10 @@ const emits = defineEmits<{
   (event: 'hide-main-menu'): void
 }>()
 
+const router = useRoute()
+
+const isActiveNode = (path: string): boolean => router.fullPath.includes(path)
+
 const mainMenuHovered = defineModel<boolean>('mainMenuHovered', {
   required: true,
 })
@@ -230,8 +236,16 @@ const localization = computed<UI_I_Localization>(() => useLocal())
       padding: 0 12px 12px;
       height: inherit;
 
+      &::-webkit-scrollbar-track,
+      &::-webkit-scrollbar-corner {
+        background: var(--nav-content-scrollbar-track-corner-thumb);
+      }
       &::-webkit-scrollbar-thumb {
-        background: var(--nav-content-scrollbar-thumb-bg);
+        border: solid 3px var(--nav-content-scrollbar-track-corner-thumb);
+      }
+
+      .node-tooltip-container {
+        margin-bottom: 4px;
       }
 
       .content-toggle-tooltip {
@@ -259,6 +273,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 
           &:not(.active):hover {
             background-color: var(--vertical-nav-hover-bg-color);
+            color: var(--vertical-nav-hover-item-color);
           }
 
           .nav-text {
@@ -271,6 +286,10 @@ const localization = computed<UI_I_Localization>(() => useLocal())
           margin-top: 4px;
         }
       }
+      .node-tooltip-text {
+        font-size: 14px;
+        font-weight: 500;
+      }
 
       .nav-divider {
         width: 100%;
@@ -287,21 +306,23 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 :root.is-new-view {
   --vertical-nav-bg-color: rgba(233, 235, 237, 0.92);
   --vertical-nav-item-color: #4d5d69;
+  --vertical-nav-hover-item-color: #182531;
   --vertical-nav-hover-bg-color: rgba(211, 214, 218, 0.48);
   --vertical-active-nav-bg-color: #213444;
   --vertical-active-nav-color: #ffffff;
   --pin-unpin-label-hover-color: #008fd6;
-  --nav-content-scrollbar-thumb-bg: #9da6ad;
+  --nav-content-scrollbar-track-corner-thumb: #ebedee;
   --nav-content-divider-bg: #d3d6da;
 }
 :root.is-new-view.dark-theme {
   --vertical-nav-bg-color: rgba(51, 68, 83, 0.92);
   --vertical-nav-item-color: #e9eaec;
+  --vertical-nav-hover-item-color: #ffffff;
   --vertical-nav-hover-bg-color: rgba(233, 234, 236, 0.12);
   --vertical-active-nav-bg-color: rgba(233, 235, 237, 0.96);
   --vertical-active-nav-color: #213444;
   --pin-unpin-label-hover-color: #2ba2de;
-  --nav-content-scrollbar-thumb-bg: rgba(157, 166, 173, 0.32);
+  --nav-content-scrollbar-track-corner-thumb: #435360;
   --nav-content-divider-bg: rgba(211, 214, 218, 0.12);
 }
 </style>

package/components/common/pages/hardwareHealth/historyTestimony/Graph.vue

@@ -31,9 +31,12 @@
   />
   <div
     ref="historyTestimonyGraph"
-    :class="`history-testimony-graph ${selectedView}`"
+    :class="[
+      `history-testimony-graph ${selectedView}`,
+      { medium: isMediumSizeGraphsContainer },
+    ]"
   >
-    <div>
+    <div class="graph-container">
       <common-graph
         v-if="powerDataLocal && !props.powerLoading"
         :data="powerDataLocal"
@@ -49,7 +52,7 @@
       </div>
       <div v-else class="history-testimony-graph__empty-content"></div>
     </div>
-    <div>
+    <div class="graph-container">
       <common-graph
         v-if="temperatureDataLocal && !props.temperatureLoading"
         :data="temperatureDataLocal"
@@ -69,6 +72,7 @@
 </template>
 
 <script setup lang="ts">
+import { useElementSize } from '@vueuse/core'
 import { format } from 'date-fns'
 import type {
   I_SeriesLine,
@@ -98,6 +102,10 @@ const selectedView = defineModel<string>('selectedView')
 
 const { $store }: any = useNuxtApp()
 
+const historyTestimonyGraph = ref<any>(null)
+const { width } = useElementSize(historyTestimonyGraph)
+const isMediumSizeGraphsContainer = computed<boolean>(() => width.value < 1021)
+
 // const historyTestimonyGraph = ref(null)
 // const contentWidth = ref<number>(
 //   useElementSize(historyTestimonyGraph)?.width || 0
@@ -398,26 +406,36 @@ const onDeleteOption = (): void => {}
 
 <style scoped lang="scss">
 .history-testimony-graph {
-  display: grid;
+  display: flex;
   align-items: center;
   grid-gap: 20px;
-  grid-template-columns: 1fr 1fr;
 
-  //&.medium {
-  //  grid-template-columns: 1fr;
-  //}
-  &.power {
-    grid-template-columns: 1fr 0;
+  &.medium {
+    flex-direction: column;
 
+    .graph-container {
+      width: 100%;
+    }
+  }
+  .graph-container {
+    width: calc(50% - 10px);
+  }
+  &.power {
+    & > div:nth-child(1) {
+      width: 100%;
+    }
     & > div:nth-child(2) {
-      visibility: hidden;
+      display: none;
+      width: 0;
     }
   }
   &.temperature {
-    grid-template-columns: 0 1fr;
-
     & > div:nth-child(1) {
-      visibility: hidden;
+      display: none;
+      width: 0;
+    }
+    & > div:nth-child(2) {
+      width: 100%;
     }
   }