bfg-common 1.3.319 → 1.3.321

package/assets/localization/local_ru.json

@@ -819,7 +819,7 @@
   "lastWeek": "Прошлая неделя",
   "lastYear": "Прошлый год",
   "latest": "Самый последний",
-  "latinCpu": "CPU",
+  "latinCpu": "ЦПУ",
   "launchConsole": "Запустить консоль",
   "launchRemoteConsole": "ЗАПУСК УДАЛЕННОЙ КОНСОЛИ",
   "launchWebConsole": "ЗАПУСК ВЕБ-КОНСОЛИ",
@@ -2283,7 +2283,7 @@
   "alertsAndWarnings": "Оповещения и предупреждения",
   "systemEventLog": "Журнал системных событий",
   "resetEventLog": "Сбросить журнал событий",
-  "reading": "Чтение",
+  "reading": "Показания",
   "selEntries": "записи SEL",
   "lastUpdated": "Последнее обновление",
   "daily": "Ежедневно",

package/components/common/pages/hardwareHealth/tableView/TableView.vue

@@ -91,24 +91,11 @@ const headItems = computed<UI_I_HeadItem[]>(() =>
   table[props.tableMode].headItems(localization.value)
 )
 
-const bodyItems = ref<UI_I_BodyItem[][]>([])
-watch(
-  () => props.dataTable,
-  (newValue) => {
-    if (!newValue?.length) {
-      bodyItems.value = []
-      return
-    }
-
-    const tableData = ['sensor'].includes(props.tableMode) ? newValue : [] // TODO временно так
+const bodyItems = computed<UI_I_BodyItem[][]>(() => {
+  const tableData = ['sensor'].includes(props.tableMode) ? props.dataTable : [] // TODO временно так
 
-    bodyItems.value = table[props.tableMode].bodyItems(
-      tableData,
-      localization.value
-    )
-  },
-  { deep: true, immediate: true }
-)
+  return table[props.tableMode].bodyItems(tableData, localization.value)
+})
 </script>
 
 <style lang="scss" scoped>

package/components/common/pages/hardwareHealth/tableView/lib/config/sensorTable.ts

@@ -9,9 +9,12 @@ import {
   constructColumnKey,
 } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
 import type { UI_I_HardwareHealthSensors } from '~/components/common/pages/hardwareHealth/tableView/lib/models/interfaces'
-import { UI_E_SensorsIconByStatus } from '~/components/common/pages/hardwareHealth/tableView/lib/models/enums'
 import { UI_E_SensorsCategoryIcon } from '~/components/common/pages/hardwareHealth/lib/models/enums'
 import { hardwareHealthSensorTableKeys } from '~/components/common/pages/hardwareHealth/tableView/lib/config/tableKeys'
+import {
+  sensorsLocalizationByStatus,
+  sensorsIconByStatus,
+} from '~/components/common/pages/hardwareHealth/lib/config/status'
 
 const getItems = (
   localization: UI_I_Localization
@@ -56,7 +59,8 @@ export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
 }
 
 export const bodyItems = (
-  data: UI_I_HardwareHealthSensors[]
+  data: UI_I_HardwareHealthSensors[],
+  localization: UI_I_Localization
 ): UI_I_BodyItem[][] => {
   const bodyItems: UI_I_BodyItem[][] = []
   data.forEach((sensor: UI_I_HardwareHealthSensors, key) => {
@@ -79,10 +83,12 @@ export const bodyItems = (
       },
       {
         key: 'icon',
-        text: sensor[hardwareHealthSensorTableKeys[1]],
+        text: localization[
+          sensorsLocalizationByStatus[sensor[hardwareHealthSensorTableKeys[1]]]
+        ],
         id: key,
         data: {
-          iconClassName: UI_E_SensorsIconByStatus[sensor.status],
+          iconClassName: sensorsIconByStatus[sensor.status],
           isSprite: false,
         },
       },
@@ -101,7 +107,8 @@ export const bodyItems = (
         text: sensor[hardwareHealthSensorTableKeys[3]],
         id: key,
         data: {
-          iconClassName: UI_E_SensorsCategoryIcon[sensor.category.toLowerCase()],
+          iconClassName:
+            UI_E_SensorsCategoryIcon[sensor.category.toLowerCase()],
           isSprite: true,
         },
       },

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

@@ -4,7 +4,7 @@ interface UI_I_HardwareHealthEventEntries {
 }
 export interface UI_I_HardwareHealthSensors {
   name: string
-  status: 'Warning' | 'Alert' | 'Normal' | 'Unknown'
+  status: 0 | 1 | 2 | 3
   reading: string
   category: string
   lastUpdated: string

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.3.319",
+  "version": "1.3.321",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",

package/components/common/pages/hardwareHealth/tableView/lib/models/enums.ts

@@ -1,6 +0,0 @@
-export enum UI_E_SensorsIconByStatus {
-  Unknown = 'vsphere-icon-status-unknown',
-  Normal = 'success-circle',
-  Warning = 'warning-outline',
-  Alert = 'error-outline',
-}