bfg-common 1.3.589 → 1.3.591

package/components/common/monitor/advanced/tools/Tools.vue

@@ -97,6 +97,7 @@
     :language="props.language"
     :selected-counters-keys="props.selectedCountersKeys"
     :selected-metric="props.selectedMetric"
+    :selected-metric-local="props.selectedMetricLocal"
     :selected-chart-type="props.selectedChartType"
     :selected-timespan-type="props.selectedTimespanType"
     :units-count="props.unitsCount"
@@ -112,9 +113,10 @@
     :selected-objects="props.selectedObjects"
     :project="props.project"
     :objects-loading="props.objectsLoading"
+    :objects-data="props.objectsData"
     @hide="isShowModal = false"
     @select-row="emits('select-row', $event)"
-    @select-metric="emits('select-metric', $event)"
+    @select-metric-local="emits('select-metric-local', $event)"
     @update-chart-type="emits('update-chart-type', $event)"
     @update-timespan-type="emits('update-timespan-type', $event)"
     @update-unit-count="emits('update-unit-count', $event)"
@@ -127,7 +129,6 @@
     @update-custom-time-from="emits('update-custom-time-from', $event)"
     @update-custom-time-to="emits('update-custom-time-to', $event)"
     @submit-options="emits('submit-options', $event)"
-    @update-cores="emits('update-cores')"
   />
 </template>
 
@@ -143,6 +144,7 @@ import type {
 } from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/models/types'
 import type { UI_I_OptionsForm } from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/models/interfaces'
 import type { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/models/interfaces'
+import type { UI_I_ObjectItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import { getValidDateByOptionFunc } from '~/components/common/monitor/lib/config/getValidDateByOption'
 import {
@@ -160,6 +162,7 @@ const props = defineProps<{
   language: string
   selectedCountersKeys: number[]
   selectedMetric: UI_T_ChartHost | UI_T_ChartVm
+  selectedMetricLocal: UI_T_ChartHost | UI_T_ChartVm
   selectedChartType: string
   selectedTimespanType: string
   unitsCount: number
@@ -175,6 +178,7 @@ const props = defineProps<{
   selectedObjects: string
   project: UI_T_Project
   objectsLoading: boolean
+  objectsData: UI_I_ObjectItem[]
   disabledPeriod?: boolean
   disabledView?: boolean
 }>()
@@ -184,7 +188,7 @@ const emits = defineEmits<{
   (event: 'exporting', value: string): void
   (event: 'open-advanced-page'): void
   (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
-  (event: 'select-metric', value: string): void
+  (event: 'select-metric-local', value: string): void
   (event: 'update-chart-type', value: string): void
   (event: 'update-timespan-type', value: string): void
   (event: 'update-unit-count', value: number): void
@@ -197,7 +201,6 @@ const emits = defineEmits<{
   (event: 'update-custom-time-to', value: string): void
   (event: 'submit-options', value: UI_I_OptionsForm): void
   (event: 'update:selected-timespan-type', value: string): void
-  (event: 'update-cores'): void
 }>()
 
 const routeType = '' + useRoute().params.type

package/components/common/monitor/advanced/tools/chartOptionsModal/ChartOptionsModal.vue

@@ -49,6 +49,7 @@
               :selected-metrics-keys="selectedMetricsKeys"
               :selected-objects="props.selectedObjects"
               :objects-loading="props.objectsLoading"
+              :objects-data="props.objectsData"
               @select-row="selectedRows = $event"
               @update-chart-type="selectedChartTypeLocal = $event"
               @update-custom-time="localCustomTime = $event"
@@ -60,7 +61,6 @@
               @update-custom-time-from="onUpdateCustomTimeFrom"
               @update-custom-time-to="onUpdateCustomTimeTo"
               @select-objects="localSelectedObjects = $event"
-              @update-cores="emits('update-cores')"
             />
           </div>
         </div>
@@ -79,6 +79,7 @@ import type {
   UI_T_ChartVm,
 } from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/models/types'
 import type { UI_I_OptionsForm } from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/models/interfaces'
+import type { UI_I_ObjectItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import { metricsFunc } from '~/components/common/monitor/advanced/tools/chartOptionsModal/metrics/lib/config/optionsMetrics'
 import { getCurrentOptionsStorageFunc } from '~/components/common/monitor/advanced/tools/lib/config/advancedToolbar'
@@ -91,6 +92,7 @@ const props = defineProps<{
   language: string
   selectedCountersKeys: number[]
   selectedMetric: UI_T_ChartHost | UI_T_ChartVm
+  selectedMetricLocal: UI_T_ChartHost | UI_T_ChartVm
   selectedChartType: string
   selectedTimespanType: string
   unitsCount: number
@@ -106,12 +108,13 @@ const props = defineProps<{
   selectedObjects: string
   project: UI_T_Project
   objectsLoading: boolean
+  objectsData: UI_I_ObjectItem[]
 }>()
 
 const emits = defineEmits<{
   (event: 'hide'): void
   (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
-  (event: 'select-metric', value: string): void
+  (event: 'select-metric-local', value: string): void
   (event: 'update-chart-type', value: string): void
   (event: 'update-timespan-type', value: string): void
   (event: 'update-unit-count', value: number): void
@@ -125,7 +128,6 @@ const emits = defineEmits<{
   (event: 'update-custom-time-to', value: string): void
   (event: 'submit-options', value: UI_I_OptionsForm): void
   (event: 'select-objects', value: string): void
-  (event: 'update-cores'): void
 }>()
 
 const routeType = '' + useRoute().params.type
@@ -237,7 +239,12 @@ const checkValidations = (): boolean => {
     localCustomTimeTo.value
   )
 
-  if (!selectedRows.value.length) {
+  if (
+    (!selectedRows.value.length &&
+      !['disk', 'network'].includes(props.selectedMetricLocal)) ||
+    (!localSelectedObjects.value &&
+      ['disk', 'network'].includes(props.selectedMetricLocal))
+  ) {
     alerts.value = [localization.value.noCountersSelected]
     isShowAlerts.value = true
     return false
@@ -468,6 +475,14 @@ const isDisabledSubmit = computed<boolean>(() =>
   )
 )
 
+watch(
+  selectedMetric,
+  (newValue) => {
+    emits('select-metric-local', newValue)
+  },
+  { immediate: true }
+)
+
 onMounted(() => {
   optionsNames.value = getCurrentOptionsStorageFunc(routeType, props.project)
 })

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/Counters.vue

@@ -27,6 +27,7 @@
       :total-metric-items="totalMetricItems"
       :selected-objects="props.selectedObjects"
       :objects-loading="props.objectsLoading"
+      :objects-data="props.objectsData"
       @update-chart-type="emits('update-chart-type', $event)"
       @update-custom-time="emits('update-custom-time', $event)"
       @update-timespan-type="emits('update-timespan-type', $event)"
@@ -37,7 +38,6 @@
       @update-custom-time-from="emits('update-custom-time-from', $event)"
       @update-custom-time-to="emits('update-custom-time-to', $event)"
       @select-objects="emits('select-objects', $event)"
-      @update-cores="emits('update-cores')"
     />
   </div>
 </template>
@@ -49,6 +49,7 @@ import type {
 } from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/models/types'
 import type { UI_T_AdvancedType } from '~/components/common/monitor/advanced/lib/models/types'
 import type { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/models/interfaces'
+import type { UI_I_ObjectItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/lib/models/interfaces'
 
 const props = defineProps<{
   language: string
@@ -69,6 +70,7 @@ const props = defineProps<{
   selectedMetricsKeys: number[]
   selectedObjects: string
   objectsLoading: boolean
+  objectsData: UI_I_ObjectItem[]
 }>()
 
 const emits = defineEmits<{
@@ -83,7 +85,6 @@ const emits = defineEmits<{
   (event: 'update-custom-time-from', value: string): void
   (event: 'update-custom-time-to', value: string): void
   (event: 'select-objects', value: string): void
-  (event: 'update-cores'): void
 }>()
 
 const totalMetricItems = ref<number>(0)

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/Timespan.vue

@@ -30,8 +30,8 @@
       :total-metric-items="props.totalMetricItems"
       :selected-objects="props.selectedObjects"
       :loading="props.objectsLoading"
+      :current-items="props.objectsData"
       @select-objects="emits('select-objects', $event)"
-      @update-cores="emits('update-cores')"
     />
   </div>
 </template>
@@ -42,6 +42,7 @@ import type {
   UI_T_ChartHost,
   UI_T_ChartVm,
 } from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/models/types'
+import type { UI_I_ObjectItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/lib/models/interfaces'
 
 const props = defineProps<{
   type: UI_T_AdvancedType
@@ -62,6 +63,7 @@ const props = defineProps<{
   totalMetricItems: number
   selectedObjects: string
   objectsLoading: boolean
+  objectsData: UI_I_ObjectItem[]
 }>()
 
 const emits = defineEmits<{
@@ -76,7 +78,6 @@ const emits = defineEmits<{
   (event: 'update-custom-time-from', value: string): void
   (event: 'update-custom-time-to', value: string): void
   (event: 'select-objects', value: string): void
-  (event: 'update-cores'): void
 }>()
 </script>
 

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/Object.vue

@@ -10,7 +10,7 @@
           v-model:column-keys="columnItems"
           v-model:page-size="pagination.pageSize"
           v-model:page="pagination.page"
-          type="checkbox"
+          :type="tableType"
           class="data-table"
           test-id="object-table"
           :loading="props.loading"
@@ -35,7 +35,9 @@ import type {
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
+import type { UI_T_DataGridType } from '~/components/atoms/table/dataGrid/lib/models/types'
 import type { UI_I_AdvancedTargetObject } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/models/interfaces'
+import type { UI_I_ObjectItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/lib/models/interfaces'
 import * as table from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/lib/config/objectTable'
 import type { UI_T_AdvancedType } from '~/components/common/monitor/advanced/lib/models/types'
 import type {
@@ -52,16 +54,20 @@ const props = defineProps<{
   totalMetricItems: number
   selectedObjects: string
   loading: boolean
+  currentItems: UI_I_ObjectItem[]
 }>()
 
 const emits = defineEmits<{
   (event: 'select-objects', value: string): void
-  (event: 'update-cores'): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const selectedRow = ref<number[]>([])
+const tableType = computed<UI_T_DataGridType>(() =>
+  ['disk', 'network'].includes(props.chart) ? 'radio' : 'checkbox'
+)
+
+const selectedRow = ref<number[] | number>([])
 const pagination = ref<UI_I_Pagination>({
   page: 1,
   pageSize: 35,
@@ -101,6 +107,7 @@ watch(
     props.totalCores,
     props.hostId,
     props.selectedMetricsKeys,
+    props.currentItems,
   ],
   (newValue) => {
     items = []
@@ -141,10 +148,16 @@ watch(
           target_object: 'averageMHz',
         })
       }
-      bodyItems.value = table.bodyItems(items)
-    } else bodyItems.value = []
+    } else if (
+      newValue[0] === 'host' &&
+      ['disk', 'network'].includes(newValue[1])
+    ) {
+      items = props.currentItems
+    }
+
+    bodyItems.value = table.bodyItems(items)
   },
-  { immediate: true }
+  { immediate: true, deep: true }
 )
 
 watch(
@@ -152,9 +165,12 @@ watch(
   (newValue) => {
     const selectedItems: string[] = []
 
-    newValue.forEach((key) => {
-      selectedItems.push(items[key].id)
-    })
+    if (['disk', 'network'].includes(props.chart)) {
+      selectedItems.push(items[newValue]?.target_object)
+    } else
+      newValue.forEach((key) => {
+        selectedItems.push(items[key].id)
+      })
 
     const selectedNames =
       items.length === newValue.length &&
@@ -185,13 +201,19 @@ watch(
         })
         selectedRow.value = selectedKeys
       }
+    } else if (
+      props.type === 'host' &&
+      ['disk', 'network'].includes(props.chart)
+    ) {
+      if (selected) {
+        const selectedId = all.find((item) => item[0].text === selected)?.[0]
+          ?.id
+        typeof selectedId === 'number' && (selectedRow.value = selectedId)
+      }
     }
   },
   { immediate: true }
 )
-onMounted(() => {
-  emits('update-cores')
-})
 </script>
 
 <style scoped lang="scss">