bfg-common 1.4.9 → 1.4.10

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

@@ -1,212 +1,212 @@
-<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"
-        :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"
+        :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/monitor/advanced/tools/chartOptionsModal/counters/timespan/form/lib/config/dateForm.ts

@@ -1,6 +1,6 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 
 export const timespanFunc = (
   localization: UI_I_Localization

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

@@ -0,0 +1,84 @@
+<template>
+  <div class="hardware-health-graph">
+    <common-graph
+      v-if="dataLocal && !props.loading"
+      :data="dataLocal"
+      :update="updateHelper"
+    />
+    <div v-else-if="props.loading" class="graphic-loader-block">
+      <div class="spinner"></div>
+    </div>
+    <div v-else class="empty-content"></div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { format } from 'date-fns'
+import type { I_SeriesLine } from '~/node_modules/bfg-nuxt-3-graph/graph/lib/models/interfaces'
+import type { I_LineGraph } from '~/node_modules/bfg-nuxt-3-graph/graph/lib/models/interfaces'
+import { graphDataFunc } from '~/node_modules/bfg-nuxt-3-graph/graph/lib/utils/renderGraph'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  data: I_SeriesLine | null
+  loading: boolean
+  formattedDatetime: any
+  isDarkMode: boolean
+  getDateFormat: any
+  language: string
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const dataLocal = ref<I_LineGraph | null>(null)
+const updateHelper = ref<number>(0)
+let dateFormat = ''
+
+const updateChart = (): void => {
+  if (!props.data) return
+
+  dataLocal.value = graphDataFunc(
+    props.data,
+    props.isDarkMode,
+    localization.value,
+    () => {},
+    false,
+    false,
+    true,
+    'spline',
+    '',
+    undefined,
+    () => {},
+    props.formattedDatetime,
+    format,
+    dateFormat
+  )
+
+  updateHelper.value++
+}
+
+watch(
+  () => [props.data, props.isDarkMode, props.language],
+  (newValue) => {
+    dateFormat = props.getDateFormat(newValue[2])
+    updateChart()
+  },
+  { immediate: true, deep: true }
+)
+</script>
+
+<style scoped lang="scss">
+.hardware-health-graph {
+  height: 300px;
+
+  .graphic-loader-block {
+    height: inherit;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .empty-content {
+    height: inherit;
+  }
+}
+</style>

package/components/common/pages/hardwareHealth/HardwareHealth.vue

@@ -37,69 +37,60 @@
 
     <common-pages-hardware-health-tools-panel :selected-tab="activeTab" />
 
-    <div
-      :class="[
-        'bottom-container',
-        { 'history-testimony': activeTab === 'history-testimony' },
-      ]"
-    >
-      <common-pages-hardware-health-history-testimony-graph
-        v-if="activeTab === 'history-testimony'"
-        :power-data="props.historyTestimonyPower"
-        :temperature-data="props.historyTestimonyTemperature"
-        :counters-table-data="hardwareHealth"
-        :language="props.language"
-        :power-loading="props.loadingPowerData"
-        :temperature-loading="props.loadingTemperatureData"
-        :formatted-datetime="props.formattedDatetime"
-        :is-dark-mode="props.isDarkMode"
-        :get-date-format="props.getDateFormat"
-        :main-selected-row="selectedRow"
-      />
-
-      <common-pages-hardware-health-table-view
-        :key="uniqueKey"
-        v-model:selected="selectedRow"
-        :data-table="hardwareHealth"
-        :total-items="hardwareHealth.length"
-        :total-pages="1"
-        :table-mode="activeTab"
-        :loading="props.loading"
-      />
-    </div>
+    <common-pages-hardware-health-graph
+      v-if="activeTab === 'history-testimony'"
+      :data="props.historyTestimony"
+      :loading="props.loadingHistoryTestimony"
+      :is-dark-mode="props.isDarkMode"
+      :formatted-datetime="props.formattedDatetime"
+      :get-date-format="props.getDateFormat"
+      :language="props.language"
+    />
+
+    <common-pages-hardware-health-table-view
+      :key="uniqueKey"
+      v-model:selected="selectedRow"
+      :data-table="hardwareHealth"
+      :total-items="hardwareHealth.length"
+      :total-pages="1"
+      :table-mode="activeTab"
+      :loading="props.loading"
+    />
   </div>
 </template>
 
 <script lang="ts" setup>
 import type { I_SeriesLine } from '~/node_modules/bfg-nuxt-3-graph/graph/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_DateFormat } from '~/lib/models/plugins/date/types'
-import type { UI_I_HardwareHealthSensors } from '~/components/common/pages/hardwareHealth/tableView/lib/models/interfaces'
 import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
-import type { UI_I_StorageSensorsAlert } from '~/components/common/pages/hardwareHealth/lib/models/interfaces'
 import type { UI_T_HardwareHealthTabMode } from '~/components/common/pages/hardwareHealth/lib/models/types'
+import type { UI_I_StorageSensorsAlert } from '~/components/common/pages/hardwareHealth/lib/models/interfaces'
+import type { UI_I_HardwareHealthSensors } from '~/components/common/pages/hardwareHealth/tableView/lib/models/interfaces'
+import type { UI_T_SelectedRow } from '~/components/atoms/table/dataGrid/lib/models/types'
 import { hardwareHealthTabsFunc } from '~/components/common/pages/hardwareHealth/lib/config/tabsPannel'
 
 const props = defineProps<{
   data: UI_I_HardwareHealthSensors[]
   loading: boolean
-  historyTestimonyPower: I_SeriesLine | null
-  historyTestimonyTemperature: I_SeriesLine | null
-  loadingPowerData: boolean
-  loadingTemperatureData: boolean
+  historyTestimony: I_SeriesLine | null
+  loadingHistoryTestimony: boolean
   isDarkMode: boolean
   formattedDatetime: any
-  getDateFormat: UI_T_DateFormat
+  getDateFormat: any
   language: string
 }>()
 
+const emits = defineEmits<{
+  (event: 'update-chart-data', value: string): void
+}>()
+
 const localization = computed<UI_I_Localization>(() => useLocal())
 const { $store }: any = useNuxtApp()
 
 const activeTab = ref<UI_T_HardwareHealthTabMode>('sensor')
 const uniqueKey = ref<number>(0)
 
-const selectedRow = ref<number[]>([])
+const selectedRow = ref<UI_T_SelectedRow>([])
 
 const hardwareHealthTabs = computed<UI_I_CollapseNavItem[]>(() =>
   hardwareHealthTabsFunc(localization.value)
@@ -160,10 +151,42 @@ const generateAlertTextWithLink = computed<UI_I_StorageSensorsAlert>(() => {
   }
 })
 
+const updateChartData = (isSendAll: boolean = false): void => {
+  const selectedNames: string[] = []
+  hardwareHealth.value.forEach((item, key) => {
+    if (isSendAll) {
+      if (['power', 'temperature'].includes(item.category.toLowerCase()))
+        selectedNames.push(item.name)
+    } else if (
+      ['power', 'temperature'].includes(item.category.toLowerCase()) &&
+      selectedRow.value.includes(key)
+    ) {
+      selectedNames.push(item.name)
+    }
+  })
+  emits('update-chart-data', selectedNames.join(','))
+}
+
+watch(selectedRow, (newValue) => {
+  newValue.length &&
+    activeTab.value === 'history-testimony' &&
+    updateChartData()
+})
+
 watch(activeTab, () => {
   uniqueKey.value++
 })
 
+watch(
+  [hardwareHealth, activeTab],
+  (newValue) => {
+    newValue[0].length &&
+      newValue[1] === 'history-testimony' &&
+      updateChartData(true)
+  },
+  { immediate: true }
+)
+
 onMounted(() => {
   $store.dispatch('main/A_CONTINUE_GLOBAL_REFRESH', 'hardwareHealth')
 })
@@ -183,11 +206,5 @@ onUnmounted(() => {
       margin-top: 0;
     }
   }
-  .bottom-container {
-    &.history-testimony {
-      overflow: hidden;
-      overflow-y: auto;
-    }
-  }
 }
 </style>