bfg-common 1.4.493 → 1.4.495

package/assets/localization/local_be.json

@@ -2805,7 +2805,11 @@
     "coreMhzCount": "Ядро МГц ({0})",
     "memoryMetrics": "Метрыкі памяці",
     "networkMetrics": "Сеткавыя паказчыкі",
-    "diskMetrics": "Паказчыкі дыска"
+    "diskMetrics": "Паказчыкі дыска",
+    "vmCpuMetrics": "Метрыкі працэсара віртуальнай машыны",
+    "vmMemoryMetrics": "Метрыкі памяці віртуальнай машыны",
+    "vmNetworkMetrics": "Метрыкі сеткі віртуальнай машыны",
+    "vmDiskMetrics": "Метрыкі дыска віртуальнай машыны"
   },
   "remoteConsole": {
     "remoteConsoleSessions": "Аддаленыя сеансы кансолі",

package/assets/localization/local_en.json

@@ -2809,7 +2809,11 @@
     "coreMhzCount": "Core MHz ({0})",
     "memoryMetrics": "Memory Metrics",
     "networkMetrics": "Network Metrics",
-    "diskMetrics": "Disk Metrics"
+    "diskMetrics": "Disk Metrics",
+    "vmCpuMetrics": "VM CPU Metrics",
+    "vmMemoryMetrics": "VM Memory Metrics",
+    "vmNetworkMetrics": "VM Network Metrics",
+    "vmDiskMetrics": "VM Disk Metrics"
   },
   "remoteConsole": {
     "remoteConsoleSessions": "Remote Console Sessions",

package/assets/localization/local_hy.json

@@ -2809,7 +2809,11 @@
     "coreMhzCount": "Core MHz ({0})",
     "memoryMetrics": "Հիշողության չափումներ",
     "networkMetrics": "Ցանցի չափումներ",
-    "diskMetrics": "Սկավառակի չափումներ"
+    "diskMetrics": "Սկավառակի չափումներ",
+    "vmCpuMetrics": "VM CPU չափումներ",
+    "vmMemoryMetrics": "VM հիշողության չափումներ",
+    "vmNetworkMetrics": "VM ցանցի չափումներ",
+    "vmDiskMetrics": "VM սկավառակի չափումներ"
   },
   "remoteConsole": {
     "remoteConsoleSessions": "Վահանակի հեռավոր նստաշրջաններ",

package/assets/localization/local_kk.json

@@ -2808,7 +2808,11 @@
     "coreMhzCount": "Негізгі МГц ({0})",
     "memoryMetrics": "Жад көрсеткіштері",
     "networkMetrics": "Желілік көрсеткіштер",
-    "diskMetrics": "Диск Өлшемдері"
+    "diskMetrics": "Диск Өлшемдері",
+    "vmCpuMetrics": "VM CPU көрсеткіштері",
+    "vmMemoryMetrics": "VM жад көрсеткіштері",
+    "vmNetworkMetrics": "VM желілік көрсеткіштері",
+    "vmDiskMetrics": "VM дискінің көрсеткіштері"
   },
   "remoteConsole": {
     "remoteConsoleSessions": "Қашықтағы консоль сеанстары",

package/assets/localization/local_ru.json

@@ -2809,8 +2809,12 @@
     "coreCount": "Ядро ({0})",
     "coreMhzCount": "Ядро МГц ({0})",
     "memoryMetrics": "Показатели памяти",
-    "networkMetrics": "Сетевые показатели",
-    "diskMetrics": "Показатели диска"
+    "networkMetrics": "Показатели сети",
+    "diskMetrics": "Показатели диска",
+    "vmCpuMetrics": "Показатели ЦП виртуальной машины",
+    "vmMemoryMetrics": "Показатели памяти виртуальной машины",
+    "vmNetworkMetrics": "Показатели сети виртуальной машины",
+    "vmDiskMetrics": "Метрики диска виртуальной машины"
   },
   "remoteConsole": {
     "remoteConsoleSessions": "Сеансы удаленной консоли",

package/assets/localization/local_zh.json

@@ -2807,7 +2807,11 @@
     "coreMhzCount": "核心 MHz ({0})",
     "memoryMetrics": "内存指标",
     "networkMetrics": "网络指标",
-    "diskMetrics": "磁盘指标"
+    "diskMetrics": "磁盘指标",
+    "vmCpuMetrics": "虚拟机 CPU 指标",
+    "vmMemoryMetrics": "虚拟机内存指标",
+    "vmNetworkMetrics": "虚拟机网络指标",
+    "vmDiskMetrics": "虚拟机磁盘指标"
   },
   "remoteConsole": {
     "remoteConsoleSessions": "远程控制台会话",

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

@@ -1,23 +1,10 @@
-import type { UI_T_NodeType } from '~/components/common/home/lib/models/types'
+import type { UI_T_NodeType } from '~/components/common/pages/home/lib/models/types'
+import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
 
 export interface UI_I_ZoneList {
   name: string
   id: number
 }
-
-export interface UI_I_ResourceMeter<T = UI_I_MeterBlockItem> {
-  // TODO такой интерфасе есть (UI_I_Resources)
-  type: string
-  capacity?: T
-  free?: T
-  used?: T
-}
-
-export interface UI_I_MeterBlockItem {
-  value: number
-  text: string
-}
-
 export interface UI_I_Hosts {
   connected: number
   disconnected: number
@@ -47,7 +34,7 @@ export interface UI_I_Service {
 }
 
 export interface UI_I_HomeInfo {
-  resource_meter: UI_I_ResourceMeter<UI_I_MeterBlockItem>[]
+  resource_meter: UI_I_Resources[]
   hosts: UI_I_Hosts
   vms: UI_I_Vms
   alerts: UI_I_Alert[]

package/components/common/{home → pages/home}/lib/config/configResourceMeterBlock.ts

@@ -1,9 +1,5 @@
-import type {
-  UI_I_MeterBlockItem,
-  UI_I_ResourceMeter,
-} from '~/components/common/home/lib/models/interfaces'
-
-export const optionsDefault: UI_I_ResourceMeter<UI_I_MeterBlockItem>[] = [
+import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
+export const optionsDefault: UI_I_Resources[] = [
   {
     type: 'cpu',
     free: { text: '0', value: 0 },

package/components/common/{home → pages/home}/lib/models/types.ts

@@ -1,3 +1,5 @@
+// TODO наверно надо сделать глобално
+
 export type UI_T_NodeType =
   | 'zone'
   | 'folder'
@@ -8,11 +10,3 @@ export type UI_T_NodeType =
   | 'vm'
   | 'datastore'
   | 'network'
-
-export type UI_T_AlertColumnKeys = 'item' | 'alerts' | 'warnings'
-
-export type UI_T_ServiceColumnKeys =
-  | 'item'
-  | 'statusText'
-  | 'statusIcon'
-  | 'version'

package/components/common/pages/home/widgets/services/lib/config/config.ts

@@ -27,8 +27,8 @@ export const getHeaderDataFunc = (
   },
   {
     col: 1,
-    colName: 'alerts',
-    text: localization.common.alerts,
+    colName: 'status',
+    text: localization.common.status,
     isSortable: true,
     sort: 'asc',
     width: '33.3%',
@@ -37,8 +37,8 @@ export const getHeaderDataFunc = (
   },
   {
     col: 2,
-    colName: 'warnings',
-    text: localization.common.warnings,
+    colName: 'version',
+    text: localization.common.version,
     isSortable: true,
     sort: 'asc',
     width: '33.3%',

package/components/common/pages/home/widgets/services/table/lib/config/config.ts

@@ -4,10 +4,10 @@ import type {
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import { constructHeadItem } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
-import type { UI_T_ServiceColumnKeys } from '~/components/common/home/lib/models/types'
+import type { UI_T_ServiceTableKeysTuple } from '~/components/common/pages/home/widgets/services/table/lib/models/types'
 import type { UI_I_Service } from '~/components/common/home/lib/models/interfaces'
 
-export const servicesTableKeys: UI_T_ServiceColumnKeys[] = [
+export const servicesTableKeys: UI_T_ServiceTableKeysTuple = [
   'item',
   'statusText',
   'statusIcon',

package/components/common/pages/home/widgets/services/table/lib/models/types.ts

@@ -0,0 +1,6 @@
+export type UI_T_ServiceTableKeysTuple = [
+  'item',
+  'statusText',
+  'statusIcon',
+  'version'
+]

package/components/common/pages/home/widgets/warnings/WarningsNew.vue

@@ -71,7 +71,7 @@ watch(
   (newValue: UI_I_Alert[]) => {
     if (!newValue?.length) return
 
-    resentTaskBodyItems.value = getBodyDataFunc(newValue, localization.value)
+    resentTaskBodyItems.value = getBodyDataFunc(newValue)
   },
   { deep: true, immediate: true }
 )

package/components/common/pages/home/widgets/warnings/lib/config/config.ts

@@ -4,13 +4,9 @@ import type {
   UI_I_DataTableOptions,
   UI_I_DataTableHeader,
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
-import { UI_E_RecentTaskStatus } from '~/lib/models/store/tasks/enums'
+import type { UI_I_Alert } from '~/components/common/home/lib/models/interfaces'
+import { UI_E_TabsByTypeEnum } from '~/components/common/pages/home/widgets/warnings/table/lib/models/enums'
 import { E_NodeIconsByState } from '~/lib/models/enums'
-// import { E_TabsByType } from '~/components/templates/inventory/lib/models/enums'
-import {
-  E_RTaskChipColor,
-  E_RTaskStatusIcon,
-} from '~/components/common/pages/home/widgets/services/lib/models/enums'
 
 export const getHeaderDataFunc = (
   localization: UI_I_Localization
@@ -28,8 +24,9 @@ export const getHeaderDataFunc = (
   },
   {
     col: 1,
-    colName: 'status',
-    text: localization.common.status,
+    colName: 'alerts',
+    text: localization.common.alerts,
+
     isSortable: true,
     sort: 'asc',
     width: '33.3%',
@@ -38,8 +35,8 @@ export const getHeaderDataFunc = (
   },
   {
     col: 2,
-    colName: 'version',
-    text: localization.common.version,
+    colName: 'warnings',
+    text: localization.common.warnings,
     isSortable: true,
     sort: 'asc',
     width: '33.3%',
@@ -62,26 +59,17 @@ export const options: UI_I_DataTableOptions = {
 }
 
 export const getBodyDataFunc = (
-  bodyData: any,
-  localization: UI_I_Localization
+  bodyData: UI_I_Alert[]
 ): UI_I_DataTableBody[] => {
-  return bodyData.map((task, index: number) => {
-    const iconClassName = E_NodeIconsByState[`${task.targetType}_Normal`]
-    const id = task.extra?.created_id || task.target
+  return bodyData.map((alert, index: number) => {
+    const iconClassName = E_NodeIconsByState[`${alert.type}_Normal`]
     const targetData = {
-      id,
+      id: alert.id,
       icon: iconClassName,
-      // nav: E_TabsByType[task.targetType],
-      type: task.targetType,
+      nav: UI_E_TabsByTypeEnum[alert.type],
+      type: alert.type,
       isLink: true,
-      testId: `${task.targetType}-item`,
-    }
-
-    const statusData = {
-      icon: E_RTaskStatusIcon[task.status],
-      chipColor: E_RTaskChipColor[task.status],
-      error: task.error,
-      testId: `${task.taskName}-progress`,
+      testId: `${alert.type}-item`,
     }
 
     return {
@@ -90,18 +78,14 @@ export const getBodyDataFunc = (
       isHiddenCollapse: false,
       collapseToggle: false,
       data: [
-        { col: 0, text: task.taskName },
+        { key: 'icon', col: 0, text: alert.item, data: targetData },
         {
-          key: 'icon',
           col: 1,
-          text: task.target,
-          data: targetData,
+          text: alert.alerts + '',
         },
         {
-          key: 'status',
           col: 2,
-          text: localization.common[UI_E_RecentTaskStatus[task.status]],
-          data: statusData,
+          text: alert.warnings + '',
         },
       ],
     }

package/components/common/pages/home/widgets/warnings/table/lib/config/config.ts

@@ -3,13 +3,13 @@ import type {
   UI_I_BodyItem,
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_AlertColumnKeys } from '~/components/common/home/lib/models/types'
 import type { UI_I_Alert } from '~/components/common/home/lib/models/interfaces'
+import { UI_T_WarningsTableKeysTuple } from '~/components/common/pages/home/widgets/warnings/table/lib/models/types'
 import type { UI_I_AlertData } from '~/components/common/pages/home/widgets/warnings/table/lib/models/interfaces'
 import { UI_E_TabsByTypeEnum } from '~/components/common/pages/home/widgets/warnings/table/lib/models/enums'
 import { constructHeadItem } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
 
-export const alertsTableKeys: UI_T_AlertColumnKeys[] = [
+export const alertsTableKeys: UI_T_WarningsTableKeysTuple = [
   'item',
   'alerts',
   'warnings',

package/components/common/pages/home/widgets/warnings/table/lib/models/types.ts

@@ -11,3 +11,5 @@ export type UI_T_InventoryAllTreeName =
   | UI_T_InventoryTreeName
   | 'folderTree'
   | 'computeResourceTree'
+
+export type UI_T_WarningsTableKeysTuple = ['item', 'alerts', 'warnings']

package/package.json

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