bfg-common 1.2.178 → 1.2.180

package/assets/localization/local_be.json

@@ -2130,5 +2130,7 @@
   "required": "Неабходны",
   "notRunnable": "Не паддаецца запуску",
   "failCount": "Колькасць збояў",
-  "updatesNewerVersionSupported": "падтрымліваюцца абнаўлення толькі да больш новай версіі"
+  "updatesNewerVersionSupported": "падтрымліваюцца абнаўлення толькі да больш новай версіі",
+  "vMotionPriority": "Прыярытэт vMotion",
+  "noNetworkReassignments": "Няма перапрызначэння сеткі"
 }

package/assets/localization/local_en.json

@@ -2133,5 +2133,7 @@
   "required": "Required",
   "notRunnable": "Not Runnable",
   "failCount": "Fail Count",
-  "updatesNewerVersionSupported": "updates only to newer version supported"
+  "updatesNewerVersionSupported": "updates only to newer version supported",
+  "vMotionPriority": "vMotion Priority",
+  "noNetworkReassignments": "No network reassignments"
 }

package/assets/localization/local_hy.json

@@ -2133,5 +2133,7 @@
   "required": "Պահանջվող",
   "notRunnable": "Չի գործարկվում",
   "failCount": "Խափանումների քանակը",
-  "updatesNewerVersionSupported": "աջակցվում են միայն նոր տարբերակի թարմացումները"
+  "updatesNewerVersionSupported": "աջակցվում են միայն նոր տարբերակի թարմացումները",
+  "vMotionPriority": "vMotion Priority",
+  "noNetworkReassignments": "Ցանցի վերաբաշխումներ չկան"
 }

package/assets/localization/local_kk.json

@@ -2133,5 +2133,7 @@
   "required": "Міндетті",
   "notRunnable": "Іске Қосу Мүмкін Емес",
   "failCount": "Сәтсіз Санау",
-  "updatesNewerVersionSupported": "тек қолдау көрсетілетін жаңа нұсқаға жаңартулар"
+  "updatesNewerVersionSupported": "тек қолдау көрсетілетін жаңа нұсқаға жаңартулар",
+  "vMotionPriority": "vMotion басымдылығы",
+  "noNetworkReassignments": "Желіні қайта тағайындау жоқ"
 }

package/assets/localization/local_ru.json

@@ -2133,5 +2133,7 @@
   "required": "Требуемый",
   "notRunnable": "Не поддается запуску",
   "failCount": "Количество сбоев",
-  "updatesNewerVersionSupported": "поддерживаются обновления только до более новой версии"
+  "updatesNewerVersionSupported": "поддерживаются обновления только до более новой версии",
+  "vMotionPriority": "Приоритет vMotion",
+  "noNetworkReassignments": "Никаких переназначений сети"
 }

package/assets/localization/local_zh.json

@@ -2133,5 +2133,7 @@
   "required": "必需的",
   "notRunnable": "不可运行",
   "failCount": "失败计数",
-  "updatesNewerVersionSupported": "仅更新到支持的较新版本"
+  "updatesNewerVersionSupported": "仅更新到支持的较新版本",
+  "vMotionPriority": "vMotion 优先级",
+  "noNetworkReassignments": "无需重新分配网络"
 }

package/components/common/tools/Actions.vue

@@ -1,164 +1,167 @@
-<template>
-  <div
-    :id="id"
-    class="btn-group"
-    :style="{ 'padding-right': rightSpace + 'px' }"
-  >
-    <div v-for="(button, key) in props.actions" :key="button.type">
-      <label v-if="button.uploaded">
-        <span :class="[`btn btn-link ${props.size}`]">
-          {{ button.text }}
-        </span>
-        <input
-          :id="`select-file-button-${key}`"
-          type="file"
-          :disabled="button.disabled"
-          :multiple="false"
-          class="btn-group__file"
-          @change="(event) => onSelectFiles(event, button.type)"
-        />
-      </label>
-
-      <button
-        v-else
-        :id="`actions-button-${key}`"
-        :class="[`btn btn-link ${props.size}`]"
-        :disabled="button.disabled"
-        @click="onClickButton(button.type)"
-      >
-        {{ button.text }}
-      </button>
-    </div>
-    <atoms-collapse-nav
-      v-show="collapsedItems.length"
-      :test-id="`${props.testId}-item`"
-      :items="collapsedItems"
-      close-after-click
-      @change="onClickButton"
-      @select-file="onSelectFiles"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Button } from '~/components/common/tools/models/interfaces'
-import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/models/interfaces'
-
-const props = withDefaults(
-  defineProps<{
-    actions: UI_I_Button[]
-    testId: string
-    size?: 'btn-sm' | ''
-  }>(),
-  {
-    size: 'btn-sm',
-  }
-)
-const emits = defineEmits<{
-  (event: 'click', value1: string, value2?: Event | null): void
-}>()
-
-const onClickButton = (type: string): void => {
-  emits('click', type)
-}
-
-const onSelectFiles = (event: Event, type: string): void => {
-  emits('click', type, event)
-}
-
-const visibleCount = ref<number>(props.actions.length)
-const collapsedItems = computed<UI_I_CollapseNavItem[]>(() => {
-  return props.actions
-    .filter((_, index) => {
-      return index >= visibleCount.value
-    })
-    .map((item) => {
-      return {
-        text: item.text,
-        value: item.type,
-        disabled: item.disabled,
-        uploaded: item.uploaded,
-      }
-    })
-})
-
-const rightSpace = ref<number>(0)
-watch(
-  collapsedItems,
-  (newValue) => {
-    let space = 0
-    const element: any = document.getElementById(id.value)
-    if (!element || !newValue.length) space = 0
-    else if (element.lastChild?.className?.includes('tabs-overflow')) {
-      space =
-        element.getBoundingClientRect().right -
-        element.lastChild.getBoundingClientRect().left
-    }
-
-    rightSpace.value = space
-  },
-  { deep: true }
-)
-
-const outputSize = (): void => {
-  const el = document.getElementById(id.value)
-  if (!el) return
-
-  const elWidth = el.clientWidth
-  const elItems = el.children
-  const elItemsMarginLeft = parseInt(getComputedStyle(elItems[0]).marginLeft)
-  const elItemsMarginRight = parseInt(getComputedStyle(elItems[0]).marginRight)
-  const childrenMarginY = elItemsMarginLeft + elItemsMarginRight
-
-  let childrenWidth = 0
-  let count = 0
-  for (let i = 0; i < elItems.length; i++) {
-    childrenWidth += elItems[i].clientWidth + childrenMarginY
-    const isWrap = elWidth - rightSpace.value < childrenWidth
-
-    if (isWrap) break
-    count++
-  }
-
-  visibleCount.value = count
-}
-
-const setResizeObserve = (): void => {
-  const el = document.getElementById(id.value)
-
-  if (!el) {
-    setTimeout(setResizeObserve, 0)
-    return
-  }
-
-  new ResizeObserver(outputSize).observe(el)
-}
-const id = ref<string>('')
-onMounted(() => {
-  id.value = `tool-actions-${useUniqueId()}`
-  setResizeObserve()
-})
-</script>
-
-<style lang="scss" scoped>
-.btn {
-  &:disabled {
-    color: var(--btn-link-disabled);
-  }
-  &-group {
-    margin-top: 10px;
-    box-shadow: none;
-    position: relative;
-    overflow: hidden;
-    display: flex;
-    flex-wrap: wrap;
-    min-height: 25px;
-    height: 25px;
-    box-sizing: content-box;
-
-    &__file {
-      display: none;
-    }
-  }
-}
-</style>
+<template>
+  <div
+    :id="id"
+    class="btn-group"
+    :style="{ 'padding-right': rightSpace + 'px' }"
+  >
+    <div v-for="(button, key) in props.actions" :key="button.type">
+      <label v-if="button.uploaded">
+        <span :class="[`btn btn-link ${props.size}`]">
+          <slot name="icon" :data="button" />
+          {{ button.text }}
+        </span>
+        <input
+          :id="`select-file-button-${key}`"
+          type="file"
+          :disabled="button.disabled"
+          :multiple="false"
+          class="btn-group__file"
+          @change="(event) => onSelectFiles(event, button.type)"
+        />
+      </label>
+
+      <button
+        v-else
+        :id="`actions-button-${key}`"
+        :class="[`btn btn-link ${props.size}`]"
+        :disabled="button.disabled"
+        @click="onClickButton(button.type)"
+      >
+        <slot name="icon" :data="button" />
+        {{ button.text }}
+      </button>
+    </div>
+    <atoms-collapse-nav
+      v-show="collapsedItems.length"
+      :test-id="`${props.testId}-item`"
+      :items="collapsedItems"
+      close-after-click
+      @change="onClickButton"
+      @select-file="onSelectFiles"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Button } from '~/components/common/tools/models/interfaces'
+import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/models/interfaces'
+
+const props = withDefaults(
+  defineProps<{
+    actions: UI_I_Button[]
+    testId: string
+    size?: 'btn-sm' | ''
+  }>(),
+  {
+    size: 'btn-sm',
+  }
+)
+const emits = defineEmits<{
+  (event: 'click', value1: string, value2?: Event | null): void
+}>()
+
+const onClickButton = (type: string): void => {
+  emits('click', type)
+}
+
+const onSelectFiles = (event: Event, type: string): void => {
+  emits('click', type, event)
+}
+
+const visibleCount = ref<number>(props.actions.length)
+const collapsedItems = computed<UI_I_CollapseNavItem[]>(() => {
+  return props.actions
+    .filter((_, index) => {
+      return index >= visibleCount.value
+    })
+    .map((item) => {
+      return {
+        text: item.text,
+        value: item.type,
+        disabled: item.disabled,
+        uploaded: item.uploaded,
+      }
+    })
+})
+
+const rightSpace = ref<number>(0)
+watch(
+  collapsedItems,
+  (newValue) => {
+    let space = 0
+    const element: any = document.getElementById(id.value)
+    if (!element || !newValue.length) space = 0
+    else if (element.lastChild?.className?.includes('tabs-overflow')) {
+      space =
+        element.getBoundingClientRect().right -
+        element.lastChild.getBoundingClientRect().left
+    }
+
+    rightSpace.value = space
+  },
+  { deep: true }
+)
+
+const outputSize = (): void => {
+  const el = document.getElementById(id.value)
+  if (!el) return
+
+  const elWidth = el.clientWidth
+  const elItems = el.children
+  const elItemsMarginLeft = parseInt(getComputedStyle(elItems[0]).marginLeft)
+  const elItemsMarginRight = parseInt(getComputedStyle(elItems[0]).marginRight)
+  const childrenMarginY = elItemsMarginLeft + elItemsMarginRight
+
+  let childrenWidth = 0
+  let count = 0
+  for (let i = 0; i < elItems.length; i++) {
+    childrenWidth += elItems[i].clientWidth + childrenMarginY
+    const isWrap = elWidth - rightSpace.value < childrenWidth
+
+    if (isWrap) break
+    count++
+  }
+
+  visibleCount.value = count
+}
+
+const setResizeObserve = (): void => {
+  const el = document.getElementById(id.value)
+
+  if (!el) {
+    setTimeout(setResizeObserve, 0)
+    return
+  }
+
+  new ResizeObserver(outputSize).observe(el)
+}
+const id = ref<string>('')
+onMounted(() => {
+  id.value = `tool-actions-${useUniqueId()}`
+  setResizeObserve()
+})
+
+</script>
+
+<style lang="scss" scoped>
+.btn {
+  &:disabled {
+    color: var(--btn-link-disabled);
+  }
+  &-group {
+    margin-top: 10px;
+    box-shadow: none;
+    position: relative;
+    overflow: hidden;
+    display: flex;
+    flex-wrap: wrap;
+    min-height: 25px;
+    height: 25px;
+    box-sizing: content-box;
+
+    &__file {
+      display: none;
+    }
+  }
+}
+</style>

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

@@ -35,7 +35,9 @@
         <common-wizards-vm-migrate-select-compute-resource
           v-show="currentBlockId === 'select-compute-resource'"
           :submit="selectComputeResourceSubmit"
+          :get-compute-resource-data="props.getComputeResourceData"
           :migrate-type="vmMigrateType"
+          :compute-resource-data="props.computeResourceTableData"
           :compute-resource-tree="props.computeResourceTree"
           @next-step="onSelectComputeResourceAndNext"
         />
@@ -82,6 +84,7 @@ import type { UI_I_SelectStorageReadyData } from '~/components/common/wizards/vm
 import type { UI_I_MigrateVerticalStepItem } from '~/components/common/wizards/vm/migrate/models/interfaces'
 import type { UI_T_SelectVMotionPriority } from '~/components/common/wizards/vm/migrate/select/priority/models/types'
 import type { UI_I_CollectedDataFormLocal } from '~/components/common/wizards/vm/migrate/models/interfaces'
+import type { UI_I_ComputeResourceDataLocal } from '~/components/common/wizards/vm/migrate/select/computeResource/models/interfaces'
 import { stepItemsFunc } from '~/components/common/wizards/vm/migrate/utils'
 import { constructDataReadyViewFunc } from '~/components/common/wizards/vm/migrate/config/constructDataReady'
 
@@ -90,8 +93,10 @@ const props = defineProps<{
   vmSettings: UI_I_VmSettings | null
   vmName: string
   getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
+  getComputeResourceData: (payload: UI_I_TablePayload) => Promise<void>
   datastore: UI_I_DatastoreTableItem[]
   configurePerDisks: UI_I_StorageConfigurePerDiskItem[]
+  computeResourceTableData?: any
   computeResourceTree?: UI_I_TreeNode
   readyCompleteTableInfo?: any // пока так потом если будет нужен изменит или удалить
   finishFunc: any
@@ -109,7 +114,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 +133,16 @@ const connectedStorageIdOnVm = computed<string>(
 )
 
 const dataFormLocal = ref<UI_I_CollectedDataFormLocal>({
+  selectedComputeResource: null,
   selectStorage: null,
+  selectedVMotionPriority: 'high',
 })
 
-const onSelectComputeResourceAndNext = (_event: any): void => {
+const onSelectComputeResourceAndNext = (
+  event: UI_I_ComputeResourceDataLocal
+): void => {
+  dataFormLocal.value.selectedComputeResource = event
+
   onNextStep(true)
 }
 const onSelectStorageAndNext = (event: UI_I_SelectStorageReadyData): void => {

package/components/common/wizards/vm/migrate/config/constructDataReady.ts

@@ -1,5 +1,4 @@
 import type { UI_I_Localization } from '~/models/interfaces'
-import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/models/interfaces'
 import type { UI_T_VmMigrateType } from '~/components/common/wizards/vm/migrate/models/types'
 import { UI_E_VmMigrationType } from '~/components/common/wizards/vm/migrate/models/enums'
 import {
@@ -80,7 +79,7 @@ export const constructDataReadyViewFunc = (
   type: UI_T_VmMigrateType,
   name: string,
   data: UI_I_CollectedDataFormLocal
-): UI_I_TableInfoItem[] => {
+): UI_I_MigrateReadyBlockData[] => {
   const localization: UI_I_Localization = useLocal()
 
   // const details = {

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

@@ -3,7 +3,9 @@ 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'
+import type { UI_I_ComputeResourceDataLocal } from '~/components/common/wizards/vm/migrate/select/computeResource/models/interfaces'
 export interface UI_I_MigrateVerticalStepItem extends UI_I_VerticalStepItem {
   id: string
   project: UI_T_Project[]
@@ -16,5 +18,7 @@ export interface UI_I_MigrateReadyBlockData extends UI_I_TableInfoItem {
 }
 
 export interface UI_I_CollectedDataFormLocal {
+  selectedComputeResource: UI_I_ComputeResourceDataLocal
   selectStorage: UI_I_SelectStorageReadyData
+  selectedVMotionPriority: UI_T_SelectVMotionPriority
 }

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

@@ -30,8 +30,11 @@
       />
 
       <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"
       />
     </template>
@@ -48,13 +51,18 @@
 import type { UI_I_Localization } 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 type { UI_I_SelectedTableDataKeys } from '~/components/common/wizards/vm/migrate/select/computeResource/models/interfaces'
 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<UI_I_SelectedTableDataKeys>({
+  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) => {
@@ -140,16 +173,20 @@ const onHideErrorMessageAlert = (): void => {
   errorMessages.value = []
 }
 
-const selectedData = ref([])
-
 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/models/interfaces.ts

@@ -0,0 +1,30 @@
+import type { UI_T_ComputeResourceTableItem } from '~/components/common/wizards/vm/migrate/select/computeResource/models/types'
+import type {
+  UI_I_HostTableItem,
+  UI_I_ClusterTableItem,
+  UI_I_ResourcePoolsTableItem,
+  UI_I_VAppsTableItem,
+} from '~/components/common/wizards/vm/migrate/select/computeResource/tableView/models/interfaces'
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/models/interfaces'
+import type { API_UI_I_DataTable } from '~/models/interfaces'
+
+export interface UI_I_SelectedTableDataKeys {
+  host: UI_I_HostTableItem | null
+  cluster: UI_I_ClusterTableItem | null
+  'resource-pool': UI_I_ResourcePoolsTableItem | null
+  'v-apps': UI_I_VAppsTableItem | null
+}
+
+export interface UI_I_ComputeResourceDataLocal {
+  selectedNode: UI_I_TreeNode | null
+  host: UI_I_HostTableItem | null
+  cluster: UI_I_ClusterTableItem | null
+  resourcePool: UI_I_ResourcePoolsTableItem | null
+  vApps: UI_I_VAppsTableItem | null
+}
+
+export interface API_UI_I_ComputeResourceTableData
+  extends API_UI_I_DataTable<UI_T_ComputeResourceTableItem[]> {}
+
+export interface UI_I_ComputeResourceTableData
+  extends API_UI_I_ComputeResourceTableData {}

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

@@ -0,0 +1,12 @@
+import type {
+  UI_I_HostTableItem,
+  UI_I_ClusterTableItem,
+  UI_I_ResourcePoolsTableItem,
+  UI_I_VAppsTableItem,
+} from '~/components/common/wizards/vm/migrate/select/computeResource/tableView/models/interfaces'
+
+export type UI_T_ComputeResourceTableItem =
+  | UI_I_HostTableItem
+  | UI_I_ClusterTableItem
+  | UI_I_ResourcePoolsTableItem
+  | UI_I_VAppsTableItem

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="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,24 +43,34 @@ 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 type { UI_T_ComputeResourceTableItem } from '~/components/common/wizards/vm/migrate/select/computeResource/models/types'
 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: UI_T_ComputeResourceTableItem[]
+  totalItems: number
+  totalPages: number
   type: UI_T_SelectComputeResourceTabType
 }>()
 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())
 
+const loading = ref<boolean>(false)
+const pagination = ref<UI_I_Pagination>({
+  page: 1,
+  pageSize: 100,
+})
+
 const table: any = {
   host: hostTable,
   cluster: clusterTable,
@@ -51,6 +78,26 @@ const table: any = {
   'v-apps': vAppsTable,
 }
 
+const getData = async (
+  type: UI_T_SelectComputeResourceTabType
+): Promise<void> => {
+  const payload: UI_I_TablePayload = {
+    pagination: pagination.value,
+    sortBy: null,
+    schema: 'full',
+    type,
+  }
+
+  props.getComputeResourceData(payload).then(() => {})
+}
+watch(
+  () => props.type,
+  (newValue: UI_T_SelectComputeResourceTabType) => {
+    getData(newValue)
+  },
+  { deep: true, immediate: true }
+)
+
 const headItems = computed<UI_I_HeadItem[]>(() =>
   table[props.type].headItems(localization.value)
 )
@@ -62,29 +109,34 @@ watch(localization, () => {
 })
 
 const bodyItems = computed<UI_I_BodyItem[][]>(() => {
-  return table[props.type].bodyItems(props.dataTable)
-})
-
-const sort = ref<string | null>(null)
-const pagination = ref<UI_I_Pagination>({
-  page: 1,
-  pageSize: 100,
+  return table[props.type].bodyItems(props.dataTable, localization.value)
 })
 
-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

@@ -12,9 +12,8 @@ import {
   hostIconByState,
   hostLocalizationByState,
 } from '~/components/common/config/states'
+import type { UI_I_HostTableItem } from '~/components/common/wizards/vm/migrate/select/computeResource/tableView/models/interfaces'
 // 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,38 +56,24 @@ 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
 }
 
 export const bodyItems = (
-  data: API_I_HostTableItem[],
+  data: UI_I_HostTableItem[],
   localization: UI_I_Localization
 ): UI_I_BodyItem[][] => {
   const { $number } = useNuxtApp()
 
   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/computeResource/tableView/models/interfaces.ts

@@ -0,0 +1,29 @@
+export interface API_UI_I_HostTableItem {
+  alarm_action: string
+  auto_deploy_machine_identity: string
+  cert_valid_to: string
+  cluster: string
+  consumed_cpu: number
+  consumed_mem: number
+  cpus: number
+  fault_domain: string
+  ha_state: string
+  instant_clone_maintenance: string
+  mem_size: number
+  name: string
+  nics: number
+  state: number
+  uptime: number
+  version: string
+}
+export interface UI_I_HostTableItem extends API_UI_I_HostTableItem {}
+
+export interface API_UI_I_ClusterTableItem {}
+export interface UI_I_ClusterTableItem extends API_UI_I_ClusterTableItem {}
+
+export interface API_UI_I_ResourcePoolsTableItem {}
+export interface UI_I_ResourcePoolsTableItem
+  extends API_UI_I_ResourcePoolsTableItem {}
+
+export interface API_UI_I_VAppsTableItem {}
+export interface UI_I_VAppsTableItem extends API_UI_I_VAppsTableItem {}

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/components/common/wizards/vm/migrate/select/storage/Storage.vue

@@ -1,5 +1,13 @@
 <template>
   <div class="select-storage">
+    <atoms-alert
+      v-if="errorMessages.length"
+      test-id="select-storage-alert"
+      status="alert-danger"
+      :items="errorMessages"
+      @remove="onHideErrorMessageAlert"
+    />
+
     <common-wizards-vm-migrate-select-storage-selected-per-disk
       v-if="isShowSelectedPerDisks"
       v-model="isShowSelectedPerDisks"
@@ -20,12 +28,12 @@
 
     <common-wizards-vm-migrate-select-storage-configure-batch
       v-show="activeTab === 'batch-configure'"
-      v-model:vm-disk-format="dataLocal.vmDiskFormat"
+      v-model:vm-disk-format="selectStorageDataLocal.vmDiskFormat"
       :get-datastore-table-func="props.getDatastoreTableFunc"
       :datastore="props.datastore"
       :connected-storage-id="connectedStorageId"
       :is-hide-select-disk-format="isHideSelectDiskFormat"
-      @update-selected-datastore="dataLocal.storage = $event"
+      @update-selected-datastore="selectStorageDataLocal.storage = $event"
     >
       <template v-if="isShowSelectedPerDisks" #buttonConfirm>
         <button class="btn btn-sm btn-primary" @click="onApplyChanges">
@@ -44,7 +52,7 @@
     />
 
     <common-wizards-vm-common-validation-compatibility
-      :loading="!dataLocal.storage"
+      :loading="!selectStorageDataLocal.storage"
       :status="'Success'"
       text="compatibilityChecksSucceeded"
     />
@@ -82,7 +90,11 @@ const selectStorageTabs = computed<UI_I_CollapseNavItem[]>(() =>
   vmMigrateSelectStorageTabsFunc(localization.value)
 )
 
-// const selectedStorage = ref<UI_I_DatastoreTableItem | null>(null)
+const errorMessages = ref<string[]>([])
+const selectStorageDataLocal = ref<UI_I_SelectStorageDataLocal>({
+  vmDiskFormat: 0,
+  storage: null,
+})
 const isShowSelectedPerDisks = ref<boolean>(false)
 
 const selectedPerDiskKeys = ref<number[]>([])
@@ -106,7 +118,7 @@ const onChangePerDiskStorage = (
   event: UI_I_StorageConfigurePerDiskItem[]
 ): void => {
   connectedStorageIdLocal.value = event[0].extra.datastore_id
-  dataLocal.value.vmDiskFormat = event[0].disk_format
+  selectStorageDataLocal.value.vmDiskFormat = event[0].disk_format
 
   selectedPerDisks.value = event
 }
@@ -122,7 +134,7 @@ const onApplyChanges = (): void => {
     )!
 
     if (selectedDisk) {
-      const { storage, vmDiskFormat } = dataLocal.value
+      const { storage, vmDiskFormat } = selectStorageDataLocal.value
 
       // ;({ name: disk.storage, id: disk.extra.datastore_id } = storage)
       disk.storage = storage.name
@@ -144,23 +156,21 @@ const isHideSelectDiskFormat = computed<boolean>(() => {
     selectedPerDisks.value[0].file === 'Configuration file'
   )
 })
-
-const dataLocal = ref<UI_I_SelectStorageDataLocal>({
-  vmDiskFormat: 0,
-  storage: null,
-})
+const onHideErrorMessageAlert = (): void => {
+  errorMessages.value = []
+}
 
 const checkValidityBlock = (): boolean => {
-  if (!dataLocal.value.storage) {
-    // const errorText = localization.value.nameCannotBeBlank
-    //
-    // showValidationErrors(errorText)
+  if (!selectStorageDataLocal.value.storage) {
+    const errorText = localization.value.selectValidDestinationStorage
+
+    errorMessages.value = [errorText]
     return false
   }
+  onHideErrorMessageAlert()
   const isActivePerDiskTab = activeTab.value === 'configure-disk'
-
   emits('next-step', {
-    ...dataLocal.value,
+    ...selectStorageDataLocal.value,
     tab: activeTab.value,
     // ...(isActivePerDiskTab && { configureDisks: props.configurePerDisks }),
     configureDisks: isActivePerDiskTab

package/composables/useLocalStorage.ts

@@ -1,4 +1,4 @@
-const lastTimestamp = 1711014731910
+const lastTimestamp = 1711103624305
 
 export const useLocalStorage = (
   name: string,

package/package.json

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