bfg-common 1.6.92 → 1.6.93

package/components/common/monitor/utilization/Utilization.vue

@@ -1,65 +1,65 @@
-<template>
-  <component
-    :is="currentComponent"
-    v-model:all-data="constructedData"
-    :is-loading="props.isLoading"
-    @set-items-show-settings="onSetItemsShowSettings"
-  />
-</template>
-
-<script setup lang="ts">
-import type {
-  API_UI_I_UtilizationData,
-  UI_I_UtilizationDataItem,
-} from '~/components/common/monitor/utilization/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { T_NodeType } from '~/components/templates/inventory/lib/models/types'
-import { constructApiData } from '~/components/common/monitor/utilization/lib/utils'
-
-const props = defineProps<{
-  apiData: API_UI_I_UtilizationData | null
-  isLoading: boolean
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const routeType = computed<T_NodeType>(
-  () => useRoute().params.type.toString() as T_NodeType
-)
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./new/New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const constructedData = ref<UI_I_UtilizationDataItem[]>([])
-
-watch(
-  [localization, () => props.apiData],
-  () => {
-    if (props.apiData) {
-      constructedData.value = constructApiData(
-        props.apiData,
-        localization.value,
-        routeType.value
-      )
-    }
-  },
-  { immediate: true, deep: true }
-)
-
-const onSetItemsShowSettings = (): void => {
-  const showBlocksId: string[] = []
-  constructedData.value.forEach((item) => {
-    if (item.isShow) showBlocksId.push(item.id)
-  })
-  useLocalStorage('utilization-portlets-show', showBlocksId)
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <component
+    :is="currentComponent"
+    v-model:all-data="constructedData"
+    :is-loading="props.isLoading"
+    @set-items-show-settings="onSetItemsShowSettings"
+  />
+</template>
+
+<script setup lang="ts">
+import type {
+  API_UI_I_UtilizationData,
+  UI_I_UtilizationDataItem,
+} from '~/components/common/monitor/utilization/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { T_NodeType } from '~/components/templates/inventory/lib/models/types'
+import { constructApiData } from '~/components/common/monitor/utilization/lib/utils'
+
+const props = defineProps<{
+  apiData: API_UI_I_UtilizationData | null
+  isLoading: boolean
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const routeType = computed<T_NodeType>(
+  () => useRoute().params.type.toString() as T_NodeType
+)
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./new/New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const constructedData = ref<UI_I_UtilizationDataItem[]>([])
+
+watch(
+  [localization, () => props.apiData],
+  () => {
+    if (props.apiData) {
+      constructedData.value = constructApiData(
+        props.apiData,
+        localization.value,
+        routeType.value
+      )
+    }
+  },
+  { immediate: true, deep: true }
+)
+
+const onSetItemsShowSettings = (): void => {
+  const showBlocksId: string[] = []
+  constructedData.value.forEach((item) => {
+    if (item.isShow) showBlocksId.push(item.id)
+  })
+  useLocalStorage('utilization-portlets-show', showBlocksId)
+}
+</script>
+
+<style scoped lang="scss"></style>

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

@@ -1,112 +1,112 @@
-import type {
-  API_UI_I_UtilizationData,
-  UI_I_UtilizationDataItem,
-} from '~/components/common/monitor/utilization/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-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 => {
-  let result: string = ''
-  const valueLowerCase = value.toLowerCase()
-  if (valueLowerCase.includes('consumed'))
-    result = '--utilization-settings-consumed-info-color'
-  if (valueLowerCase.includes('demand'))
-    result = '--utilization-settings-demand-info-color'
-  if (valueLowerCase.includes('overhead'))
-    result = '--utilization-settings-overhead-info-color'
-  if (valueLowerCase.includes('granted'))
-    result = '--utilization-settings-granted-info-color'
-  if (valueLowerCase.includes('active'))
-    result = '--utilization-settings-active-info-color'
-  if (valueLowerCase.includes('swapped'))
-    result = '--utilization-settings-swapped-info-color'
-  if (valueLowerCase.includes('ballooned'))
-    result = '--utilization-settings-ballooned-info-color'
-  if (valueLowerCase.includes('unaccessed'))
-    result = '--utilization-settings-unaccessed-info-color'
-
-  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,
-  routeType: T_NodeType
-): UI_I_UtilizationDataItem[] => {
-  if (!apiData) return []
-
-  const result: UI_I_UtilizationDataItem[] = []
-  const utilizationPortletsShow = useLocalStorage('utilization-portlets-show')
-
-  Object.keys(apiData).forEach((key) => {
-    let currentType = ''
-    if (key.includes('cpu')) currentType = 'cpu'
-    else if (key.includes('memory')) currentType = 'memory'
-
-    let isShow = true
-    if (utilizationPortletsShow) isShow = utilizationPortletsShow.includes(key)
-
-    result.push({
-      isShow,
-      id: key,
-      title: currentTitle(routeType, currentType, localization) || key,
-      type: currentType,
-      data: apiData[key].items.map((item) => {
-        const color = ![
-          'capacity',
-          'limit',
-          'vcpus',
-          'usagepercent',
-          'ballooncurrentbytes',
-          'balloonmaxbytes',
-          'entitlement',
-        ].find((item2) => item.label.toLowerCase().includes(item2))
-          ? '#' +
-            Math.floor(Math.random() * 0xffffff)
-              .toString(16)
-              .padStart(6, '0')
-          : ''
-        const colorKey = currentColorKey(item.label)
-        const labelKey = item.label
-        const label = getMetricsLocalizationByKey(item.label)
-
-        const iconName =
-          labelKey.toLowerCase().includes('limit') ||
-          labelKey.toLowerCase().includes('entitlement')
-            ? 'arrow3'
-            : ''
-
-        return {
-          ...item,
-          color,
-          colorKey,
-          labelKey,
-          label,
-          iconName,
-        }
-      }),
-    })
-  })
-  return result
-}
+import type {
+  API_UI_I_UtilizationData,
+  UI_I_UtilizationDataItem,
+} from '~/components/common/monitor/utilization/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+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 => {
+  let result: string = ''
+  const valueLowerCase = value.toLowerCase()
+  if (valueLowerCase.includes('consumed'))
+    result = '--utilization-settings-consumed-info-color'
+  if (valueLowerCase.includes('demand'))
+    result = '--utilization-settings-demand-info-color'
+  if (valueLowerCase.includes('overhead'))
+    result = '--utilization-settings-overhead-info-color'
+  if (valueLowerCase.includes('granted'))
+    result = '--utilization-settings-granted-info-color'
+  if (valueLowerCase.includes('active'))
+    result = '--utilization-settings-active-info-color'
+  if (valueLowerCase.includes('swapped'))
+    result = '--utilization-settings-swapped-info-color'
+  if (valueLowerCase.includes('ballooned'))
+    result = '--utilization-settings-ballooned-info-color'
+  if (valueLowerCase.includes('unaccessed'))
+    result = '--utilization-settings-unaccessed-info-color'
+
+  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,
+  routeType: T_NodeType
+): UI_I_UtilizationDataItem[] => {
+  if (!apiData) return []
+
+  const result: UI_I_UtilizationDataItem[] = []
+  const utilizationPortletsShow = useLocalStorage('utilization-portlets-show')
+
+  Object.keys(apiData).forEach((key) => {
+    let currentType = ''
+    if (key.includes('cpu')) currentType = 'cpu'
+    else if (key.includes('memory')) currentType = 'memory'
+
+    let isShow = true
+    if (utilizationPortletsShow) isShow = utilizationPortletsShow.includes(key)
+
+    result.push({
+      isShow,
+      id: key,
+      title: currentTitle(routeType, currentType, localization) || key,
+      type: currentType,
+      data: apiData[key].items.map((item) => {
+        const color = ![
+          'capacity',
+          'limit',
+          'vcpus',
+          'usagepercent',
+          'ballooncurrentbytes',
+          'balloonmaxbytes',
+          'entitlement',
+        ].find((item2) => item.label.toLowerCase().includes(item2))
+          ? '#' +
+            Math.floor(Math.random() * 0xffffff)
+              .toString(16)
+              .padStart(6, '0')
+          : ''
+        const colorKey = currentColorKey(item.label)
+        const labelKey = item.label
+        const label = getMetricsLocalizationByKey(item.label)
+
+        const iconName =
+          labelKey.toLowerCase().includes('limit') ||
+          labelKey.toLowerCase().includes('entitlement')
+            ? 'arrow3'
+            : ''
+
+        return {
+          ...item,
+          color,
+          colorKey,
+          labelKey,
+          label,
+          iconName,
+        }
+      }),
+    })
+  })
+  return result
+}

package/components/common/noDataProvided/NoDataProvidedNew.vue

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

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

@@ -31,7 +31,6 @@ 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,7 +187,6 @@ 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 || 0, false, lang)
+          text: $binary.round(datastore.capacity.capacity_mb, false, lang)
         },
         {
           col: 'col3',
-          text: $binary.round(datastore.capacity.provisioned_mb || 0, false, lang)
+          text: $binary.round(datastore.capacity.provisioned_mb, false, lang)
         },
         {
           col: 'col4',
-          text: $binary.round(datastore.capacity.free_mb || 0, false, lang)
+          text: $binary.round(datastore.capacity.free_mb, false, lang)
         },
         {
           col: 'col5',
-          text: $binary.round(datastore.capacity.used_mb || 0, false, lang)
+          text: $binary.round(datastore.capacity.used_mb, 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]] || 0, false, lang),
+        text: $binary.round(datastore.capacity[tableKeys[2]], 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]] || 0,
+          datastore.capacity[tableKeys[3]],
           false,
           lang
         ),
@@ -105,7 +105,7 @@ export const bodyItems = (
       },
       {
         key: 'col4',
-        text: $binary.round(datastore.capacity[tableKeys[4]] || 0, false, lang),
+        text: $binary.round(datastore.capacity[tableKeys[4]], 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]] || 0, false, lang),
+        text: $binary.round(datastore.capacity[tableKeys[5]], false, lang),
         id: datastore.id,
         testId: `backup-datastore-table-item-${datastore.id}`,
         data: {

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

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