bfg-common 1.4.15 → 1.4.17

package/assets/localization/local_be.json

@@ -2535,6 +2535,9 @@
   "inventory": {
     "activeMemory": "Актыўная памяць"
   },
+  "inventoryMonitor": {
+    "temperature": "Тэмпература"
+  },
   "inventoryTabs": {
     "summary": "Рэзюмэ",
     "monitor": "Манітор",
@@ -2557,5 +2560,8 @@
     "revertToSelectedSnapshot": "Вярнуцца да абранага здымку",
     "deleteSnapshot": "Выдаліць маментальны здымак",
     "deleteSnapshotDescription": "Гэта дзеянне з'яўляецца сталым і не можа быць адноўлена. Вы хочаце выдаліць '{0}'?"
+  },
+  "importVms": {
+    "selectSourceTooltipDesc": "Правы карыстальніка esxi павінны адпавядаць ролях Administrator"
   }
 }

package/assets/localization/local_en.json

@@ -2539,6 +2539,9 @@
   "inventory": {
     "activeMemory": "Active Memory"
   },
+  "inventoryMonitor": {
+    "temperature": "Temperature"
+  },
   "inventoryTabs": {
     "summary": "Summary",
     "monitor": "Monitor",
@@ -2561,5 +2564,8 @@
     "revertToSelectedSnapshot": "Revert to selected snapshot",
     "deleteSnapshot": "Delete snapshot",
     "deleteSnapshotDescription": "This action is permanent and cannot be recovered. Are you sure you want to delete '{0}'?"
+  },
+  "importVms": {
+    "selectSourceTooltipDesc": "No Trusted infrastructure Administrator"
   }
 }

package/assets/localization/local_hy.json

@@ -2539,6 +2539,9 @@
   "inventory": {
     "activeMemory": "Ակտիվ հիշողություն"
   },
+  "inventoryMonitor": {
+    "temperature": "Ջերմաստիճանը"
+  },
   "inventoryTabs": {
     "summary": "Ամփոփում",
     "monitor": "Մոնիտոր",
@@ -2561,5 +2564,8 @@
     "revertToSelectedSnapshot": "Վերադառնալ ընտրված Snap-ին",
     "deleteSnapshot": "Ջնջել նկարը",
     "deleteSnapshotDescription": "Այս գործողությունը մշտական է և չի կարող վերականգնվել: Համոզված եք, որ ցանկանում եք ջնջել '{0}'?"
+  },
+  "importVms": {
+    "selectSourceTooltipDesc": "Esxi օգտագործողի իրավունքները պետք է համապատասխանեն Administrator-ի դերերին"
   }
 }

package/assets/localization/local_kk.json

@@ -2538,6 +2538,9 @@
   "inventory": {
     "activeMemory": "Белсенді есте сақтау"
   },
+  "inventoryMonitor": {
+    "temperature": "Температура"
+  },
   "inventoryTabs": {
     "summary": "Түйіндеме",
     "monitor": "Монитор",
@@ -2560,5 +2563,8 @@
     "revertToSelectedSnapshot": "Таңдалған суретке оралу",
     "deleteSnapshot": "Суретті жою",
     "deleteSnapshotDescription": "Бұл әрекет тұрақты және оны қалпына келтіру мүмкін емес. Сіз жойғыңыз келетініне сенімдісіз '{0}'?"
+  },
+  "importVms": {
+    "selectSourceTooltipDesc": "Esxi пайдаланушы құқықтары әкімші рөлдеріне сәйкес келуі керек"
   }
 }

package/assets/localization/local_ru.json

@@ -2541,6 +2541,9 @@
   "inventory": {
     "activeMemory": "Активная память"
   },
+  "inventoryMonitor": {
+    "temperature": "Температура"
+  },
   "inventoryTabs": {
     "summary": "Сводка",
     "monitor": "Монитор",
@@ -2563,5 +2566,8 @@
     "revertToSelectedSnapshot": "Вернуться к выбранному снимку",
     "deleteSnapshot": "Удалить моментальный снимок",
     "deleteSnapshotDescription": "Это действие является постоянным и не может быть восстановлено. Вы уверены, что хотите удалить '{0}'?"
+  },
+  "importVms": {
+    "selectSourceTooltipDesc": "Права пользователя esxi дожны соответствовать ролям Administrator"
   }
 }

package/assets/localization/local_zh.json

@@ -2537,6 +2537,9 @@
   "inventory": {
     "activeMemory": "主动记忆"
   },
+  "inventoryMonitor": {
+    "temperature": "温度"
+  },
   "inventoryTabs": {
     "summary": "概括",
     "monitor": "监视器",
@@ -2559,5 +2562,8 @@
     "revertToSelectedSnapshot": "恢复到选定的快照",
     "deleteSnapshot": "删除快照",
     "deleteSnapshotDescription": "此操作是永久性的，无法恢复。 你确定你要删除 '{0}'?"
+  },
+  "importVms": {
+    "selectSourceTooltipDesc": "Esxi用户权限必须对应于管理员角色"
   }
 }

package/components/atoms/wizard/Wizard.vue

@@ -43,7 +43,12 @@
               <div
                 v-if="props.wizard.selectedStepCom.value.subTitle !== 'border'"
               >
-                <h2>{{ props.wizard.selectedStepCom.value.subTitle }}</h2>
+                <slot
+                  name="description"
+                  :selected-step="props.wizard.selectedStepCom.value"
+                >
+                  <h2>{{ props.wizard.selectedStepCom.value.subTitle }}</h2>
+                </slot>
               </div>
             </div>
             <slot
@@ -84,7 +89,10 @@
                 v-else
                 :id="`${props.testId}-next-button`"
                 :data-id="`${props.testId}-next-button`"
-                :disabled="props.isDisabledFinish || props.wizard.isDisabledNextButton.value"
+                :disabled="
+                  props.isDisabledFinish ||
+                  props.wizard.isDisabledNextButton.value
+                "
                 class="btn btn-primary"
                 @click="onNextStep"
               >

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/form/Form.vue

@@ -342,20 +342,20 @@ const periodTypeText = computed<string>(() => {
   const lang = useLocalStorage('lang')
 
   if (lang !== 'ru_RU') text = localization.value.common.last
-  else text = getCorrectPeriodTypeText(localLast.value)
+  else text = getCorrectRuPeriodTypeText(localLast.value)
 
   return text
 })
 
-const getCorrectPeriodTypeText = (hours: number): string => {
+const getCorrectRuPeriodTypeText = (hours: number): string => {
   let prefix: string
 
-  if (!hours) return getCorrectPeriodTypeText.prefix
+  if (!hours) return getCorrectRuPeriodTypeText.prefix
 
   if (hours % 10 === 1 && hours % 100 !== 11) prefix = 'Последний'
   else prefix = 'Последние'
 
-  getCorrectPeriodTypeText.prefix = prefix
+  getCorrectRuPeriodTypeText.prefix = prefix
   return prefix
 }
 

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_ArbitraryObject } from '~/lib/models/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
 
 export const timespanFunc = (
   localization: UI_I_Localization

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

@@ -37,60 +37,68 @@
 
     <common-pages-hardware-health-tools-panel :selected-tab="activeTab" />
 
-    <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
+      :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>
   </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_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_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 type { UI_T_HardwareHealthTabMode } from '~/components/common/pages/hardwareHealth/lib/models/types'
 import { hardwareHealthTabsFunc } from '~/components/common/pages/hardwareHealth/lib/config/tabsPannel'
 
 const props = defineProps<{
   data: UI_I_HardwareHealthSensors[]
   loading: boolean
-  historyTestimony: I_SeriesLine | null
-  loadingHistoryTestimony: boolean
+  historyTestimonyPower: I_SeriesLine | null
+  historyTestimonyTemperature: I_SeriesLine | null
+  loadingPowerData: boolean
+  loadingTemperatureData: boolean
   isDarkMode: boolean
   formattedDatetime: any
   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<UI_T_SelectedRow>([])
+const selectedRow = ref<number[]>([])
 
 const hardwareHealthTabs = computed<UI_I_CollapseNavItem[]>(() =>
   hardwareHealthTabsFunc(localization.value)
@@ -151,42 +159,10 @@ 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')
 })
@@ -206,5 +182,11 @@ onUnmounted(() => {
       margin-top: 0;
     }
   }
+  .bottom-container {
+    &.history-testimony {
+      overflow: hidden;
+      overflow-y: auto;
+    }
+  }
 }
 </style>

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

@@ -0,0 +1,331 @@
+<template>
+  <common-pages-hardware-health-history-testimony-tools
+    v-model:selected-timespan-type="selectedTimespanType"
+    :selected-chart-option-name="selectedChartOptionName"
+    :is-show-chart-modal="isShowChartModal"
+    :chart-title="props.powerData?.groupName || ''"
+    :selected-metric="selectedMetric"
+    :selected-power-counters-keys="selectedPowerCountersKeys"
+    :power-selected-rows-local="powerSelectedRowsLocal"
+    :selected-temperature-counters-keys="selectedTemperatureCountersKeys"
+    :temperature-selected-rows-local="temperatureSelectedRowsLocal"
+    :units-count="unitsCount"
+    :power-counters-table-data="powerCountersTableData"
+    :temperature-counters-table-data="temperatureCountersTableData"
+    :language="props.language"
+    :custom-date-from="customDateFrom"
+    :custom-date-to="customDateTo"
+    :custom-time-from="customTimeFrom"
+    :custom-time-to="customTimeTo"
+    :start-date="props.powerData?.pointStart || 0"
+    :period-type="tools.periodName"
+    @power-selected-rows-local="powerSelectedRowsLocal = $event"
+    @temperature-selected-rows-local="temperatureSelectedRowsLocal = $event"
+    @show-chart-modal="isShowChartModal = true"
+    @hide-chart-modal="isShowChartModal = false"
+    @update-tools="onUpdateTools"
+    @delete-option="onDeleteOption"
+    @submit-options="onSubmitOptions"
+  />
+  <div class="hardware-health-graph">
+    <div class="power-container">
+      <common-graph
+        v-if="powerDataLocal && !props.powerLoading"
+        :data="powerDataLocal"
+        :update="updatePowerHelper"
+        :chart="powerChart"
+        :selected-row="props.mainSelectedRow"
+      />
+      <div v-else-if="props.powerLoading" class="graphic-loader-block">
+        <div class="spinner"></div>
+      </div>
+      <div v-else class="empty-content"></div>
+    </div>
+    <div class="temperature-container">
+      <common-graph
+        v-if="temperatureDataLocal && !props.temperatureLoading"
+        :data="temperatureDataLocal"
+        :update="updateTemperatureHelper"
+        :chart="temperatureChart"
+        :selected-row="props.mainSelectedRow"
+      />
+      <div v-else-if="props.temperatureLoading" class="graphic-loader-block">
+        <div class="spinner"></div>
+      </div>
+      <div v-else class="empty-content"></div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { format } from 'date-fns'
+import type {
+  I_SeriesLine,
+  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_OptionsForm } from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Chart } from '~/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/lib/models/types'
+import type { UI_I_HardwareHealthSensors } from '~/components/common/pages/hardwareHealth/tableView/lib/models/interfaces'
+import type { UI_I_HardwareHealthSensorsGraph } from '~/components/common/pages/hardwareHealth/historyTestimony/lib/models/interfaces'
+import type { UI_I_SensorsGraphPayload } from '~/components/common/pages/hardwareHealth/historyTestimony/tools/lib/models/interfaces'
+
+const props = defineProps<{
+  powerData: I_SeriesLine | null
+  temperatureData: I_SeriesLine | null
+  countersTableData: UI_I_HardwareHealthSensors[]
+  language: string
+  powerLoading: boolean
+  temperatureLoading: boolean
+  formattedDatetime: any
+  isDarkMode: boolean
+  getDateFormat: any
+  mainSelectedRow: number[]
+}>()
+
+const emits = defineEmits<{
+  (event: 'update:selected-timespan-type', value: string): void
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const selectedChartOptionName = ref<string>('')
+const isShowChartModal = ref<boolean>(false)
+const selectedMetric = ref<UI_T_Chart>('power')
+const selectedPowerCountersKeys = ref<number[]>([])
+const selectedTemperatureCountersKeys = ref<number[]>([])
+const selectedTimespanType = ref<string>('')
+const customDateFrom = ref<string>('')
+const customDateTo = ref<string>('')
+const customTimeFrom = ref<string>('')
+const customTimeTo = ref<string>('')
+
+const unitsCount = ref<number>(0)
+const powerCountersTableData = ref<UI_I_HardwareHealthSensorsGraph[]>([])
+const temperatureCountersTableData = ref<UI_I_HardwareHealthSensorsGraph[]>([])
+const powerSelectedRowsLocal = ref<UI_I_HardwareHealthSensorsGraph[]>([])
+const temperatureSelectedRowsLocal = ref<UI_I_HardwareHealthSensorsGraph[]>([])
+
+watch(
+  () => props.countersTableData,
+  (newValue) => {
+    if (!newValue.length) return
+
+    powerCountersTableData.value = []
+    temperatureCountersTableData.value = []
+
+    newValue.forEach((item, key) => {
+      const newData: UI_I_HardwareHealthSensorsGraph = {
+        id: key,
+        name: item.name,
+        description: item.category,
+        measurement: '',
+        units: '',
+        nameEn: item.mainName || '',
+        testId: `counters-table-${item.name}-item`,
+      }
+      if (item.category.toLowerCase() === 'power')
+        powerCountersTableData.value.push(newData)
+      else if (item.category.toLowerCase() === 'temperature')
+        temperatureCountersTableData.value.push(newData)
+    })
+  },
+  { immediate: true, deep: true }
+)
+
+const selectAllCounters = (): void => {
+  if (!powerCountersTableData.value)
+    setTimeout(() => {
+      selectAllCounters()
+    }, 2000)
+  else {
+    powerCountersTableData.value.forEach((item) => {
+      selectedPowerCountersKeys.value.push(item.id)
+    })
+    temperatureCountersTableData.value.forEach((item) => {
+      selectedTemperatureCountersKeys.value.push(item.id)
+    })
+  }
+}
+
+onMounted(() => {
+  selectAllCounters()
+})
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const powerDataLocal = ref<I_LineGraph | null>(null)
+const temperatureDataLocal = ref<I_LineGraph | null>(null)
+const updatePowerHelper = ref<number>(0)
+const updateTemperatureHelper = ref<number>(0)
+let dateFormat = ''
+const powerChart = ref<any>(null)
+const temperatureChart = ref<any>(null)
+
+const powerChartCallback = (newValue: any): void => {
+  newValue && (powerChart.value = newValue)
+}
+
+const temperatureChartCallback = (newValue: any): void => {
+  newValue && (temperatureChart.value = newValue)
+}
+
+const updatePowerChart = (): void => {
+  if (!props.powerData) return
+
+  powerDataLocal.value = graphDataFunc(
+    props.powerData,
+    props.isDarkMode,
+    localization.value,
+    () => {},
+    false,
+    false,
+    true,
+    'spline',
+    '',
+    undefined,
+    powerChartCallback,
+    props.formattedDatetime,
+    format,
+    dateFormat
+  )
+
+  updatePowerHelper.value++
+}
+
+const updateTemperatureChart = (): void => {
+  if (!props.temperatureData) return
+
+  temperatureDataLocal.value = graphDataFunc(
+    props.temperatureData,
+    props.isDarkMode,
+    localization.value,
+    () => {},
+    false,
+    false,
+    true,
+    'spline',
+    '',
+    undefined,
+    temperatureChartCallback,
+    props.formattedDatetime,
+    format,
+    dateFormat
+  )
+
+  updateTemperatureHelper.value++
+}
+
+watch(
+  () => [props.powerData, props.isDarkMode, props.language],
+  (newValue) => {
+    dateFormat = props.getDateFormat(newValue[2])
+    updatePowerChart()
+  },
+  { immediate: true, deep: true }
+)
+
+watch(
+  () => [props.temperatureData, props.isDarkMode, props.language],
+  (newValue) => {
+    dateFormat = props.getDateFormat(newValue[2])
+    updateTemperatureChart()
+  },
+  { immediate: true, deep: true }
+)
+
+const updateSelectedCountersKeys = (metricType: string): void => {
+  if (metricType === 'power') {
+    const newKeys: number[] = []
+
+    powerSelectedRowsLocal.value.forEach((item) => {
+      newKeys.push(item.id)
+    })
+    selectedPowerCountersKeys.value = newKeys
+  } else if (metricType === 'temperature') {
+    const newKeys: number[] = []
+
+    temperatureSelectedRowsLocal.value.forEach((item) => {
+      newKeys.push(item.id)
+    })
+    selectedTemperatureCountersKeys.value = newKeys
+  }
+}
+
+const tools = {
+  periodName: 'real_time',
+  view: 'power',
+  metricType: selectedMetric.value,
+  period: [],
+}
+
+const onSubmitOptions = (data: UI_I_OptionsForm): void => {
+  updateSelectedCountersKeys(data.metric)
+  if (data.metric === 'power')
+    $store.dispatch(
+      'monitor/A_GET_HARDWARE_HEALTH_HISTORY_TESTIMONY_POWER',
+      data
+    )
+  if (data.metric === 'temperature')
+    $store.dispatch(
+      'monitor/A_GET_HARDWARE_HEALTH_HISTORY_TESTIMONY_TEMPERATURE',
+      data
+    )
+}
+
+const getAllMetrics = (): void => {
+  $store.dispatch(
+    'monitor/A_GET_HARDWARE_HEALTH_HISTORY_TESTIMONY_POWER',
+    tools
+  )
+  $store.dispatch(
+    'monitor/A_GET_HARDWARE_HEALTH_HISTORY_TESTIMONY_TEMPERATURE',
+    tools
+  )
+}
+
+const onUpdateTools = (data: UI_I_SensorsGraphPayload): void => {
+  const storageChartOptions = useLocalStorage(
+    data.view + 'ChartOptionsSensors',
+    undefined
+  )
+
+  selectedChartOptionName.value = ''
+
+  if (storageChartOptions) {
+    selectedChartOptionName.value = data.view
+  } else {
+    selectedMetric.value = 'power'
+  }
+
+  tools.periodName = data.periodName
+  tools.view = data.view
+  tools.period = data.period
+  tools.metricType = data.metricType || selectedMetric.value
+
+  getAllMetrics()
+}
+
+const onDeleteOption = (): void => {}
+</script>
+
+<style scoped lang="scss">
+.hardware-health-graph {
+  display: grid;
+  align-items: center;
+  grid-template-columns: 1fr 1fr;
+  grid-gap: 20px;
+
+  .graphic-loader-block {
+    height: inherit;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    min-height: 300px;
+  }
+  .empty-content {
+    height: inherit;
+  }
+}
+</style>

package/components/common/pages/hardwareHealth/historyTestimony/lib/models/interfaces.ts

@@ -0,0 +1,9 @@
+export interface UI_I_HardwareHealthSensorsGraph {
+  id: number
+  name: string
+  description: string
+  measurement: string
+  units: string
+  nameEn: string
+  testId: string
+}