bfg-common 1.3.594 → 1.3.595

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

@@ -97,7 +97,6 @@
     :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"
@@ -113,10 +112,9 @@
     :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-local="emits('select-metric-local', $event)"
+    @select-metric="emits('select-metric', $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)"
@@ -129,6 +127,7 @@
     @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>
 
@@ -144,7 +143,6 @@ 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 {
@@ -162,7 +160,6 @@ 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
@@ -178,7 +175,6 @@ const props = defineProps<{
   selectedObjects: string
   project: UI_T_Project
   objectsLoading: boolean
-  objectsData: UI_I_ObjectItem[]
   disabledPeriod?: boolean
   disabledView?: boolean
 }>()
@@ -188,7 +184,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-local', value: string): void
+  (event: 'select-metric', value: string): void
   (event: 'update-chart-type', value: string): void
   (event: 'update-timespan-type', value: string): void
   (event: 'update-unit-count', value: number): void
@@ -201,6 +197,7 @@ 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,7 +49,6 @@
               :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"
@@ -61,6 +60,7 @@
               @update-custom-time-from="onUpdateCustomTimeFrom"
               @update-custom-time-to="onUpdateCustomTimeTo"
               @select-objects="localSelectedObjects = $event"
+              @update-cores="emits('update-cores')"
             />
           </div>
         </div>
@@ -79,7 +79,6 @@ 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'
@@ -92,7 +91,6 @@ 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
@@ -108,13 +106,12 @@ 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-local', value: string): void
+  (event: 'select-metric', value: string): void
   (event: 'update-chart-type', value: string): void
   (event: 'update-timespan-type', value: string): void
   (event: 'update-unit-count', value: number): void
@@ -128,6 +125,7 @@ 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
@@ -239,7 +237,7 @@ const checkValidations = (): boolean => {
     localCustomTimeTo.value
   )
 
-  if (isDisabledSubmit.value) {
+  if (!selectedRows.value.length) {
     alerts.value = [localization.value.noCountersSelected]
     isShowAlerts.value = true
     return false
@@ -466,19 +464,10 @@ const isDisabledSubmit = computed<boolean>(() =>
   checkIsDisabledSubmit(
     props.type,
     selectedMetric.value,
-    selectedRows.value.length,
     localSelectedObjects.value
   )
 )
 
-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,7 +27,6 @@
       :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)"
@@ -38,6 +37,7 @@
       @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,7 +49,6 @@ 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
@@ -70,7 +69,6 @@ const props = defineProps<{
   selectedMetricsKeys: number[]
   selectedObjects: string
   objectsLoading: boolean
-  objectsData: UI_I_ObjectItem[]
 }>()
 
 const emits = defineEmits<{
@@ -85,6 +83,7 @@ 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/table/lib/config/tableConfig.ts

@@ -23,7 +23,7 @@ const getItems = (
 ): [string, boolean, string, string][] => {
   return [
     [localization.name, true, '140px', countersTableKey[0]],
-    [localization.description, true, '140px', countersTableKey[1]],
+    [localization.common.description, true, '140px', countersTableKey[1]],
     [localization.measurement, true, '140px', countersTableKey[2]],
     [localization.units, true, '140px', countersTableKey[3]],
   ]

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,7 +42,6 @@ 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
@@ -63,7 +62,6 @@ const props = defineProps<{
   totalMetricItems: number
   selectedObjects: string
   objectsLoading: boolean
-  objectsData: UI_I_ObjectItem[]
 }>()
 
 const emits = defineEmits<{
@@ -78,6 +76,7 @@ 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="tableType"
+          type="checkbox"
           class="data-table"
           test-id="object-table"
           :loading="props.loading"
@@ -35,9 +35,7 @@ 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 {
@@ -54,20 +52,16 @@ 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 tableType = computed<UI_T_DataGridType>(() =>
-  ['disk', 'network'].includes(props.chart) ? 'radio' : 'checkbox'
-)
-
-const selectedRow = ref<number[] | number>([])
+const selectedRow = ref<number[]>([])
 const pagination = ref<UI_I_Pagination>({
   page: 1,
   pageSize: 35,
@@ -107,7 +101,6 @@ watch(
     props.totalCores,
     props.hostId,
     props.selectedMetricsKeys,
-    props.currentItems,
   ],
   (newValue) => {
     items = []
@@ -148,16 +141,10 @@ watch(
           target_object: 'averageMHz',
         })
       }
-    } else if (
-      newValue[0] === 'host' &&
-      ['disk', 'network'].includes(newValue[1])
-    ) {
-      items = props.currentItems
-    }
-
-    bodyItems.value = table.bodyItems(items)
+      bodyItems.value = table.bodyItems(items)
+    } else bodyItems.value = []
   },
-  { immediate: true, deep: true }
+  { immediate: true }
 )
 
 watch(
@@ -165,12 +152,9 @@ watch(
   (newValue) => {
     const selectedItems: string[] = []
 
-    if (['disk', 'network'].includes(props.chart)) {
-      selectedItems.push(items[newValue]?.target_object)
-    } else
-      newValue.forEach((key) => {
-        selectedItems.push(items[key].id)
-      })
+    newValue.forEach((key) => {
+      selectedItems.push(items[key].id)
+    })
 
     const selectedNames =
       items.length === newValue.length &&
@@ -201,19 +185,13 @@ 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">

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

@@ -1,17 +1,12 @@
 export const checkIsDisabledSubmit = (
   type: string,
   selectedMetric: string,
-  selectedRowsLength: number,
   localSelectedObjects: string
 ): boolean => {
-  let result = !selectedRowsLength
+  let result = false
 
-  if (type === 'host') {
-    if (selectedMetric === 'cpu' && !localSelectedObjects) result = true
-    else if (selectedMetric === 'disk') {
-      result = !localSelectedObjects
-    }
-  }
+  if (type === 'host' && selectedMetric === 'cpu' && !localSelectedObjects)
+    result = true
 
   return result
 }

package/components/common/pages/Tasks.vue

@@ -13,7 +13,7 @@
         :disabled="pagination.page === 1"
         @click="onClickButton('previous')"
       >
-        {{ localization.previous }}
+        {{ localization.common.previous }}
       </button>
 
       <button
@@ -23,7 +23,7 @@
         :disabled="pagination.page === tasksList?.total_pages"
         @click="onClickButton('next')"
       >
-        {{ localization.next }}
+        {{ localization.common.next }}
       </button>
     </div>
 

package/components/common/pages/hardwareHealth/tableView/lib/config/storageSensorTable.ts

@@ -23,7 +23,7 @@ const getItems = (
       hardwareHealthStorageSensorTableKeys[1],
     ],
     [
-      localization.description,
+      localization.common.description,
       true,
       '230px',
       hardwareHealthStorageSensorTableKeys[2],

package/components/common/pages/hardwareHealth/tableView/lib/config/systemLogTable.ts

@@ -16,7 +16,7 @@ const getItems = (
 ): [string, boolean, string, string][] => {
   return [
     [localization.time, true, '50%', hardwareHealthSystemLogTableKeys[0]],
-    [localization.events, true, '50%', hardwareHealthSystemLogTableKeys[1]],
+    [localization.mainNavigation.events, true, '50%', hardwareHealthSystemLogTableKeys[1]],
   ]
 }
 export const columnKeys = (

package/components/common/shortcuts/Shortcuts.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="shortcut">
-    <h1>{{ localization.shortcuts }}</h1>
+    <h1>{{ localization.mainNavigation.shortcuts }}</h1>
     <template v-for="item in props.shortcutsItems">
       <div class="shortcut-category">
         <common-shortcuts-category