bfg-common 1.0.29 → 1.0.31

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/Table.vue

@@ -5,7 +5,7 @@
     }}</span>
 
     <atoms-table-data-grid
-      v-model:selected-row="selectedCountersLocal"
+      v-model:selected-row="selectedCounters"
       v-model:column-keys="columnItems"
       v-model:page-size="pagination.pageSize"
       v-model:page="pagination.page"
@@ -15,12 +15,10 @@
       :body-items="bodyItems"
       :total-items="totalItems"
       :total-pages="totalPages"
-      :loading="props.loading"
       hide-footer
       server-off
       @change="onChangeRow"
-    >
-    </atoms-table-data-grid>
+    />
   </div>
 </template>
 
@@ -32,33 +30,47 @@ import {
 } from '~/components/atoms/table/dataGrid/models/interfaces'
 import { UI_I_Localization } from '~/models/interfaces'
 import * as table from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/config/tableConfig'
-import { UI_I_AdvancedTargetObject } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/models/interfaces'
+import { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/models/interfaces'
+import {
+  T_ChartHost,
+  T_ChartVm,
+} from '~/components/common/monitor/advanced/tools/chartOptionsModal/models/types'
+import { UI_T_AdvancedType } from '~/components/common/monitor/advanced/models/types'
+import { countersItemsFunc } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/config/utils'
 
 const props = defineProps<{
-  counters: any
-  loading: boolean
-  selectedCounters: number[]
+  chart: T_ChartHost | T_ChartVm
+  type: UI_T_AdvancedType
+  selectedKeys: number[]
 }>()
 
 const emits = defineEmits<{
-  (event: 'change', array: UI_I_AdvancedTargetObject[][]): void
-  (event: 'update:selected-counters', value: number[]): void
+  (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const totalItems = computed<number>(() => props.counters?.total_items || 0)
-const totalPages = computed<number>(() => props.counters?.total_pages || 1)
+const counters = computed<UI_I_AdvancedCounterItem[]>(() =>
+  countersItemsFunc(props.type, props.chart, localization.value)
+)
+
+const totalItems = computed<number>(() => counters.value.length)
+const totalPages = computed<number>(() => 1)
 
-// const selectedRow = ref<number[]>([])
-const selectedCountersLocal = computed<number[]>({
-  get() {
-    return props.selectedCounters
-  },
-  set(newValue) {
-    emits('update:selected-counters', newValue)
+const selectedCounters = ref<number[]>([])
+watch(
+  () => props.selectedKeys,
+  (newValue) => {
+    selectedCounters.value = newValue
   },
-})
+  { immediate: true, deep: true }
+)
+watch(
+  () => props.chart,
+  () => {
+    selectedCounters.value = []
+  }
+)
 const pagination = ref<any>({
   page: 1,
   pageSize: 35,
@@ -73,26 +85,23 @@ const headItems = computed<UI_I_HeadItem[]>(() =>
 const bodyItems = ref<UI_I_BodyItem[][]>([])
 
 watch(
-  () => props.counters,
-  (val) => {
-    if (!val.items) return
+  counters,
+  (newValue) => {
+    if (!newValue.length) return
 
-    bodyItems.value = table.bodyItems(val.items)
+    bodyItems.value = table.bodyItems(newValue)
   },
-  { deep: true }
+  { deep: true, immediate: true }
 )
 
 const onChangeRow = (val: number[]): void => {
-  let sendData: UI_I_AdvancedTargetObject[][] = []
-  if (!val.length) sendData = []
-  else {
-    val.forEach((index) => {
-      props.counters.items.forEach((item) => {
-        if (index === item.id) sendData.push(item.target_object)
-      })
-    })
-  }
-  emits('change', sendData)
+  const result: UI_I_AdvancedCounterItem[] = []
+
+  counters.value.forEach((item) => {
+    if (val.includes(item.id)) result.push(item)
+  })
+
+  emits('select-row', result)
 }
 </script>
 

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

@@ -12,28 +12,26 @@ import { UI_T_AdvancedCountersColumnKey } from '~/components/common/monitor/adva
 import { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/models/interfaces'
 
 export const countersTableKey: UI_T_AdvancedCountersColumnKey[] = [
-  'counters',
-  'rollups',
-  'units',
-  'internal_name',
-  'stat_type',
+  'name',
   'description',
+  'measurement',
+  'units',
 ]
 
 const getItems = (
   localization: UI_I_Localization
 ): [string, boolean, string, string][] => {
   return [
-    [localization.counters, true, '140px', countersTableKey[0]],
-    [localization.rollups, true, '140px', countersTableKey[1]],
-    [localization.units, true, '140px', countersTableKey[2]],
-    [localization.internalName, true, '140px', countersTableKey[3]],
-    [localization.statType, true, '140px', countersTableKey[4]],
-    [localization.description, true, '140px', countersTableKey[5]],
+    [localization.name, true, '140px', countersTableKey[0]],
+    [localization.description, true, '140px', countersTableKey[1]],
+    [localization.measurement, true, '140px', countersTableKey[2]],
+    [localization.units, true, '140px', countersTableKey[3]],
   ]
 }
 
-export const columnKeys = (localization: UI_I_Localization): UI_I_ColumnKey[] => {
+export const columnKeys = (
+  localization: UI_I_Localization
+): UI_I_ColumnKey[] => {
   const result: UI_I_ColumnKey[] = []
   getItems(localization).forEach((item, i) => {
     const col = `col${i + 1}`
@@ -52,7 +50,9 @@ export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
   return result
 }
 
-export const bodyItems = (counter: UI_I_AdvancedCounterItem[]): UI_I_BodyItem[][] => {
+export const bodyItems = (
+  counter: UI_I_AdvancedCounterItem[]
+): UI_I_BodyItem[][] => {
   const bodyItems: UI_I_BodyItem[][] = []
 
   counter.forEach((counters: UI_I_AdvancedCounterItem, key: number) => {
@@ -65,8 +65,6 @@ export const bodyItems = (counter: UI_I_AdvancedCounterItem[]): UI_I_BodyItem[][
       { key: 'col2', text: counters[countersTableKey[1]], id: key },
       { key: 'col3', text: counters[countersTableKey[2]], id: key },
       { key: 'col4', text: counters[countersTableKey[3]], id: key },
-      { key: 'col5', text: counters[countersTableKey[4]], id: key },
-      { key: 'col6', text: counters[countersTableKey[5]], id: key },
     ])
   })
   return bodyItems