bfg-common 1.6.95 → 1.6.97

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

@@ -19,6 +19,11 @@ export interface UI_I_HostMetrics {
   memory: UI_I_AdvancedCounterItem[]
   network: UI_I_AdvancedCounterItem[]
   disk: UI_I_AdvancedCounterItem[]
+  hyperConvergedInfrastructure?: UI_I_AdvancedCounterItem[]
+  nfs?: UI_I_AdvancedCounterItem[]
+  services?: UI_I_AdvancedCounterItem[]
+  power?: UI_I_AdvancedCounterItem[]
+  temperature?: UI_I_AdvancedCounterItem[]
 }
 
 export interface UI_I_VmMetrics {

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

@@ -43,6 +43,15 @@ const onSelectRow = (value: UI_I_DataTableBody[]): void => {
 
   :deep(.bottom-grid-content) {
     max-height: 235px;
+
+    .table-header-content {
+      scrollbar-gutter: stable;
+    }
+  }
+}
+:deep(.table-title-actions-container) {
+  .title-container h5 {
+    font-size: 14px;
   }
 }
 </style>

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

@@ -62,25 +62,25 @@ export const bodyItems = (
       {
         key: 'col1',
         text: counters[countersTableKey[0]],
-        id: key,
+        id: counters.id ?? key,
         testId: `counters-item-${countersTableKey[0]}-${key}`,
       },
       {
         key: 'col2',
         text: counters[countersTableKey[1]],
-        id: key,
+        id: counters.id ?? key,
         testId: `counters-item-${countersTableKey[1]}-${key}`,
       },
       {
         key: 'col3',
         text: counters[countersTableKey[2]],
-        id: key,
+        id: counters.id ?? key,
         testId: `counters-item-${countersTableKey[2]}-${key}`,
       },
       {
         key: 'col4',
         text: counters[countersTableKey[3]],
-        id: key,
+        id: counters.id ?? key,
         testId: `counters-item-${countersTableKey[3]}-${key}`,
       },
     ])

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

@@ -17,7 +17,6 @@
     :host-id="props.hostId"
     :selected-metrics-keys="props.selectedMetricsKeys"
     :total-metric-items="props.totalMetricItems"
-    :selected-objects="props.selectedObjects"
     :objects-loading="props.objectsLoading"
     :objects-data="props.objectsData"
     :valid-date-end="props.validDateEnd"
@@ -26,6 +25,7 @@
     :error-time-from="props.errorTimeFrom"
     :error-date-to="props.errorDateTo"
     :error-time-to="props.errorTimeTo"
+    :current-selected-objects="props.currentSelectedObjects"
     @update-chart-type="emits('update-chart-type', $event)"
     @update-custom-time="emits('update-custom-time', $event)"
     @update-timespan-type="emits('update-timespan-type', $event)"
@@ -55,10 +55,10 @@
     :host-id="props.hostId"
     :selected-metrics-keys="props.selectedMetricsKeys"
     :total-metric-items="props.totalMetricItems"
-    :selected-objects="props.selectedObjects"
     :objects-loading="props.objectsLoading"
     :objects-data="props.objectsData"
     :valid-date-end="props.validDateEnd"
+    :current-selected-objects="props.currentSelectedObjects"
     @update-chart-type="emits('update-chart-type', $event)"
     @update-custom-time="emits('update-custom-time', $event)"
     @update-timespan-type="emits('update-timespan-type', $event)"
@@ -98,10 +98,10 @@ const props = withDefaults(
     hostId: string
     selectedMetricsKeys: number[]
     totalMetricItems: number
-    selectedObjects: string
     objectsLoading: boolean
     objectsData: UI_I_ObjectItem[]
     validDateEnd: number
+    currentSelectedObjects: string
     errorLastInput?: string
     errorDateFrom?: string
     errorTimeFrom?: string

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

@@ -58,9 +58,9 @@
         :host-id="props.hostId"
         :selected-metrics-keys="props.selectedMetricsKeys"
         :total-metric-items="props.totalMetricItems"
-        :selected-objects="props.selectedObjects"
         :loading="props.objectsLoading"
         :current-items="props.objectsData"
+        :current-selected-objects="props.currentSelectedObjects"
         @select-objects="emits('select-objects', $event)"
       />
     </div>
@@ -94,10 +94,10 @@ const props = withDefaults(
     hostId: string
     selectedMetricsKeys: number[]
     totalMetricItems: number
-    selectedObjects: string
     objectsLoading: boolean
     objectsData: UI_I_ObjectItem[]
     validDateEnd: number
+    currentSelectedObjects: string
     errorLastInput?: string
     errorDateFrom?: string
     errorTimeFrom?: string
@@ -177,6 +177,18 @@ const chartTypeLocal = computed<string>({
       }
     }
   }
+
+  :deep(.ui-input-with-datepicker) {
+    .ui-slot-icon-content {
+      top: 50%;
+      transform: translateY(-50%);
+    }
+    &.disabled {
+      .time-icon {
+        color: var(--calendar-icon-disabled-color);
+      }
+    }
+  }
 }
 
 @media (max-width: 920px) {

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

@@ -29,9 +29,9 @@
       :host-id="props.hostId"
       :selected-metrics-keys="props.selectedMetricsKeys"
       :total-metric-items="props.totalMetricItems"
-      :selected-objects="props.selectedObjects"
       :loading="props.objectsLoading"
       :current-items="props.objectsData"
+      :current-selected-objects="props.currentSelectedObjects"
       @select-objects="emits('select-objects', $event)"
     />
   </div>
@@ -62,10 +62,10 @@ const props = defineProps<{
   hostId: string
   selectedMetricsKeys: number[]
   totalMetricItems: number
-  selectedObjects: string
   objectsLoading: boolean
   objectsData: UI_I_ObjectItem[]
   validDateEnd: number
+  currentSelectedObjects: string
 }>()
 
 const emits = defineEmits<{

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

@@ -43,7 +43,7 @@ const props = defineProps<{
   hostId: string
   selectedMetricsKeys: number[]
   totalMetricItems: number
-  selectedObjects: string
+  currentSelectedObjects: string
   loading: boolean
   currentItems: UI_I_ObjectItem[]
 }>()
@@ -153,18 +153,18 @@ watch(
           })
         }
       }
-      if (newValue[4].includes(3)) {
-        items.push({
-          id: 'totalMHz',
-          target_object: 'totalMHz',
-        })
-      }
-      if (newValue[4].includes(4)) {
-        items.push({
-          id: 'averageMHz',
-          target_object: 'averageMHz',
-        })
-      }
+      // if (newValue[4].includes(3)) {
+      //   items.push({
+      //     id: 'totalMHz',
+      //     target_object: 'totalMHz',
+      //   })
+      // }
+      // if (newValue[4].includes(4)) {
+      //   items.push({
+      //     id: 'averageMHz',
+      //     target_object: 'averageMHz',
+      //   })
+      // }
     } else if (
       newValue[0] === 'host' &&
       ['disk', 'network'].includes(newValue[1])
@@ -228,21 +228,21 @@ watch(
               selectedNames = 'total'
           } */
 
-    emits('select-objects', selectedNames)
+    if (!props.currentSelectedObjects) emits('select-objects', selectedNames)
   },
   { deep: true }
 )
 
 watch(
-  () => [props.selectedObjects, bodyItems.value],
-  ([selected, all]) => {
+  () => [props.currentSelectedObjects, bodyItems.value],
+  ([selectedObjects, all]) => {
     if (!all.length) return
 
     if (props.type === 'host' && props.chart === 'cpu') {
-      if (selected === '*') {
+      if (selectedObjects === '*') {
         selectedRow.value = all.map((item) => item[0].id)
       } else {
-        const selectedNames = selected.split(', ')
+        const selectedNames = selectedObjects.split(', ')
         const selectedKeys: number[] = []
         all.forEach((item) => {
           if (selectedNames.includes('total') && !selectedKeys.includes(0))
@@ -256,9 +256,10 @@ watch(
       props.type === 'host' &&
       ['disk', 'network'].includes(props.chart)
     ) {
-      if (selected) {
-        const selectedId = all.find((item) => item[0].text === selected)?.[0]
-          ?.id
+      if (selectedObjects) {
+        const selectedId = all.find(
+          (item) => item[0].text === selectedObjects
+        )?.[0]?.id
         typeof selectedId === 'number' && (selectedRow.value = selectedId)
       }
     }

package/components/common/monitor/advanced/tools/chartOptionsModal/lib/config/index.ts

@@ -1,4 +1,6 @@
 export const allowedHostCpuFieldNotObject = [
+  'totalMHz',
+  'averageMHz',
   'cpu ready',
   'cpu demand',
   'cpu contention avg10',

package/components/common/monitor/advanced/tools/chartOptionsModal/lib/utils/checkSubmit.ts

@@ -1,4 +1,5 @@
 import type { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
 import {
   allowedHostCpuFieldNotObject,
   // allowedHostNetworkFieldNotObject,
@@ -8,7 +9,8 @@ export const checkIsDisabledSubmit = (
   type: string,
   selectedMetric: string,
   selectedRows: UI_I_AdvancedCounterItem[],
-  localSelectedObjects: string
+  localSelectedObjects: string,
+  project: UI_T_Project
 ): boolean => {
   let result = !selectedRows.length
 
@@ -28,12 +30,17 @@ export const checkIsDisabledSubmit = (
         // if (!isAllowedFields) result = !localSelectedObjects
         result = !localSelectedObjects
       } else {
-        result = !localSelectedObjects
+        // result = !localSelectedObjects
+
+        if (project === 'procurator') {
+          result = !localSelectedObjects
+        }
       }
     }
-  } else if (type === 'vm') {
-    if (selectedMetric === 'network' && !localSelectedObjects) result = true
   }
+  // else if (type === 'vm') {
+  // if (selectedMetric === 'network' && !localSelectedObjects) result = true
+  // }
 
   return result
 }

package/components/common/monitor/advanced/tools/chartOptionsModal/metrics/MetricsNew.vue

@@ -65,6 +65,8 @@ const selectedMetricLocal = defineModel<string>('selectedMetric', {
 
 <style scoped lang="scss">
 .metrics-container {
+  margin-top: 6px;
+  margin-bottom: 5px;
   display: flex;
   flex-direction: column;
   height: inherit;

package/components/common/monitor/advanced/tools/chartOptionsModal/metrics/lib/config/optionsMetrics.ts

@@ -1,11 +1,13 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_VerticalTabs } from '~/components/atoms/tabs/lib/models/interfaces'
 import type { UI_T_AdvancedType } from '~/components/common/monitor/advanced/lib/models/types'
 import type { UI_I_OptionData } from '~/components/common/monitor/advanced/lib/models/interfaces'
 
 export const metricsFunc = (
   localization: UI_I_Localization,
-  type: UI_T_AdvancedType
+  type: UI_T_AdvancedType,
+  project: UI_T_Project
 ): UI_I_VerticalTabs[] => {
   const metrics: UI_I_OptionData = {
     zone: [
@@ -184,5 +186,36 @@ export const metricsFunc = (
     ],
   }
 
+  if (project === 'sphere') {
+    metrics[type] = metrics[type].filter((item) => item.value !== 'datastore')
+  } else {
+    metrics.host.push(
+      {
+        text: localization.inventoryMonitor.hyperConvergedInfrastructure,
+        value: 'hyperConvergedInfrastructure',
+        testId: 'metric-item-hyper-converged-infrastructure-button',
+      },
+      {
+        text: localization.common.nfs,
+        value: 'nfs',
+        testId: 'metric-item-nfs-button',
+      },
+      {
+        text: localization.common.services,
+        value: 'services',
+        testId: 'metric-item-services-button',
+      },
+      {
+        text: localization.common.power,
+        value: 'power',
+        testId: 'metric-item-power-button',
+      },
+      {
+        text: localization.inventoryMonitor.temperature,
+        value: 'temperature',
+        testId: 'metric-item-temperature-button',
+      }
+    )
+  }
   return metrics[type]
 }

package/components/common/monitor/advanced/tools/lib/config/advancedToolbar.ts

@@ -45,7 +45,8 @@ export const periodFunc = (
 export const viewFunc = (
   localization: UI_I_Localization,
   type: UI_T_AdvancedType,
-  optionsNames?: string[]
+  optionsNames?: string[],
+  project?: UI_T_Project
 ): UI_I_OptionItem[] => {
   const viewData: UI_I_OptionData = {
     zone: [
@@ -116,13 +117,28 @@ export const viewFunc = (
       // { text: localization.common.virtualDisk, value: 'virtualDisk' },
     ],
   }
+  if (project === 'procurator') {
+    viewData.host.push(
+      {
+        text: localization.inventoryMonitor.hyperConvergedInfrastructure,
+        value: 'hyperConvergedInfrastructure',
+      },
+      { text: localization.common.nfs, value: 'nfs' },
+      { text: localization.common.services, value: 'services' },
+      { text: localization.common.power, value: 'power' },
+      {
+        text: localization.inventoryMonitor.temperature,
+        value: 'temperature',
+      }
+    )
+  }
   const currentOptions = viewData[type]
 
   if (optionsNames) {
     optionsNames.forEach((item) => {
       let currentText = item
       if (item === 'custom') {
-        currentText = localization.common.custom
+        currentText = localization.inventoryMonitor.custom
       }
       currentOptions.push({
         text: currentText,
@@ -143,21 +159,74 @@ export const exportFunc = (
 ]
 
 export const getCurrentOptionsStorageFunc = (
-  routeType: string,
   project: UI_T_Project
 ): string[] => {
-  const prefix = project === 'sphere'
+  const routeId = useRoute().params.id
+  const routeType = useRoute().params.type
+  const localStoragePrefix = project === 'sphere' ? getLocalStoragePrefix() : ''
+
   const optionsNames = []
   for (const key of Object.entries(localStorage)) {
-    if (key[0].includes('ChartOptions')) {
-      const currentOptions = useLocalStorage(key[0], undefined, prefix)
+    if (
+      key[0].includes('ChartOptionsAdvanced') &&
+      key[0].includes(localStoragePrefix)
+    ) {
+      const values = JSON.parse(key[1])
       if (
-        key[0].includes('ChartOptions') &&
-        currentOptions.routeType === routeType
-      ) {
-        optionsNames.push(key[0].replace('ChartOptions', ''))
-      }
+        values.value.routeType === routeType &&
+        values.value.nodeId === routeId
+      )
+        optionsNames.push(values.value.validShowName)
     }
   }
   return optionsNames
 }
+
+export const removeSelectedOptionsFromStorageFunc = (
+  selectedName: string,
+  project: UI_T_Project
+): void => {
+  const routeId = useRoute().params.id
+  const localStoragePrefix = project === 'sphere' ? getLocalStoragePrefix() : ''
+
+  for (const key of Object.entries(localStorage)) {
+    if (
+      key[0].includes('ChartOptionsAdvanced') &&
+      key[0].includes(localStoragePrefix)
+    ) {
+      let values = JSON.parse(key[1])
+
+      if (
+        values.value.validShowName === selectedName &&
+        values.value.nodeId === routeId
+      )
+        window.localStorage.removeItem(key[0])
+    }
+  }
+}
+
+export const getSelectedOptionsValueFromStorageFunc = (
+  selectedName: string,
+  project: UI_T_Project
+): any => {
+  const routeId = useRoute().params.id
+  const localStoragePrefix = project === 'sphere' ? getLocalStoragePrefix() : ''
+
+  let result = null
+
+  for (const key of Object.entries(localStorage)) {
+    if (
+      key[0].includes('ChartOptionsAdvanced') &&
+      key[0].includes(localStoragePrefix)
+    ) {
+      let values = JSON.parse(key[1])
+
+      if (
+        values.value.validShowName === selectedName &&
+        values.value.nodeId === routeId
+      )
+        result = values.value
+    }
+  }
+  return result
+}