bfg-common 1.6.91 → 1.6.92

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

@@ -3,7 +3,7 @@ import type {
   UI_I_UtilizationDataItem,
 } 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 type { T_NodeType } from '~/components/templates/inventory/lib/models/types'
 import { getMetricsLocalizationByKey } from '~/components/common/monitor/lib/utils/localization'
 
 const currentColorKey = (value: string): string => {
@@ -29,9 +29,30 @@ const currentColorKey = (value: string): string => {
   return result
 }
 
+const currentTitle = (
+  routeType: T_NodeType,
+  currentType: string,
+  localization: UI_I_Localization
+): string => {
+  let result: string = ''
+
+  if (routeType === 'host') {
+    if (currentType === 'cpu') result = localization.common.hostCpu
+    if (currentType === 'memory') result = localization.common.hostMem
+  } else if (routeType === 'vm') {
+    if (currentType === 'cpu')
+      result = localization.inventoryMonitor.virtualMachineCpu
+    if (currentType === 'memory')
+      result = localization.inventoryMonitor.virtualMachineMemory
+  }
+
+  return result
+}
+
 export const constructApiData = (
   apiData: API_UI_I_UtilizationData | null,
-  localization: UI_I_Localization
+  localization: UI_I_Localization,
+  routeType: T_NodeType
 ): UI_I_UtilizationDataItem[] => {
   if (!apiData) return []
 
@@ -49,7 +70,7 @@ export const constructApiData = (
     result.push({
       isShow,
       id: key,
-      title: localization.common[UI_E_UtilizationBlockCurrentKeys[key]] || key,
+      title: currentTitle(routeType, currentType, localization) || key,
       type: currentType,
       data: apiData[key].items.map((item) => {
         const color = ![

package/components/common/noDataProvided/NoDataProvidedNew.vue

@@ -43,7 +43,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
     }
 
     .ui-no-data-provided-title {
-      font-weight: 500;
+      font-weight: 400;
       font-size: 16px;
       line-height: 19px;
       letter-spacing: 0;

package/components/common/pages/backups/lib/models/interfaces.ts

@@ -31,6 +31,7 @@ export interface UI_I_BackupAction {
   id?: string
   name?: string
   backupId?: string
+  vmId?: string
   bucketId?: string
   storageId?: string
 }

package/components/common/pages/backups/modals/Modals.vue

@@ -187,6 +187,7 @@ watch(
       case 'restoreBackup':
         isShowRestoreModal.value = true
         restoreForm.value.backup_storage = newValue.storageId || ''
+        restoreForm.value.vm = newValue.vmId || ''
         restoreForm.value.bucket = newValue.bucketId || ''
         restoreForm.value.backup = newValue.backupId || ''
         break

package/components/common/pages/backups/modals/createBackup/datastores/tableView/new/lib/config/table.ts

@@ -191,19 +191,19 @@ export const getBodyDataFunc = (
         },
         {
           col: 'col2',
-          text: $binary.round(datastore.capacity.capacity_mb, false, lang)
+          text: $binary.round(datastore.capacity.capacity_mb || 0, false, lang)
         },
         {
           col: 'col3',
-          text: $binary.round(datastore.capacity.provisioned_mb, false, lang)
+          text: $binary.round(datastore.capacity.provisioned_mb || 0, false, lang)
         },
         {
           col: 'col4',
-          text: $binary.round(datastore.capacity.free_mb, false, lang)
+          text: $binary.round(datastore.capacity.free_mb || 0, false, lang)
         },
         {
           col: 'col5',
-          text: $binary.round(datastore.capacity.used_mb, false, lang)
+          text: $binary.round(datastore.capacity.used_mb || 0, false, lang)
         },
         {
           col: 'col6',

package/components/common/pages/backups/modals/createBackup/datastores/tableView/old/lib/config/table.ts

@@ -83,7 +83,7 @@ export const bodyItems = (
       },
       {
         key: 'col2',
-        text: $binary.round(datastore.capacity[tableKeys[2]], false, lang),
+        text: $binary.round(datastore.capacity[tableKeys[2]] || 0, false, lang),
         id: datastore.id,
         testId: `backup-datastore-table-item-${datastore.id}`,
         data: {
@@ -93,7 +93,7 @@ export const bodyItems = (
       {
         key: 'col3',
         text: $binary.round(
-          datastore.capacity[tableKeys[3]],
+          datastore.capacity[tableKeys[3]] || 0,
           false,
           lang
         ),
@@ -105,7 +105,7 @@ export const bodyItems = (
       },
       {
         key: 'col4',
-        text: $binary.round(datastore.capacity[tableKeys[4]], false, lang),
+        text: $binary.round(datastore.capacity[tableKeys[4]] || 0, false, lang),
         id: datastore.id,
         testId: `backup-datastore-table-item-${datastore.id}`,
         data: {
@@ -114,7 +114,7 @@ export const bodyItems = (
       },
       {
         key: 'col5',
-        text: $binary.round(datastore.capacity[tableKeys[5]], false, lang),
+        text: $binary.round(datastore.capacity[tableKeys[5]] || 0, false, lang),
         id: datastore.id,
         testId: `backup-datastore-table-item-${datastore.id}`,
         data: {

package/components/common/pages/backups/modals/lib/config/restore.ts

@@ -4,6 +4,7 @@ export const restoreDefaultFormFunc = (): UI_I_RestoreForm => {
   return {
     restore_code: 2,
     backup_storage: '',
+    vm: '',
     bucket: '',
     backup: '',
     copy_disks: [],

package/components/common/pages/backups/modals/lib/models/interfaces.ts

@@ -163,6 +163,7 @@ export interface UI_I_CreateBackupForm {
 export interface UI_I_RestoreForm {
   restore_code: 1 | 2 | 3 // 1 - disk only, 2 - existing, 3 - as New
   backup_storage: string
+  vm: string
   bucket: string
   backup: string
   copy_disks: UI_I_Pvm['disk_devices']

package/components/common/pages/backups/modals/restore/Restore.vue

@@ -258,7 +258,8 @@ const getPvm = async (): Promise<void> => {
   loadingCount.value++
   await $store.dispatch('backup/A_GET_PVM', {
     target: model.value.backup_storage,
-    bucketId: model.value.bucket, // TODO bucket поменять на vm так как это сейчас vm
+    vmId: model.value.vm,
+    bucketId: model.value.bucket,
     backupId: model.value.backup,
   })
 
@@ -273,7 +274,8 @@ const getBackupDisks = async (): Promise<void> => {
   loadingCount.value++
   await $store.dispatch('backup/A_GET_BACKUP_DISKS', {
     target: model.value.backup_storage,
-    bucketId: model.value.bucket, // TODO bucket поменять на vm так как это сейчас vm
+    vmId: model.value.vm,
+    bucketId: model.value.bucket,
     backupId: model.value.backup,
   })