bfg-common 1.6.90 → 1.6.92

package/components/common/monitor/utilization/Utilization.vue

@@ -13,6 +13,7 @@ import type {
   UI_I_UtilizationDataItem,
 } from '~/components/common/monitor/utilization/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { T_NodeType } from '~/components/templates/inventory/lib/models/types'
 import { constructApiData } from '~/components/common/monitor/utilization/lib/utils'
 
 const props = defineProps<{
@@ -22,6 +23,10 @@ const props = defineProps<{
 
 const { $store }: any = useNuxtApp()
 
+const routeType = computed<T_NodeType>(
+  () => useRoute().params.type.toString() as T_NodeType
+)
+
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const currentComponent = computed(() =>
@@ -40,7 +45,8 @@ watch(
     if (props.apiData) {
       constructedData.value = constructApiData(
         props.apiData,
-        localization.value
+        localization.value,
+        routeType.value
       )
     }
   },

package/components/common/monitor/utilization/lib/utils/index.ts

@@ -3,7 +3,7 @@ import type {
   UI_I_UtilizationDataItem,
 } from '~/components/common/monitor/utilization/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_E_UtilizationBlockCurrentKeys } from '~/components/common/monitor/utilization/lib/models/enums'
+import type { T_NodeType } from '~/components/templates/inventory/lib/models/types'
 import { getMetricsLocalizationByKey } from '~/components/common/monitor/lib/utils/localization'
 
 const currentColorKey = (value: string): string => {
@@ -29,9 +29,30 @@ const currentColorKey = (value: string): string => {
   return result
 }
 
+const currentTitle = (
+  routeType: T_NodeType,
+  currentType: string,
+  localization: UI_I_Localization
+): string => {
+  let result: string = ''
+
+  if (routeType === 'host') {
+    if (currentType === 'cpu') result = localization.common.hostCpu
+    if (currentType === 'memory') result = localization.common.hostMem
+  } else if (routeType === 'vm') {
+    if (currentType === 'cpu')
+      result = localization.inventoryMonitor.virtualMachineCpu
+    if (currentType === 'memory')
+      result = localization.inventoryMonitor.virtualMachineMemory
+  }
+
+  return result
+}
+
 export const constructApiData = (
   apiData: API_UI_I_UtilizationData | null,
-  localization: UI_I_Localization
+  localization: UI_I_Localization,
+  routeType: T_NodeType
 ): UI_I_UtilizationDataItem[] => {
   if (!apiData) return []
 
@@ -49,7 +70,7 @@ export const constructApiData = (
     result.push({
       isShow,
       id: key,
-      title: localization.common[UI_E_UtilizationBlockCurrentKeys[key]] || key,
+      title: currentTitle(routeType, currentType, localization) || key,
       type: currentType,
       data: apiData[key].items.map((item) => {
         const color = ![

package/lib/models/interfaces.ts

@@ -68,6 +68,7 @@ export interface UI_I_Localization {
   packages: UI_I_ArbitraryObject<string>
   dhcpServer: UI_I_ArbitraryObject<string>
   logs: UI_I_ArbitraryObject<string>
+  timeConfiguration: UI_I_ArbitraryObject<string>
 }
 export interface UI_I_SendTaskParams {
   method: string

package/package.json

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

package/components/common/monitor/utilization/lib/models/enums.ts

@@ -1,4 +0,0 @@
-export enum UI_E_UtilizationBlockCurrentKeys {
-  cpuUtilization = 'hostCpu',
-  hostMemoryUtilization = 'hostMem',
-}