bfg-common 1.6.95 → 1.6.97

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

@@ -33,12 +33,13 @@
             :custom-time-to="props.customTimeTo"
             :total-cores="props.totalCores"
             :host-id="props.hostId"
-            :selected-objects="props.selectedObjects"
             :project="props.project"
             :objects-loading="props.objectsLoading"
             :objects-data="props.objectsData"
             :valid-date-end="props.validDateEnd"
             :format-date="props.formatDate"
+            :power-data="props.powerData"
+            :temperature-data="props.temperatureData"
             @update-tools="emits('update-tools', $event)"
             @exporting="emits('export-graph', $event)"
             @open-advanced-page="emits('open-advanced-page')"
@@ -53,7 +54,10 @@
             @submit-options="emits('submit-options', $event)"
           />
 
-          <div v-show="!props.data && !props.advancedLoading" class="empty-container">
+          <div
+            v-show="!props.data && !props.advancedLoading"
+            class="empty-container"
+          >
             {{
               localization.inventoryMonitor
                 .noPerformanceCurrentlySelectedMetrics
@@ -124,13 +128,14 @@ const props = withDefaults(
     customTimeTo: string
     totalCores: number
     hostId: string
-    selectedObjects: string
     project: UI_T_Project
     objectsLoading: boolean
     objectsData: UI_I_ObjectItem[]
     validDateEnd: number
     formatDate: string
     selectedTableRow: number[]
+    powerData: UI_I_AdvancedCounterItem[]
+    temperatureData: UI_I_AdvancedCounterItem[]
     disabledPeriod?: boolean
     disabledView?: boolean
     isEmpty?: boolean

package/components/common/monitor/advanced/table/lib/models/interfaces.ts

@@ -9,4 +9,5 @@ export interface UI_I_PerformanceItem {
   average: number
   relatedDeviceName: string
   rollupType: string
+  description: string
 }

package/components/common/monitor/advanced/table/lib/models/types.ts

@@ -1,10 +1,7 @@
 export type UI_T_PerformanceColumnKey =
   | 'key'
   | 'relatedDeviceName'
-  | 'measurement'
-  | 'rollupType'
+  | 'description'
   | 'units'
-  | 'latest'
   | 'maximum'
   | 'minimum'
-  | 'average'

package/components/common/monitor/advanced/table/tableNew/TableNew.vue

@@ -20,6 +20,7 @@
           <span>{{ item.text }}</span>
         </span>
       </template>
+      <template #default-actions></template>
     </ui-data-table>
   </div>
 </template>

package/components/common/monitor/advanced/table/tableNew/lib/config/options.ts

@@ -11,7 +11,7 @@ export const bodyOptions = (
   const currentBody = constructUsersAndGroupsTableItems(items)
 
   return {
-    id: 'find-user-or-group-modal-table-config',
+    id: 'advanced-main-table-config',
     title: `${localization.inventoryMonitor.performanceChartLegend} (${items.length})`,
     selectedRows: [],
     isAllSelected: false,
@@ -19,7 +19,7 @@ export const bodyOptions = (
       {
         col: 'col0',
         colName: 'key',
-        text: localization.common.key,
+        text: localization.inventoryMonitor.chartColor,
         width: '96px',
         isSortable: false,
         sort: 'asc',
@@ -29,7 +29,7 @@ export const bodyOptions = (
       {
         col: 'col1',
         colName: 'object',
-        text: localization.common.object,
+        text: localization.inventoryMonitor.metricName,
         width: '150px',
         isSortable: true,
         sort: 'asc',
@@ -39,7 +39,7 @@ export const bodyOptions = (
       {
         col: 'col2',
         colName: 'measurement',
-        text: localization.common.measurement,
+        text: localization.inventoryMonitor.metricDescription,
         width: '192px',
         isSortable: true,
         sort: 'asc',
@@ -48,18 +48,8 @@ export const bodyOptions = (
       },
       {
         col: 'col3',
-        colName: 'rollup',
-        text: localization.common.rollup,
-        width: '150px',
-        isSortable: true,
-        sort: 'asc',
-        show: true,
-        filter: true,
-      },
-      {
-        col: 'col4',
         colName: 'units',
-        text: localization.common.units,
+        text: localization.inventoryMonitor.unitOfMeasurement,
         width: '150px',
         isSortable: true,
         sort: 'asc',
@@ -67,17 +57,7 @@ export const bodyOptions = (
         filter: true,
       },
       {
-        col: 'col5',
-        colName: 'latest',
-        text: localization.common.latest,
-        width: '150px',
-        isSortable: true,
-        sort: 'asc',
-        show: true,
-        filter: true,
-      },
-      {
-        col: 'col6',
+        col: 'col4',
         colName: 'maximum',
         text: localization.common.maximum,
         width: '150px',
@@ -87,7 +67,7 @@ export const bodyOptions = (
         filter: true,
       },
       {
-        col: 'col7',
+        col: 'col5',
         colName: 'minimum',
         text: localization.common.minimum,
         width: '150px',
@@ -97,17 +77,7 @@ export const bodyOptions = (
         filter: true,
       },
       {
-        col: 'col8',
-        colName: 'average',
-        text: localization.common.average,
-        width: '150px',
-        isSortable: true,
-        sort: 'asc',
-        show: true,
-        filter: true,
-      },
-      {
-        col: 'col9',
+        col: 'default-actions',
         colName: 'default-actions',
         text: '',
         show: true,

package/components/common/monitor/advanced/table/tableNew/lib/utils/constructBody.ts

@@ -12,13 +12,11 @@ export const constructUsersAndGroupsTableItems = (
       data: [
         { col: 'col0', key: 'icon', text: '', data: { color: item.key } },
         { col: 'col1', key: 'zone', text: item.relatedDeviceName },
-        { col: 'col2', text: item.measurement },
-        { col: 'col3', text: item.rollupType },
-        { col: 'col4', text: item.units },
-        { col: 'col5', text: String(item.latest) },
-        { col: 'col6', text: String(item.maximum) },
-        { col: 'col7', text: String(item.minimum) },
-        { col: 'col8', text: String(item.average) },
+        { col: 'col2', text: item.description },
+        { col: 'col3', text: item.units },
+        { col: 'col4', text: String(item.maximum) },
+        { col: 'col5', text: String(item.minimum) },
+        { col: 'default-actions', key: 'default-actions', text: '', data: {} },
       ],
     })
   })

package/components/common/monitor/advanced/table/tableOld/lib/config/performanceDatatable.ts

@@ -14,13 +14,10 @@ import {
 export const performanceTableKey: UI_T_PerformanceColumnKey[] = [
   'key',
   'relatedDeviceName',
-  'measurement',
-  'rollupType',
+  'description',
   'units',
-  'latest',
   'maximum',
   'minimum',
-  'average',
 ]
 
 const getItems = (
@@ -28,15 +25,32 @@ const getItems = (
 ): [string, boolean, string, string][] => {
   const widthCol = '113px'
   return [
-    [localization.common.key, true, widthCol, performanceTableKey[0]],
-    [localization.common.object, true, widthCol, performanceTableKey[1]],
-    [localization.common.measurement, true, widthCol, performanceTableKey[2]],
-    [localization.common.rollup, true, widthCol, performanceTableKey[3]],
-    [localization.common.units, true, widthCol, performanceTableKey[4]],
-    [localization.common.latest, true, widthCol, performanceTableKey[5]],
-    [localization.common.maximum, true, widthCol, performanceTableKey[6]],
-    [localization.common.minimum, true, widthCol, performanceTableKey[7]],
-    [localization.common.average, true, widthCol, performanceTableKey[8]],
+    [
+      localization.inventoryMonitor.chartColor,
+      true,
+      widthCol,
+      performanceTableKey[0],
+    ],
+    [
+      localization.inventoryMonitor.metricName,
+      true,
+      widthCol,
+      performanceTableKey[1],
+    ],
+    [
+      localization.inventoryMonitor.metricDescription,
+      true,
+      widthCol,
+      performanceTableKey[2],
+    ],
+    [
+      localization.inventoryMonitor.unitOfMeasurement,
+      true,
+      widthCol,
+      performanceTableKey[3],
+    ],
+    [localization.common.maximum, true, widthCol, performanceTableKey[4]],
+    [localization.common.minimum, true, widthCol, performanceTableKey[5]],
   ]
 }
 
@@ -105,24 +119,6 @@ export const bodyItems = (data: UI_I_PerformanceItem[]): UI_I_BodyItem[][] => {
         id: key,
         testId: `advanced-item-${performanceTableKey[5]}-${key}`,
       },
-      {
-        key: 'col7',
-        text: performance[performanceTableKey[6]],
-        id: key,
-        testId: `advanced-item-${performanceTableKey[6]}-${key}`,
-      },
-      {
-        key: 'col8',
-        text: performance[performanceTableKey[7]],
-        id: key,
-        testId: `advanced-item-${performanceTableKey[7]}-${key}`,
-      },
-      {
-        key: 'col9',
-        text: performance[performanceTableKey[8]],
-        id: key,
-        testId: `advanced-item-${performanceTableKey[8]}-${key}`,
-      },
     ])
   })
   return bodyItems

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

@@ -23,7 +23,6 @@
     :custom-time-to="props.customTimeTo"
     :total-cores="totalCores"
     :host-id="props.hostId"
-    :selected-objects="props.selectedObjects"
     :project="props.project"
     :objects-loading="props.objectsLoading"
     :objects-data="props.objectsData"
@@ -32,6 +31,8 @@
     :view-options="viewOptions"
     :period-options="periodOptions"
     :selected-node-name="props.selectedNodeName"
+    :power-data="props.powerData"
+    :temperature-data="props.temperatureData"
     @save-option-name="onSaveOptionName"
     @change-period="updateTools"
     @change-view="updateTools"
@@ -70,7 +71,6 @@
     :custom-time-to="props.customTimeTo"
     :total-cores="totalCores"
     :host-id="props.hostId"
-    :selected-objects="props.selectedObjects"
     :project="props.project"
     :objects-loading="props.objectsLoading"
     :objects-data="props.objectsData"
@@ -78,6 +78,8 @@
     :format-date="props.formatDate"
     :view-options="viewOptions"
     :period-options="periodOptions"
+    :power-data="props.powerData"
+    :temperature-data="props.temperatureData"
     @save-option-name="onSaveOptionName"
     @change-period="updateTools"
     @change-view="updateTools"
@@ -112,6 +114,7 @@ import {
   getCurrentOptionsStorageFunc,
   periodFunc,
   viewFunc,
+  getSelectedOptionsValueFromStorageFunc,
 } from '~/components/common/monitor/advanced/tools/lib/config/advancedToolbar'
 import { getValidDateByOptionFunc } from '~/components/common/monitor/lib/config/getValidDateByOption'
 import { checkDateFunc } from '~/components/common/monitor/overview/filters/customIntervalModal/lib/config/dateChecker'
@@ -137,12 +140,13 @@ const props = withDefaults(
     customTimeTo: string
     totalCores: number
     hostId: string
-    selectedObjects: string
     project: UI_T_Project
     objectsLoading: boolean
     objectsData: UI_I_ObjectItem[]
     validDateEnd: number
     formatDate: string
+    powerData: UI_I_AdvancedCounterItem[]
+    temperatureData: UI_I_AdvancedCounterItem[]
     disabledPeriod?: boolean
     disabledView?: boolean
     selectedNodeName?: string
@@ -193,7 +197,7 @@ const localSelectedTimespanType = computed<string>({
 
 const optionsNames = ref<string[]>([])
 const viewOptions = computed<UI_I_OptionItem[]>(() =>
-  viewFunc(localization.value, props.type, optionsNames.value)
+  viewFunc(localization.value, props.type, optionsNames.value, props.project)
 )
 
 const selectedView = ref<string>('')
@@ -231,11 +235,10 @@ const selectedPeriod = computed<string>({
 const updateTools = (): void => {
   const periodValue = localSelectedTimespanType.value
   const viewValue = selectedView.value
-  const prefix = props.project === 'sphere'
-  const selectedValue = useLocalStorage(
-    viewValue + 'ChartOptions',
-    undefined,
-    prefix
+
+  const selectedValue = getSelectedOptionsValueFromStorageFunc(
+    viewValue,
+    props.project
   )
 
   const fields = selectedValue
@@ -275,7 +278,8 @@ const updateTools = (): void => {
     periodType: periodValue,
     view: viewValue,
   }
-  if (selectedValue.metric) tools.metricType = selectedValue.metric
+  if (selectedValue && selectedValue.metric)
+    tools.metricType = selectedValue.metric
 
   emits('update-timespan-type', localSelectedTimespanType.value)
   emits('update-tools', tools)
@@ -291,11 +295,11 @@ const chartTitleDate = computed<string>(() => {
 
 const onDeleteOption = (): void => {
   emits('delete-option')
-  optionsNames.value = getCurrentOptionsStorageFunc(routeType, props.project)
+  optionsNames.value = getCurrentOptionsStorageFunc(props.project)
 }
 
 const onSaveOptionName = (): void => {
-  optionsNames.value = getCurrentOptionsStorageFunc(routeType, props.project)
+  optionsNames.value = getCurrentOptionsStorageFunc(props.project)
 }
 
 const isShowModal = ref<boolean>()
@@ -305,7 +309,7 @@ watch(isShowModal, (newValue) => {
 })
 
 onMounted(() => {
-  optionsNames.value = getCurrentOptionsStorageFunc(routeType, props.project)
+  optionsNames.value = getCurrentOptionsStorageFunc(props.project)
   updateTools()
 })
 </script>

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

@@ -67,13 +67,14 @@
     :custom-time-to="props.customTimeTo"
     :total-cores="props.totalCores"
     :host-id="props.hostId"
-    :selected-objects="props.selectedObjects"
     :project="props.project"
     :objects-loading="props.objectsLoading"
     :objects-data="props.objectsData"
     :valid-date-end="props.validDateEnd"
     :format-date="props.formatDate"
     :selected-node-name="props.selectedNodeName"
+    :power-data="props.powerData"
+    :temperature-data="props.temperatureData"
     @hide="isShowModalLocal = false"
     @select-row="emits('select-row', $event)"
     @select-metric-local="emits('select-metric-local', $event)"
@@ -120,7 +121,6 @@ const props = withDefaults(
     customTimeTo: string
     totalCores: number
     hostId: string
-    selectedObjects: string
     project: UI_T_Project
     objectsLoading: boolean
     objectsData: UI_I_ObjectItem[]
@@ -128,6 +128,8 @@ const props = withDefaults(
     formatDate: string
     viewOptions: UI_I_OptionItem[]
     periodOptions: UI_I_OptionItem[]
+    powerData: UI_I_AdvancedCounterItem[]
+    temperatureData: UI_I_AdvancedCounterItem[]
     disabledPeriod?: boolean
     disabledView?: boolean
     selectedNodeName?: string

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

@@ -112,12 +112,13 @@
     :custom-time-to="props.customTimeTo"
     :total-cores="props.totalCores"
     :host-id="props.hostId"
-    :selected-objects="props.selectedObjects"
     :project="props.project"
     :objects-loading="props.objectsLoading"
     :objects-data="props.objectsData"
     :valid-date-end="props.validDateEnd"
     :format-date="props.formatDate"
+    :power-data="props.powerData"
+    :temperature-data="props.temperatureData"
     @hide="isShowModalLocal = false"
     @select-row="emits('select-row', $event)"
     @select-metric-local="emits('select-metric-local', $event)"
@@ -167,7 +168,6 @@ const props = withDefaults(
     customTimeTo: string
     totalCores: number
     hostId: string
-    selectedObjects: string
     project: UI_T_Project
     objectsLoading: boolean
     objectsData: UI_I_ObjectItem[]
@@ -175,6 +175,8 @@ const props = withDefaults(
     formatDate: string
     viewOptions: UI_I_OptionItem[]
     periodOptions: UI_I_OptionItem[]
+    powerData: UI_I_AdvancedCounterItem[]
+    temperatureData: UI_I_AdvancedCounterItem[]
     disabledPeriod?: boolean
     disabledView?: boolean
   }>(),

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

@@ -18,7 +18,6 @@
     :custom-time-to="props.customTimeTo"
     :total-cores="props.totalCores"
     :hostId="props.hostId"
-    :selected-objects="props.selectedObjects"
     :objects-loading="props.objectsLoading"
     :objects-data="props.objectsData"
     :valid-date-end="props.validDateEnd"
@@ -37,6 +36,10 @@
     :error-date-to="errorDateTo"
     :error-time-to="errorTimeTo"
     :selected-node-name="props.selectedNodeName"
+    :project="props.project"
+    :power-data="props.powerData"
+    :temperature-data="props.temperatureData"
+    :current-selected-objects="localSelectedObjects"
     @hide-main-modal="onHideMainModal"
     @submit-main-modal="onSubmitMainModal"
     @remove-alerts="onRemoveAlerts"
@@ -69,7 +72,6 @@
     :custom-time-to="props.customTimeTo"
     :total-cores="props.totalCores"
     :hostId="props.hostId"
-    :selected-objects="props.selectedObjects"
     :objects-loading="props.objectsLoading"
     :objects-data="props.objectsData"
     :valid-date-end="props.validDateEnd"
@@ -82,6 +84,10 @@
     :local-selected-timespan-type="localSelectedTimespanType"
     :local-units-count="localUnitsCount"
     :selected-metrics-keys="selectedMetricsKeys"
+    :project="props.project"
+    :power-data="props.powerData"
+    :temperature-data="props.temperatureData"
+    :current-selected-objects="localSelectedObjects"
     @hide-main-modal="onHideMainModal"
     @submit-main-modal="onSubmitMainModal"
     @remove-alerts="onRemoveAlerts"
@@ -110,7 +116,11 @@ import type { UI_I_OptionsForm } from '~/components/common/monitor/advanced/tool
 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'
+import {
+  getCurrentOptionsStorageFunc,
+  removeSelectedOptionsFromStorageFunc,
+  getSelectedOptionsValueFromStorageFunc,
+} from '~/components/common/monitor/advanced/tools/lib/config/advancedToolbar'
 import { checkDateFunc } from '~/components/common/monitor/overview/filters/customIntervalModal/lib/config/dateChecker'
 import { getValidDateByOptionFunc } from '~/components/common/monitor/lib/config/getValidDateByOption'
 import { checkIsDisabledSubmit } from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/utils/checkSubmit'
@@ -133,12 +143,13 @@ const props = withDefaults(
     customTimeTo: string
     totalCores: number
     hostId: string
-    selectedObjects: string
     project: UI_T_Project
     objectsLoading: boolean
     objectsData: UI_I_ObjectItem[]
     validDateEnd: number
     formatDate: string
+    powerData: UI_I_AdvancedCounterItem[]
+    temperatureData: UI_I_AdvancedCounterItem[]
     selectedNodeName?: string
   }>(),
   {
@@ -166,6 +177,7 @@ const { $store }: any = useNuxtApp()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const routeType = '' + useRoute().params.type
+const routeId = '' + useRoute().params.id
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -187,7 +199,7 @@ const onUpdateCustomTimeTo = (value: string): void => {
 }
 
 const metricsItems = computed<UI_I_VerticalTabs[]>(() =>
-  metricsFunc(localization.value, props.type)
+  metricsFunc(localization.value, props.type, props.project)
 )
 const selectedMetricLocal = ref<UI_T_ChartHost | UI_T_ChartVm>(
   (props.selectedMetric || '' + metricsItems.value[0]?.value) as
@@ -438,6 +450,9 @@ const onSaveOptions = (name: string): void => {
     chartType,
     counters,
     metric: selectedMetricLocal.value,
+    objects: localSelectedObjects.value,
+    validShowName: name,
+    nodeId: routeId,
     timespan: {
       periodType: localPeriodType.value,
       units: localCustomTime.value,
@@ -446,8 +461,8 @@ const onSaveOptions = (name: string): void => {
     },
   }
   const prefix = props.project === 'sphere'
-  useLocalStorage(`${name}ChartOptions`, saveOptionsData, prefix)
-  optionsNames.value = getCurrentOptionsStorageFunc(routeType, props.project)
+  useLocalStorage(`ChartOptionsAdvanced${name}`, saveOptionsData, prefix)
+  optionsNames.value = getCurrentOptionsStorageFunc(props.project)
   // localSelectedChartOptionName.value = name
   emits('save-option-name')
 }
@@ -474,11 +489,9 @@ const setDefaultOptions = (): void => {
 }
 
 const setCustomOptions = (name: string): void => {
-  const prefix = props.project === 'sphere'
-  const selectedValue = useLocalStorage(
-    name + 'ChartOptions',
-    undefined,
-    prefix
+  const selectedValue = getSelectedOptionsValueFromStorageFunc(
+    name,
+    props.project
   )
 
   if (selectedValue.routeType !== routeType) return
@@ -497,14 +510,20 @@ const setCustomOptions = (name: string): void => {
   localUnitsCount.value = selectedValue.timespan.unitsCount
   localPeriodType.value = selectedValue.timespan.periodType
   localCustomTime.value = selectedValue.timespan.units
+  localSelectedObjects.value = selectedValue.objects
 }
 
 const onSelectLocalOptionName = (name: string): void => {
   selectedLocalOptionName.value = name
 
   if (optionsNames.value.includes(name)) setCustomOptions(name)
-  else if (name === 'default') setDefaultOptions()
-  else if (name === 'select_options') setSelectOptions()
+  else if (name === 'default') {
+    localSelectedObjects.value = ''
+    setDefaultOptions()
+  } else if (name === 'select_options') {
+    localSelectedObjects.value = ''
+    setSelectOptions()
+  }
 }
 
 watch(
@@ -518,8 +537,8 @@ watch(
 )
 
 const onDeleteChartName = (name: string): void => {
-  window.localStorage.removeItem(name + 'ChartOptions')
-  optionsNames.value = getCurrentOptionsStorageFunc(routeType, props.project)
+  removeSelectedOptionsFromStorageFunc(name, props.project)
+  optionsNames.value = getCurrentOptionsStorageFunc(props.project)
   setSelectOptions()
   emits('delete-option')
 }
@@ -529,7 +548,8 @@ const isDisabledSubmit = computed<boolean>(() =>
     props.type,
     selectedMetricLocal.value,
     selectedRows.value,
-    localSelectedObjects.value
+    localSelectedObjects.value,
+    props.project
   )
 )
 
@@ -542,7 +562,7 @@ watch(
 )
 
 onMounted(() => {
-  optionsNames.value = getCurrentOptionsStorageFunc(routeType, props.project)
+  optionsNames.value = getCurrentOptionsStorageFunc(props.project)
 })
 </script>