bfg-common 1.6.29 → 1.6.31

package/assets/localization/local_ru.json

@@ -635,7 +635,7 @@
     "ghz": "ГГц",
     "mhz": "МГц",
     "global": "Глобальный",
-    "globalPermissionRoot": "Корень глобального разрешения",
+    "globalPermissionRoot": "Глобальный уровень разрешений",
     "globalPermissions": "Глобальные разрешения",
     "good": "Хороший",
     "graphics": "Графика",

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,
@@ -46,18 +46,8 @@ export const bodyOptions = (
         show: true,
         filter: true,
       },
-      // {
-      //   col: 'col3',
-      //   colName: 'rollup',
-      //   text: localization.common.rollup,
-      //   width: '150px',
-      //   isSortable: true,
-      //   sort: 'asc',
-      //   show: true,
-      //   filter: true,
-      // },
       {
-        col: 'col4',
+        col: 'col3',
         colName: 'units',
         text: localization.inventoryMonitor.unitOfMeasurement,
         width: '150px',
@@ -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',
@@ -96,18 +76,8 @@ export const bodyOptions = (
         show: true,
         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/TableOld.vue

@@ -1,93 +1,93 @@
-<template>
-  <div class="chart-legend">
-    <span class="title">{{
-      localization.inventoryMonitor.performanceChartLegend
-    }}</span>
-    <client-only>
-      <atoms-table-data-grid
-        v-model:selected-row="selectedRow"
-        v-model:column-keys="columnKeys"
-        v-model:page-size="pageSize"
-        v-model:page="page"
-        :head-items="headAInfo"
-        :body-items="dataBody"
-        :total-items="dataBody.length"
-        :total-pages="1"
-        type="checkbox"
-        class="data-table"
-        test-id="advances-table"
-        hide-page-size
-      >
-        <template #col1="{ item }">
-          <div
-            :style="[{ backgroundColor: item.data.color }]"
-            class="datagrid-column-color-block"
-          ></div>
-        </template>
-      </atoms-table-data-grid>
-    </client-only>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_HeadItem,
-  UI_I_BodyItem,
-  UI_I_ColumnKey,
-} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import type { UI_I_PerformanceItem } from '~/components/common/monitor/advanced/table/lib/models/interfaces'
-import * as table from '~/components/common/monitor/advanced/table/tableOld/lib/config/performanceDatatable'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const props = defineProps<{
-  data: UI_I_PerformanceItem[]
-}>()
-const emits = defineEmits<{
-  (event: 'select', value: number[]): void
-}>()
-
-const selectedRow = ref<number[]>([])
-const pageSize = ref<number>(100)
-const page = ref<number>(1)
-const headAInfo = computed<UI_I_HeadItem[]>(() =>
-  table.headItems(localization.value)
-)
-const columnKeys = ref<UI_I_ColumnKey[]>(table.columnKeys(localization.value))
-watch(localization, () => {
-  columnKeys.value = table.columnKeys(localization.value)
-})
-const dataBody = ref<UI_I_BodyItem[][]>([])
-
-watch(
-  () => props.data,
-  (newValue) => {
-    if (!newValue) return
-
-    dataBody.value = table.bodyItems(newValue)
-  },
-  { immediate: true }
-)
-watch(
-  selectedRow,
-  (newValue) => {
-    emits('select', newValue)
-  },
-  { deep: true }
-)
-</script>
-
-<style scoped lang="scss">
-.chart-legend {
-  .title {
-    font-weight: 700;
-    height: 20px;
-  }
-
-  .datagrid-column-color-block {
-    width: 16px;
-    height: 16px;
-  }
-}
-</style>
+<template>
+  <div class="chart-legend">
+    <span class="title">{{
+      localization.inventoryMonitor.performanceChartLegend
+    }}</span>
+    <client-only>
+      <atoms-table-data-grid
+        v-model:selected-row="selectedRow"
+        v-model:column-keys="columnKeys"
+        v-model:page-size="pageSize"
+        v-model:page="page"
+        :head-items="headAInfo"
+        :body-items="dataBody"
+        :total-items="dataBody.length"
+        :total-pages="1"
+        type="checkbox"
+        class="data-table"
+        test-id="advances-table"
+        hide-page-size
+      >
+        <template #col1="{ item }">
+          <div
+            :style="[{ backgroundColor: item.data.color }]"
+            class="datagrid-column-color-block"
+          ></div>
+        </template>
+      </atoms-table-data-grid>
+    </client-only>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_HeadItem,
+  UI_I_BodyItem,
+  UI_I_ColumnKey,
+} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import type { UI_I_PerformanceItem } from '~/components/common/monitor/advanced/table/lib/models/interfaces'
+import * as table from '~/components/common/monitor/advanced/table/tableOld/lib/config/performanceDatatable'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const props = defineProps<{
+  data: UI_I_PerformanceItem[]
+}>()
+const emits = defineEmits<{
+  (event: 'select', value: number[]): void
+}>()
+
+const selectedRow = ref<number[]>([])
+const pageSize = ref<number>(100)
+const page = ref<number>(1)
+const headAInfo = computed<UI_I_HeadItem[]>(() =>
+  table.headItems(localization.value)
+)
+const columnKeys = ref<UI_I_ColumnKey[]>(table.columnKeys(localization.value))
+watch(localization, () => {
+  columnKeys.value = table.columnKeys(localization.value)
+})
+const dataBody = ref<UI_I_BodyItem[][]>([])
+
+watch(
+  () => props.data,
+  (newValue) => {
+    if (!newValue) return
+
+    dataBody.value = table.bodyItems(newValue)
+  },
+  { immediate: true }
+)
+watch(
+  selectedRow,
+  (newValue) => {
+    emits('select', newValue)
+  },
+  { deep: true }
+)
+</script>
+
+<style scoped lang="scss">
+.chart-legend {
+  .title {
+    font-weight: 700;
+    height: 20px;
+  }
+
+  .datagrid-column-color-block {
+    width: 16px;
+    height: 16px;
+  }
+}
+</style>

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 = (
@@ -46,17 +43,14 @@ const getItems = (
       widthCol,
       performanceTableKey[2],
     ],
-    // [localization.common.rollup, true, widthCol, performanceTableKey[3]],
     [
       localization.inventoryMonitor.unitOfMeasurement,
       true,
       widthCol,
-      performanceTableKey[4],
+      performanceTableKey[3],
     ],
-    [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.common.maximum, true, widthCol, performanceTableKey[4]],
+    [localization.common.minimum, true, widthCol, performanceTableKey[5]],
   ]
 }
 
@@ -125,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/lib/utils/local_be.json

@@ -694,5 +694,9 @@
   "memoryUsed": "Выкарыстанне памяці",
   "memoryUsedDesc": "Аб'ём памяці, які выкарыстоўваецца віртуальнай машынай у дадзены момант",
   "vmNetworkTotalUsage": "Агульны сеткавы трафік ВМ",
-  "vmNetworkTotalUsageDesc": "Агульны ўваходны і зыходны сеткавы трафік віртуальнай машыны ў адзінку часу"
+  "vmNetworkTotalUsageDesc": "Агульны ўваходны і зыходны сеткавы трафік віртуальнай машыны ў адзінку часу",
+  "capacityMHz": "Агульная магутнасць працэсара",
+  "consumedMHz": "Спажываная магутнасць працэсара",
+  "usagePercent": "Выкарыстанне працэсара",
+  "totalCores": "Усяго ядзер працэсара"
 }

package/components/common/monitor/lib/utils/local_en.json

@@ -694,5 +694,9 @@
   "memoryUsed": "Memory usage",
   "memoryUsedDesc": "Amount of memory currently used by the virtual machine",
   "vmNetworkTotalUsage": "Total VM network traffic",
-  "vmNetworkTotalUsageDesc": "Total incoming and outgoing network traffic of the virtual machine per unit of time"
+  "vmNetworkTotalUsageDesc": "Total incoming and outgoing network traffic of the virtual machine per unit of time",
+  "capacityMHz": "Total CPU capacity",
+  "consumedMHz": "Consumed CPU capacity",
+  "usagePercent": "CPU usage",
+  "totalCores": "Total CPU cores"
 }

package/components/common/monitor/lib/utils/local_hy.json

@@ -694,5 +694,9 @@
   "memoryUsed": "Հիշողության օգտագործում",
   "memoryUsedDesc": "Վիրտուալ մեքենայի կողմից ներկայումս օգտագործվող հիշողության ծավալը",
   "vmNetworkTotalUsage": "ՎՄ-ի ընդհանուր ցանցային երթևեկություն",
-  "vmNetworkTotalUsageDesc": "Վիրտուալ մեքենայի ընդհանուր մուտքային և ելքային ցանցային երթևեկությունը ժամանակի միավորի համար"
+  "vmNetworkTotalUsageDesc": "Վիրտուալ մեքենայի ընդհանուր մուտքային և ելքային ցանցային երթևեկությունը ժամանակի միավորի համար",
+  "capacityMHz": "Պրոցեսորի ընդհանուր հզորությունը",
+  "consumedMHz": "Սպառված պրոցեսորի հզորությունը",
+  "usagePercent": "Պրոցեսորի օգտագործումը",
+  "totalCores": "Պրոցեսորի միջուկների ընդհանուր քանակը"
 }

package/components/common/monitor/lib/utils/local_kk.json

@@ -694,5 +694,9 @@
   "memoryUsed": "Жадты пайдалану",
   "memoryUsedDesc": "Виртуалды машинаның қазіргі уақытта пайдаланатын жад көлемі",
   "vmNetworkTotalUsage": "ВМ жалпы желілік трафигі",
-  "vmNetworkTotalUsageDesc": "Виртуалды машинаның уақыт бірлігіндегі жалпы кіріс және шығыс желілік трафигі"
+  "vmNetworkTotalUsageDesc": "Виртуалды машинаның уақыт бірлігіндегі жалпы кіріс және шығыс желілік трафигі",
+  "capacityMHz": "Процессордың жалпы қуаты",
+  "consumedMHz": "Тұтынылған процессор қуаты",
+  "usagePercent": "Процессорды пайдалану",
+  "totalCores": "Процессор ядроларының жалпы саны"
 }

package/components/common/monitor/lib/utils/local_ru.json

@@ -694,5 +694,9 @@
   "memoryUsed": "Используемая память",
   "memoryUsedDesc": "Объём памяти, фактически используемой виртуальной машиной в данный момент",
   "vmNetworkTotalUsage": "Общий сетевой трафик ВМ",
-  "vmNetworkTotalUsageDesc": "Суммарный входящий и исходящий сетевой трафик виртуальной машины за единицу времени"
+  "vmNetworkTotalUsageDesc": "Суммарный входящий и исходящий сетевой трафик виртуальной машины за единицу времени",
+  "capacityMHz": "Общая мощность ЦПУ",
+  "consumedMHz": "Используемая мощность ЦПУ",
+  "usagePercent": "Загрузка ЦПУ",
+  "totalCores": "Общее количество ядер ЦПУ"
 }

package/components/common/monitor/lib/utils/local_zh.json

@@ -694,5 +694,9 @@
   "memoryUsed": "内存使用量",
   "memoryUsedDesc": "虚拟机当前使用的内存量",
   "vmNetworkTotalUsage": "虚拟机总网络流量",
-  "vmNetworkTotalUsageDesc": "单位时间内虚拟机的总入站和出站网络流量"
+  "vmNetworkTotalUsageDesc": "单位时间内虚拟机的总入站和出站网络流量",
+  "capacityMHz": "总 CPU 容量",
+  "consumedMHz": "已消耗 CPU 容量",
+  "usagePercent": "CPU 使用率",
+  "totalCores": "CPU 核心总数"
 }

package/components/common/monitor/utilization/lib/utils/index.ts

@@ -4,6 +4,7 @@ import type {
 } from '~/components/common/monitor/utilization/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import { UI_E_UtilizationBlockCurrentKeys } from '~/components/common/monitor/utilization/lib/models/enums'
+import { getMetricsLocalizationByKey } from '~/components/common/monitor/lib/utils/localization'
 
 export const constructApiData = (
   apiData: API_UI_I_UtilizationData,
@@ -22,6 +23,7 @@ export const constructApiData = (
               .toString(16)
               .padStart(6, '0')
           : ''
+        item.label = getMetricsLocalizationByKey(item.label)
 
         return item
       }),

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/CdDvdDrive.vue

@@ -157,7 +157,7 @@ const onHideFileModal = (): void => {
   }, 0)
 }
 const onSelectFile = (file: UI_I_FileTreeNode): void => {
-  source.value = file.path
+  source.value = file.path.replace(/^([^:]+):/, '[$1]:')
 }
 const fileTypes = computed<UI_I_OptionItem[]>(() =>
   fileTypesFunc(localization.value)

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/media/New.vue

@@ -56,6 +56,11 @@ const emits = defineEmits<{
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
+
+onMounted(() => {
+  const cdDvdMediaInputElement = document.getElementById('vm-wizard-dvd-media-input')
+  cdDvdMediaInputElement?.classList.remove('text-ellipsis')
+})
 </script>
 
 <style>

package/components/common/vm/actions/common/select/options/New.vue

@@ -224,7 +224,7 @@ watch(
   padding-bottom: 16px;
 
   &.is-sm-size {
-    grid-template-columns: 1fr;
+    grid-template-columns: 1fr !important;
   }
 
   &.three-items {

package/components/common/vm/actions/rename/New.vue

@@ -12,13 +12,13 @@
   >
     <template #content>
       <ui-alert
-          v-if="props.errors.length"
-          :messages="props.errors.length && !isEmptyName ? props.errors : []"
-          test-id="vm-rename-error-alert"
-          type="error"
-          class="mb-2 mx-8"
-          size="md"
-          hide-close-button
+        v-if="props.errors.length"
+        :messages="props.errors.length && !isEmptyName ? props.errors : []"
+        test-id="vm-rename-error-alert"
+        type="error"
+        class="mb-2 mt-2 mx-8"
+        size="md"
+        hide-close-button
       />
       <div class="content">
         <form @submit.prevent="onRename">

package/components/common/wizards/common/steps/name/New.vue

@@ -17,9 +17,11 @@
     <div class="name-field">
       <div class="flex-1 flex-align-center">
         <ui-skeleton-item v-if="isLoading" width="112px" height="20px" />
-        <label v-else :for="`${props.testIds.name}-name`" class="name-label">{{
-          localization.common.name
-        }}</label>
+        <label v-else :for="`${props.testIds.name}-name`" class="name-label"
+          >{{ localization.common.name }} ({{
+            localization.common.optional
+          }})</label
+        >
 
         <common-tooltip-help
           v-if="!isLoading"
@@ -55,7 +57,7 @@
             <ui-input
               v-model="name"
               id="vm-name-tooltip"
-              :placeholder="`${localization.common.name} (${localization.common.optional})`"
+              :placeholder="`${localization.common.name}`"
               type="text"
               maxlength="54"
               :error="props.nameErrorText"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.6.29",
+  "version": "1.6.31",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -18,7 +18,7 @@
     "@vueuse/core": "10.1.2",
     "@vueuse/nuxt": "10.1.2",
     "bfg-nuxt-3-graph": "1.0.27",
-    "bfg-uikit": "1.1.25",
+    "bfg-uikit": "1.1.26",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-myrules": "file:./eslint",
     "nuxt": "3.11.2",