bfg-common 1.1.105 → 1.1.106

package/components/atoms/table/info/models/interfaces.ts

@@ -3,4 +3,7 @@ export interface UI_I_TableInfoItem {
   value: any
   isProperty?: boolean
   key?: string
+  localization?: string
+  localizationTemplate?: string
+  isCapital?: boolean
 }

package/components/common/monitor/advanced/Advanced.vue

@@ -103,6 +103,7 @@ const props = defineProps<{
   type: UI_T_AdvancedType
   advancedLoading: boolean
   data: I_SeriesLine | null
+  cpuCoresDataData: I_SeriesLine | null
   tableData: UI_I_PerformanceItem[] | []
   language: string
   darkMode: boolean
@@ -160,7 +161,7 @@ const localSelectedTimespanType = computed<string>({
 const totalCores = ref<number>(0)
 let isFirstUpdate = true
 watch(
-  () => props.data,
+  () => props.cpuCoresDataData,
   (newValue) => {
     if (!newValue || !isFirstUpdate) return
 

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/config/utils.ts

@@ -633,11 +633,11 @@ export const countersItemsFunc = (
 }
 
 export const getDefaultMetricName = (type: string, view: string): string => {
+  const someNames = ['memory', 'disk', 'network']
+
   if (type === 'datacenter') return 'cpu'
-  else if (type === 'host') {
-    if (view === 'cpuUsageInPercent') return 'cpu'
-    return view
-  }
+  else if (view === 'cpuUsageInPercent') return 'cpu'
+  else if (someNames.includes(view)) return view
 
   return ''
 }

package/components/common/monitor/models/interfaces.ts

@@ -2,6 +2,7 @@ import { I_SeriesLine } from 'bfg-nuxt-3-graph/graph/models/interfaces'
 import { UI_T_OverviewRequestType } from '~/components/common/monitor/overview/filters/models/types'
 
 export interface UI_I_GraphDataSettingItem {
+  place: string
   title: string
   loader: boolean
   data: I_SeriesLine | null

package/components/common/monitor/overview/Overview.vue

@@ -104,6 +104,7 @@ const props = defineProps<{
   themeMode?: 'string'
   formatDate?: 'string'
   formatTime?: 'string'
+  graphType: 'string'
 }>()
 
 const { $formattedDatetime } = useNuxtApp()
@@ -129,11 +130,20 @@ const chartFour = ref<any>(null)
 const currentChartName = ref<string>('')
 
 const getCurrentChart = (chart: any): any => {
-  if (currentChartName.value === 'cpu' || currentChartName.value === 'space')
-    return (chartOne.value = chart)
-  if (currentChartName.value === 'memory') return (chartTwo.value = chart)
-  if (currentChartName.value === 'disk') return (chartThree.value = chart)
-  if (currentChartName.value === 'network') return (chartFour.value = chart)
+  switch (currentChartName.value) {
+    case 'one':
+      chartOne.value = chart
+      break
+    case 'two':
+      chartTwo.value = chart
+      break
+    case 'three':
+      chartThree.value = chart
+      break
+    case 'four':
+      chartFour.value = chart
+      break
+  }
 }
 
 const oneSettingsLocal = ref<UI_I_GraphDataSettingItem | null>(null)
@@ -164,7 +174,7 @@ const setCurrentGraphData = (
     false,
     true,
     true,
-    '',
+    props.graphType,
     '',
     width,
     getCurrentChart,
@@ -173,10 +183,21 @@ const setCurrentGraphData = (
     props.formatDate,
     props.formatTime
   )
-  if (name === 'cpu' || name === 'space') oneGraphData.value = graphData
-  if (name === 'memory') twoGraphData.value = graphData
-  if (name === 'disk') threeGraphData.value = graphData
-  if (name === 'network') fourGraphData.value = graphData
+
+  switch (name) {
+    case 'one':
+      oneGraphData.value = graphData
+      break
+    case 'two':
+      twoGraphData.value = graphData
+      break
+    case 'three':
+      threeGraphData.value = graphData
+      break
+    case 'four':
+      fourGraphData.value = graphData
+      break
+  }
 }
 
 const outputSize = (): void => {
@@ -197,7 +218,7 @@ const outputSize = (): void => {
   }, 1000)
 }
 const updateGraph = (
-  graphSetting: UI_I_GraphDataSettingItem,
+  graphSetting: UI_I_GraphDataSettingItem | null,
   name: string
 ): void => {
   outputSize()
@@ -205,10 +226,26 @@ const updateGraph = (
 }
 
 const updateGraphsData = (
-  data: UI_I_GraphDataSettingItem,
+  data: UI_I_GraphDataSettingItem | null,
   name: string
 ): void => {
-  if (!data.data) return
+  if (!data?.data) {
+    switch (name) {
+      case 'one':
+        oneGraphData.value = null
+        break
+      case 'two':
+        twoGraphData.value = null
+        break
+      case 'three':
+        threeGraphData.value = null
+        break
+      case 'four':
+        fourGraphData.value = null
+        break
+    }
+    return
+  }
 
   const themeMode = useLocalStorage('themeMode') || props.themeMode
   const isDarkMode = themeMode === 'dark-theme'
@@ -233,11 +270,12 @@ const checkIsMountedError = (): void => {
 
 watch(
   () => props.oneChart,
-  (value) => {
-    if (!value) return
+  (newValue) => {
+    if (newValue === undefined) return
+
+    oneSettingsLocal.value = newValue
 
-    oneSettingsLocal.value = value
-    updateGraph(oneSettingsLocal.value, value.title)
+    if (newValue) updateGraph(oneSettingsLocal.value, newValue.place)
 
     isMountedLoader.value && checkIsMountedError()
   },
@@ -246,11 +284,12 @@ watch(
 
 watch(
   () => props.twoChart,
-  (value) => {
-    if (!value) return
+  (newValue) => {
+    if (newValue === undefined) return
+
+    twoSettingsLocal.value = newValue
 
-    twoSettingsLocal.value = value
-    updateGraph(twoSettingsLocal.value, value.title)
+    if (newValue) updateGraph(twoSettingsLocal.value, newValue.place)
 
     isMountedLoader.value && checkIsMountedError()
   },
@@ -259,11 +298,12 @@ watch(
 
 watch(
   () => props.threeChart,
-  (value) => {
-    if (!value) return
+  (newValue) => {
+    if (newValue === undefined) return
 
-    threeSettingsLocal.value = value
-    updateGraph(threeSettingsLocal.value, value.title)
+    threeSettingsLocal.value = newValue
+
+    if (newValue) updateGraph(threeSettingsLocal.value, newValue.place)
 
     isMountedLoader.value && checkIsMountedError()
   },
@@ -290,11 +330,12 @@ watch(chartThree, (newValue) => {
 
 watch(
   () => props.fourChart,
-  (value) => {
-    if (!value) return
+  (newValue) => {
+    if (newValue === undefined) return
+
+    fourSettingsLocal.value = newValue
 
-    fourSettingsLocal.value = value
-    updateGraph(fourSettingsLocal.value, value.title)
+    if (newValue) updateGraph(fourSettingsLocal.value, newValue.place)
 
     isMountedLoader.value && checkIsMountedError()
   },

package/components/common/monitor/overview/filters/Filters.vue

@@ -38,7 +38,6 @@
             v-for="(item, index) in viewOptions"
             :key="index"
             :value="item.value"
-            disabled
           >
             {{ item.text }}
           </option>

package/components/common/monitor/overview/filters/config/filterOptions.ts

@@ -53,15 +53,17 @@ export const viewFunc = (
     ],
     host: [
       { text: localization.overview, value: 'overview' },
-      { text: localization.networkAdapters, value: 'network_adapters' },
+      { text: localization.memory, value: 'memory' },
+      // { text: localization.overview, value: 'overview' },
+      { text: localization.network, value: 'network' },
       { text: localization.disks, value: 'disks' },
-      { text: localization.virtual_machines, value: 'virtual_machines' },
+      // { text: localization.virtual_machines, value: 'virtual_machines' },
     ],
     vm: [
       { text: localization.overview, value: 'overview' },
-      { text: localization.space, value: 'space' },
-      { text: localization.spaceUtilization, value: 'space_utilization' },
-      { text: localization.networkAdapters, value: 'network_adapters' },
+      // { text: localization.space, value: 'space' },
+      // { text: localization.spaceUtilization, value: 'space_utilization' },
+      { text: localization.network, value: 'network' },
       { text: localization.disks, value: 'disks' },
     ],
   }

package/package.json

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