bfg-common 1.2.160 → 1.2.162

package/assets/localization/local_be.json

@@ -2122,5 +2122,7 @@
   "saveVCenterServerAddress": "Захаваць адрас сервера vCenter",
   "discard": "Адкідаць",
   "ioControl": "Io Control",
-  "selectValidDestinationComputeResource": "Выберыце сапраўдны вылічальны рэсурс прызначэння."
+  "selectValidDestinationComputeResource": "Выберыце сапраўдны вылічальны рэсурс прызначэння.",
+  "vMotionPriority": "Прыярытэт vMotion",
+  "noNetworkReassignments": "Няма перапрызначэння сеткі"
 }

package/assets/localization/local_en.json

@@ -2125,5 +2125,7 @@
   "saveVCenterServerAddress": "Save vCenter Server address",
   "discard": "Discard",
   "ioControl": "Io Control",
-  "selectValidDestinationComputeResource": "Select a valid destination compute resource."
+  "selectValidDestinationComputeResource": "Select a valid destination compute resource.",
+  "vMotionPriority": "vMotion Priority",
+  "noNetworkReassignments": "No network reassignments"
 }

package/assets/localization/local_hy.json

@@ -2125,5 +2125,7 @@
   "saveVCenterServerAddress": "Պահպանեք vCenter սերվերի հասցեն",
   "discard": "Հրաժարվել",
   "ioControl": "Io Control",
-  "selectValidDestinationComputeResource": "Ընտրեք վավեր նպատակակետ հաշվարկային ռեսուրս:"
+  "selectValidDestinationComputeResource": "Ընտրեք վավեր նպատակակետ հաշվարկային ռեսուրս:",
+  "vMotionPriority": "vMotion Priority",
+  "noNetworkReassignments": "Ցանցի վերաբաշխումներ չկան"
 }

package/assets/localization/local_kk.json

@@ -2125,5 +2125,7 @@
   "saveVCenterServerAddress": "vCenter серверінің мекенжайын сақтаңыз",
   "discard": "Жою",
   "ioControl": "Io басқару",
-  "selectValidDestinationComputeResource": "Жарамды тағайындалған есептеу ресурсын таңдаңыз."
+  "selectValidDestinationComputeResource": "Жарамды тағайындалған есептеу ресурсын таңдаңыз.",
+  "vMotionPriority": "vMotion басымдылығы",
+  "noNetworkReassignments": "Желіні қайта тағайындау жоқ"
 }

package/assets/localization/local_ru.json

@@ -2125,5 +2125,7 @@
   "saveVCenterServerAddress": "Сохранить адрес сервера vCenter",
   "discard": "Отказаться",
   "ioControl": "Ио-контроль",
-  "selectValidDestinationComputeResource": "Выберите допустимый целевой вычислительный ресурс."
+  "selectValidDestinationComputeResource": "Выберите допустимый целевой вычислительный ресурс.",
+  "vMotionPriority": "Приоритет vMotion",
+  "noNetworkReassignments": "Никаких переназначений сети"
 }

package/assets/localization/local_zh.json

@@ -2125,5 +2125,7 @@
   "saveVCenterServerAddress": "保存 vCenter Server 地址",
   "discard": "丢弃",
   "ioControl": "IO控制",
-  "selectValidDestinationComputeResource": "选择有效的目标计算资源。"
+  "selectValidDestinationComputeResource": "选择有效的目标计算资源。",
+  "vMotionPriority": "vMotion 优先级",
+  "noNetworkReassignments": "无需重新分配网络"
 }

package/components/common/monitor/advanced/GraphView.vue

@@ -17,7 +17,7 @@
 </template>
 
 <script setup lang="ts">
-import { useElementSize } from '@vueuse/core'
+import { useDebounceFn, useElementSize } from '@vueuse/core'
 import { format } from 'date-fns'
 import { UI_I_Localization } from '~/models/interfaces'
 import { graphDataFunc } from 'bfg-nuxt-3-graph/graph/utils/renderGraph'
@@ -66,8 +66,11 @@ watch(
 
 let dateFormat = ''
 
-const startChart = (): void => {
-  if (!props.data) return
+const chartsView = ref(null)
+const { width } = useElementSize(chartsView)
+
+const startChart = useDebounceFn(() => {
+  if (!props.data || !width.value) return
 
   chartData.value = graphDataFunc(
     props.data,
@@ -79,7 +82,7 @@ const startChart = (): void => {
     false,
     props.selectedChartType,
     '',
-    0,
+    Math.floor(width.value),
     chartCallback,
     props.formattedDatetime,
     format,
@@ -87,7 +90,7 @@ const startChart = (): void => {
   )
 
   chartHelper.value++
-}
+}, 1000)
 
 watch(
   () => props.data,
@@ -125,10 +128,9 @@ watch(
   { immediate: true }
 )
 
-const chartsView = ref(null)
-const { width } = useElementSize(chartsView)
-
 watch(width, (newValue) => {
+  if (newValue) startChart()
+
   if (!chart.value?.isResizing) return
 
   chart.value.setSize(1, chart.chartHeight)

package/components/common/monitor/advanced/models/interfaces.ts

@@ -1,6 +1,7 @@
 import { UI_I_OptionItem } from '~/components/atoms/models/interfaces'
 
 export interface UI_I_OptionData {
+  cluster: UI_I_OptionItem[]
   datacenter: UI_I_OptionItem[]
   host: UI_I_OptionItem[]
   vm: UI_I_OptionItem[]

package/components/common/monitor/advanced/models/types.ts

@@ -1 +1 @@
-export type UI_T_AdvancedType = 'datacenter' | 'host' | 'vm'
+export type UI_T_AdvancedType = 'cluster' | 'datacenter' | 'host' | 'vm'

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

@@ -206,7 +206,7 @@ watch(
       optionsNames.value.includes(selectedView.value)
     )
       currentValue = selectedView.value
-    else currentValue = selectedView.value || viewOptions.value[0].value
+    else currentValue = selectedView.value || viewOptions.value[0]?.value
 
     selectedView.value = currentValue
   },

package/components/common/monitor/advanced/tools/chartOptionsModal/ChartOptionsModal.vue

@@ -482,4 +482,9 @@ onMounted(() => {
     overflow-y: hidden;
   }
 }
+@media (max-width: 1024px) {
+  .chart-options-content {
+    flex-direction: column !important;
+  }
+}
 </style>

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/Counters.vue

@@ -91,4 +91,10 @@ const totalMetricItems = ref<number>(0)
   padding-left: 15px;
   max-width: 80%;
 }
+@media (max-width: 1024px) {
+  .chart-option-counters-container {
+    max-width: unset;
+    padding-left: 0;
+  }
+}
 </style>

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

@@ -37,6 +37,6 @@ const selectedMetricLocal = computed<string>({
 .chart-option-groups-container {
   margin-top: 10px;
   flex-basis: 20%;
-  min-width: 20%;
+  //min-width: 20%;
 }
 </style>

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

@@ -47,6 +47,7 @@ export const viewFunc = (
   optionsNames?: string[]
 ): UI_I_OptionItem[] => {
   const viewData: UI_I_OptionData = {
+    cluster: [],
     datacenter: [
       {
         text: localization.virtualMachineOperations,

package/components/common/wizards/vm/migrate/Migrate.vue

@@ -109,7 +109,7 @@ const loading = ref<boolean>(false)
 const selectStorageSubmit = ref<number>(0)
 const selectComputeResourceSubmit = ref<number>(0)
 
-const selectedVMotionPriority = ref<UI_T_SelectVMotionPriority>('high-priority')
+const selectedVMotionPriority = ref<UI_T_SelectVMotionPriority>('high')
 
 const vmMigrateType = ref<UI_T_VmMigrateType>(
   props.project === 'procurator' ? 'storage' : 'resource'
@@ -128,10 +128,14 @@ const connectedStorageIdOnVm = computed<string>(
 )
 
 const dataFormLocal = ref<UI_I_CollectedDataFormLocal>({
+  selectedComputeResource: null,
   selectStorage: null,
+  selectedVMotionPriority: 'high'
 })
 
-const onSelectComputeResourceAndNext = (_event: any): void => {
+const onSelectComputeResourceAndNext = (event: any): void => {
+  dataFormLocal.value.selectedComputeResource = event
+
   onNextStep(true)
 }
 const onSelectStorageAndNext = (event: UI_I_SelectStorageReadyData): void => {

package/components/common/wizards/vm/migrate/models/interfaces.ts

@@ -3,6 +3,7 @@ import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/models/in
 import type { UI_T_VmMigrateType } from '~/components/common/wizards/vm/migrate/models/types'
 import type { UI_T_VmMigrateSelectStorageTab } from '~/components/common/wizards/vm/migrate/select/storage/models/types'
 import type { UI_I_SelectStorageReadyData } from '~/components/common/wizards/vm/migrate/select/storage/models/interfaces'
+import type { UI_T_SelectVMotionPriority } from '~/components/common/wizards/vm/migrate/select/priority/models/types'
 import type { UI_T_Project } from '~/models/types'
 export interface UI_I_MigrateVerticalStepItem extends UI_I_VerticalStepItem {
   id: string
@@ -16,5 +17,7 @@ export interface UI_I_MigrateReadyBlockData extends UI_I_TableInfoItem {
 }
 
 export interface UI_I_CollectedDataFormLocal {
+  selectedComputeResource: any
   selectStorage: UI_I_SelectStorageReadyData
+  selectedVMotionPriority: UI_T_SelectVMotionPriority
 }

package/components/common/wizards/vm/migrate/select/computeResource/ComputeResource.vue

@@ -30,9 +30,13 @@
       />
 
       <common-wizards-vm-migrate-select-compute-resource-table-view
-        v-model:selected-data="selectedData"
-        :data-table="[]"
+        v-model:selected-data="selectedTableDataKeys[activeTab]"
+        :get-compute-resource-data="props.getComputeResourceData"
+        :data-table="props.computeResourceData?.items || []"
+        :total-items="props.computeResourceData?.total_items || 0"
+        :total-pages="props.computeResourceData?.total_pages || 1"
         :type="activeTab"
+        :loading="loading"
       />
     </template>
 
@@ -45,16 +49,20 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_Localization } from '~/models/interfaces'
+import type { UI_I_Localization, UI_I_Pagination } from '~/models/interfaces'
 import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/models/interfaces'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/models/interfaces'
+import type { UI_I_TablePayload } from '~/models/store/interfaces'
 import type { UI_T_SelectComputeResourceTabType } from '~/components/common/wizards/vm/migrate/select/storage/models/types'
+import type { UI_E_ComputeResourceTabKamelKeys } from '~/components/common/wizards/vm/migrate/select/computeResource/models/enums'
 import type { UI_T_VmMigrateType } from '~/components/common/wizards/vm/migrate/models/types'
 import { vmMigrateComputeResourceTabsFunc } from '~/components/common/wizards/vm/migrate/select/computeResource/config/tabsPannel'
 
 const props = defineProps<{
   submit: number
+  getComputeResourceData: (payload: UI_I_TablePayload) => Promise<void>
   migrateType: UI_T_VmMigrateType
+  computeResourceData: any
   computeResourceTree: UI_I_TreeNode
 }>()
 const emits = defineEmits<{
@@ -71,10 +79,35 @@ const selectStorageTabs = computed<UI_I_CollapseNavItem[]>(() =>
 
 const computeResourceDataLocal = ref<any>({
   selectedNode: null,
+  host: null,
+  cluster: null,
+  resourcePool: null,
+  vApps: null,
 })
 
-const nodes = ref<UI_I_TreeNode[]>([])
+const selectedTableDataKeys = ref<any>({
+  host: null,
+  cluster: null,
+  'resource-pool': null,
+  'v-apps': null,
+})
+watch(
+  selectedTableDataKeys,
+  (newValue) => {
+    if (!props.computeResourceData?.items.length) return
+
+    const data = props.computeResourceData.items.find(
+      (_: never, key: number) => newValue[activeTab.value] === key
+    )
+    if (data) {
+      const dataKeys = UI_E_ComputeResourceTabKamelKeys[activeTab.value]
+      computeResourceDataLocal.value[dataKeys] = data
+    }
+  },
+  { immediate: true, deep: true }
+)
 
+const nodes = ref<UI_I_TreeNode[]>([])
 watch(
   props.computeResourceTree,
   (newValue) => {
@@ -142,14 +175,39 @@ const onHideErrorMessageAlert = (): void => {
 
 const selectedData = ref([])
 
+const loading = ref<boolean>(false)
+const sort = ref<string | null>(null)
+const pagination = ref<UI_I_Pagination>({
+  page: 1,
+  pageSize: 100,
+})
+const getTableData = (): void => {
+  loading.value = true
+
+  const payload = {
+    pagination: pagination.value,
+    sortBy: sort.value,
+    type: 'hosts',
+  }
+
+  props.getComputeResourceData(payload).then(() => {
+    loading.value = false
+  })
+}
 const checkValidityBlock = (): boolean => {
-  if (!selectedData.value) {
+  const hasSelectedData = Object.values(computeResourceDataLocal.value).some(
+    (value) => value !== null
+  )
+
+  if (!hasSelectedData) {
     const errorText = localization.value.selectValidDestinationComputeResource
-    //
+
     errorMessages.value = [errorText]
     return false
   }
-  emits('next-step', {})
+  emits('next-step', {
+    ...computeResourceDataLocal.value,
+  })
   return true
 }
 watch(

package/components/common/wizards/vm/migrate/select/computeResource/models/enums.ts

@@ -0,0 +1,6 @@
+export enum UI_E_ComputeResourceTabKamelKeys {
+  host = 'host',
+  cluster = 'cluster',
+  'resource-pool' = 'resourcePool',
+  'v-apps' = 'vApps',
+}

package/components/common/wizards/vm/migrate/select/computeResource/tableView/TableView.vue

@@ -1,20 +1,37 @@
 <template>
-  <div class="table-wrap">
+  <div class="data-table-view">
     <atoms-table-data-grid
       v-model:selected-row="selectedRow"
       v-model:column-keys="columnKeys"
       v-model:page-size="pagination.pageSize"
       v-model:page="pagination.page"
-      type="checkbox"
       :head-items="headItems"
       :body-items="bodyItems"
-      :total-items="bodyItems.length"
-      :total-pages="1"
+      :total-items="props.totalItems"
+      :total-pages="props.totalPages"
+      :loading="props.loading"
+      class="data-table"
       server-off
-      hide-footer
       hide-page-size
-      @sorting="sorting"
+      hide-pagination
     >
+      <template #icon="{ item }">
+        <span :class="['datagrid-cell-icon', item.data.iconClassName]" />
+
+        <span class="text-ellipsis">
+          {{ item.text }}
+        </span>
+      </template>
+      <template #progress="{ item }">
+        <div class="flex-align-center w-100">
+          <div class="progress flex-1">
+            <progress class="progress-block" :max="100" :value="item.data" />
+          </div>
+          <span class="text-ellipsis ml-1" :title="item.text">{{
+            item.text
+          }}</span>
+        </div>
+      </template>
     </atoms-table-data-grid>
   </div>
 </template>
@@ -26,20 +43,24 @@ import type {
   UI_I_HeadItem,
   UI_I_BodyItem,
 } from '~/components/atoms/table/dataGrid/models/interfaces'
-import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/table/disk/models/interfaces'
 import type { UI_T_SelectComputeResourceTabType } from '~/components/common/wizards/vm/migrate/select/storage/models/types'
+import type { UI_I_TablePayload } from '~/models/store/interfaces'
 import * as hostTable from '~/components/common/wizards/vm/migrate/select/computeResource/tableView/config/hostTable'
 import * as clusterTable from '~/components/common/wizards/vm/migrate/select/computeResource/tableView/config/clusterTable'
 import * as resourcePoolTable from '~/components/common/wizards/vm/migrate/select/computeResource/tableView/config/resourcePoolTable'
 import * as vAppsTable from '~/components/common/wizards/vm/migrate/select/computeResource/tableView/config/vappsTable'
 
 const props = defineProps<{
-  selectedData: number[]
-  dataTable: UI_I_StorageConfigurePerDiskItem[]
+  getComputeResourceData: (payload: UI_I_TablePayload) => Promise<void>
+  selectedData: number
+  dataTable: any
+  totalItems: number
+  totalPages: number
   type: UI_T_SelectComputeResourceTabType
+  loading: boolean
 }>()
 const emits = defineEmits<{
-  (event: 'update:selected-data', value: number[] | null): void
+  (event: 'update:selected-data', value: number): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -62,29 +83,39 @@ watch(localization, () => {
 })
 
 const bodyItems = computed<UI_I_BodyItem[][]>(() => {
-  return table[props.type].bodyItems(props.dataTable)
+  return table[props.type].bodyItems(props.dataTable, localization.value)
 })
 
-const sort = ref<string | null>(null)
 const pagination = ref<UI_I_Pagination>({
   page: 1,
   pageSize: 100,
 })
 
-const sorting = (data: [string, boolean]): void => {
-  const [column, status] = data
-  const direction = status ? 'asc' : 'desc'
-  sort.value = `${column}.${direction}`
-}
-
-const selectedRow = computed<number[]>({
+const selectedRow = computed<number>({
   get() {
     return props.selectedData
   },
-  set(newValue: number[]) {
+  set(newValue: number) {
     emits('update:selected-data', newValue)
   },
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+@import 'assets/scss/common/mixins.scss';
+.data-table-view {
+  @include flex($dir: column);
+  overflow: hidden;
+  height: inherit;
+  max-height: 250px;
+  .data-table {
+    @include flex($dir: column);
+    flex-direction: column;
+    overflow: hidden;
+    height: inherit;
+    :deep(.datagrid-outer-wrapper) {
+      height: inherit;
+    }
+  }
+}
+</style>

package/components/common/wizards/vm/migrate/select/computeResource/tableView/config/hostTable.ts

@@ -14,7 +14,6 @@ import {
 } from '~/components/common/config/states'
 // import type { I_TableIconColumnData } from '~/components/templates/inventory/mainBlock/tablesView/models/interfaces'
 // import type { API_I_HostTableItem } from '~/models/store/inventory/host/interfaces'
-import { E_StatusEnum } from '~/components/templates/inventory/treeView/models/enums'
 import { hostTableItemKeys } from '~/components/common/wizards/vm/migrate/select/computeResource/tableView/config/tableKeys'
 
 const getItems = (
@@ -24,7 +23,7 @@ const getItems = (
     [localization.name, true, '180px', hostTableItemKeys[0]],
     [localization.state, true, '96px', hostTableItemKeys[1]],
     [localization.cluster, true, '180px', hostTableItemKeys[2]],
-    [localization.faultDomain, true, '180px', hostTableItemKeys[3]],
+    [localization.faultDomain, false, '180px', hostTableItemKeys[3]],
     [`${localization.consumedCpu} %`, true, '180px', hostTableItemKeys[4]],
     [`${localization.consumedMemory} %`, true, '180px', hostTableItemKeys[5]],
     [localization.haState, true, '180px', hostTableItemKeys[6]],
@@ -48,8 +47,7 @@ export const columnKeys = (
 ): UI_I_ColumnKey[] => {
   const result: UI_I_ColumnKey[] = []
   getItems(localization).forEach((item, i) => {
-    const col =
-      i === 0 ? 'icon' : i === 5 || i === 6 ? 'progress' : `col${i + 1}`
+    const col = i === 0 ? 'icon' : i === 4 || i === 5 ? 'progress' : `col${i}`
     result.push(constructColumnKey(col, item[0], item[1]))
   })
   return result
@@ -58,8 +56,7 @@ export const columnKeys = (
 export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
   const result: UI_I_HeadItem[] = []
   getItems(localization).forEach((item, i) => {
-    const col =
-      i === 0 ? 'icon' : i === 5 || i === 6 ? 'progress' : `col${i + 1}`
+    const col = i === 0 ? 'icon' : i === 4 || i === 5 ? 'progress' : `col${i}`
     result.push(constructHeadItem(col, item[0], item[3], false, item[2]))
   })
   return result
@@ -73,23 +70,10 @@ export const bodyItems = (
 
   const bodyItems: UI_I_BodyItem[][] = []
   data.forEach((host, key) => {
-    const hostData: any = {
+    const hostData = {
       iconClassName: `vsphere-icon-${hostIconByState[host.state]}`,
-      name: host.name,
-      // @ts-ignore TODO id надо для перехода, пока что так оставить чтобы нигде не ломалось потом поправить для всех
-      id: host.name,
-      nav: 'h',
-      type: 'host',
-      isLink: true,
     }
 
-    const clusterData: any = {
-      iconClassName: E_StatusEnum.cluster_Normal,
-      name: host.cluster,
-      nav: 'h',
-      type: 'cluster',
-      isLink: true,
-    }
     bodyItems.push([
       {
         key: 'icon',
@@ -98,17 +82,16 @@ export const bodyItems = (
         id: key,
       },
       {
-        key: 'col2',
+        key: 'col1',
         text: localization[hostLocalizationByState[host[hostTableItemKeys[1]]]],
         id: key,
       },
       {
-        key: 'col3',
+        key: 'col2',
         text: host[hostTableItemKeys[2]],
-        data: clusterData,
         id: key,
       },
-      { key: 'col4', text: host[hostTableItemKeys[3]], id: key },
+      { key: 'col3', text: host[hostTableItemKeys[3]], id: key },
       {
         key: 'progress',
         text: `${host[hostTableItemKeys[4]].toFixed(2)}%`,
@@ -121,19 +104,19 @@ export const bodyItems = (
         data: host[hostTableItemKeys[5]],
         id: key,
       },
-      { key: 'col7', text: host[hostTableItemKeys[6]], id: key },
-      { key: 'col8', text: host[hostTableItemKeys[7]], id: key },
-      { key: 'col9', text: host[hostTableItemKeys[8]], id: key },
+      { key: 'col6', text: host[hostTableItemKeys[6]], id: key },
+      { key: 'col7', text: host[hostTableItemKeys[7]], id: key },
+      { key: 'col8', text: host[hostTableItemKeys[8]], id: key },
       {
-        key: 'col10',
+        key: 'col9',
         text: `${$number.format(host[hostTableItemKeys[9]], 'en')} ${
           localization.mb
         }`,
         id: key,
       },
-      { key: 'col11', text: host[hostTableItemKeys[10]], id: key },
-      { key: 'col12', text: host[hostTableItemKeys[11]], id: key },
-      { key: 'col13', text: host[hostTableItemKeys[12]], id: key },
+      { key: 'col10', text: host[hostTableItemKeys[10]], id: key },
+      { key: 'col11', text: host[hostTableItemKeys[11]], id: key },
+      { key: 'col12', text: host[hostTableItemKeys[12]], id: key },
       { key: 'col14', text: host[hostTableItemKeys[13]], id: key },
     ])
   })

package/components/common/wizards/vm/migrate/select/priority/config/typeOptions.ts

@@ -7,13 +7,13 @@ export const vmMigrateSelectPriorityTypesFunc = (
   return [
     {
       label: localization.scheduleVMotionWithHighPriority,
-      value: 'high-priority',
+      value: 'high',
       disabled: false,
       description: localization.scheduleVMotionWithHighPriorityDesc,
     },
     {
       label: localization.scheduleNormalVMotion,
-      value: 'schedule-normal',
+      value: 'normal',
       disabled: false,
       description: localization.scheduleNormalVMotionDesc,
     },

package/components/common/wizards/vm/migrate/select/priority/models/types.ts

@@ -1 +1 @@
-export type UI_T_SelectVMotionPriority = 'high-priority' | 'schedule-normal'
+export type UI_T_SelectVMotionPriority = 'high' | 'normal'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.2.160",
+  "version": "1.2.162",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",