bfg-common 1.2.147 → 1.2.149

package/assets/localization/local_be.json

@@ -2114,5 +2114,12 @@
   "sourceNetwork": "Крынічная сетка",
   "usedBy": "Выкарыстоўваецца",
   "destinationNetwork": "Сетка прызначэння",
-  "vm": "ВМ"
+  "vm": "ВМ",
+  "savedVCenterServers": "Захаваныя серверы vCenter",
+  "newVCenterServer": "Новы сервер vCenter",
+  "noSavedVCenterServerAddressesFound": "Захаваных адрасоў сервера vCenter не знойдзена.",
+  "vCenterServerAddress": "Адрас сервера vCenter",
+  "saveVCenterServerAddress": "Захаваць адрас сервера vCenter",
+  "discard": "Адкідаць",
+  "ioControl": "Io Control"
 }

package/assets/localization/local_en.json

@@ -2117,5 +2117,12 @@
   "sourceNetwork": "Source Network",
   "usedBy": "Used By",
   "destinationNetwork": "Destination Network",
-  "vm": "VM"
+  "vm": "VM",
+  "savedVCenterServers": "Saved vCenter servers",
+  "newVCenterServer": "New vCenter server",
+  "noSavedVCenterServerAddressesFound": "No saved vCenter Server addresses found.",
+  "vCenterServerAddress": "vCenter Server address",
+  "saveVCenterServerAddress": "Save vCenter Server address",
+  "discard": "Discard",
+  "ioControl": "Io Control"
 }

package/assets/localization/local_hy.json

@@ -2117,5 +2117,12 @@
   "sourceNetwork": "Աղբյուր ցանց",
   "usedBy": "Օգտագործված է",
   "destinationNetwork": "Նպատակային ցանց",
-  "vm": "VM"
+  "vm": "VM",
+  "savedVCenterServers": "Պահված vCenter սերվերներ",
+  "newVCenterServer": "Նոր vCenter սերվեր",
+  "noSavedVCenterServerAddressesFound": "Պահված vCenter Server հասցեներ չեն գտնվել:",
+  "vCenterServerAddress": "vCenter սերվերի հասցեն",
+  "saveVCenterServerAddress": "Պահպանեք vCenter սերվերի հասցեն",
+  "discard": "Հրաժարվել",
+  "ioControl": "Io Control"
 }

package/assets/localization/local_kk.json

@@ -2117,5 +2117,12 @@
   "sourceNetwork": "Бастапқы желі",
   "usedBy": "Қолданған",
   "destinationNetwork": "Мақсатты желі",
-  "vm": "ВМ"
+  "vm": "ВМ",
+  "savedVCenterServers": "Сақталған vCenter серверлері",
+  "newVCenterServer": "Жаңа vCenter сервері",
+  "noSavedVCenterServerAddressesFound": "Сақталған vCenter сервер мекенжайлары табылмады.",
+  "vCenterServerAddress": "vCenter серверінің мекенжайы",
+  "saveVCenterServerAddress": "vCenter серверінің мекенжайын сақтаңыз",
+  "discard": "Жою",
+  "ioControl": "Io басқару"
 }

package/assets/localization/local_ru.json

@@ -2117,5 +2117,12 @@
   "sourceNetwork": "Исходная сеть",
   "usedBy": "Использован",
   "destinationNetwork": "Сеть назначения",
-  "vm": "ВМ"
+  "vm": "ВМ",
+  "savedVCenterServers": "Сохраненные серверы vCenter",
+  "newVCenterServer": "Новый сервер vCenter",
+  "noSavedVCenterServerAddressesFound": "Сохраненных адресов серверов vCenter не найдено.",
+  "vCenterServerAddress": "Адрес сервера vCenter",
+  "saveVCenterServerAddress": "Сохранить адрес сервера vCenter",
+  "discard": "Отказаться",
+  "ioControl": "Ио-контроль"
 }

package/assets/localization/local_zh.json

@@ -2117,5 +2117,12 @@
   "sourceNetwork": "来源网络",
   "usedBy": "使用者",
   "destinationNetwork": "目的地网络",
-  "vm": "虚拟机"
+  "vm": "虚拟机",
+  "savedVCenterServers": "已保存的 vCenter 服务器",
+  "newVCenterServer": "新的 vCenter 服务器",
+  "noSavedVCenterServerAddressesFound": "找不到已保存的 vCenter Server 地址。",
+  "vCenterServerAddress": "vCenter 服务器地址",
+  "saveVCenterServerAddress": "保存 vCenter Server 地址",
+  "discard": "丢弃",
+  "ioControl": "IO控制"
 }

package/components/common/wizards/datastore/add/utils.ts

@@ -19,14 +19,12 @@ import {
 
 export const checkValidityName = async (
   name: string,
-  mode: UI_T_WizardDatastoreMode = 'procurator'
+  _mode: UI_T_WizardDatastoreMode = 'procurator'
 ): Promise<UI_I_DatastoreValidityName> => {
-  let api = '/api/v1'
-  mode === 'procurator' && (api = '/ui')
 
   // @ts-ignore
   const { error } = await useMyFetch<null, API_UI_I_Error>(
-    `${api}/ds/validate?name=${name}`,
+    `/ui/ds/validate?name=${name}`,
     {
       method: 'GET',
     }

package/components/common/wizards/vm/common/computeResource/TreeView.vue

@@ -0,0 +1,61 @@
+<template>
+  <div class="tree-view">
+    <atoms-loader-pre-loader
+      v-show="loading"
+      id="loader"
+      class="absolute-center tree-view__loading"
+      :show="true"
+    />
+    <common-recursion-tree
+      :nodes="props.computeResourceTree"
+      class="recursion-tree"
+      @get-nodes="onShowNodes"
+      @select-node="onSelectNode"
+      @contextmenu.prevent
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_TreeNode } from '~/node_modules/bfg-common/components/common/recursionTree/models/interfaces'
+
+const props = defineProps<{
+  modelValue: UI_I_TreeNode | null
+  computeResourceTree: UI_I_TreeNode[]
+}>()
+
+const emits = defineEmits<{
+  (event: 'update:modelValue', value: UI_I_TreeNode): void
+  (
+    event: 'get-compute-resource-tree',
+    value: { id: string | number; cb: () => void }
+  ): void
+  (event: 'show-compute-resource-tree', value: UI_I_TreeNode): void
+  (event: 'select-compute-resource-tree', value: UI_I_TreeNode): void
+  (event: 'clear-compute-resource-tree'): void
+}>()
+
+const loading = ref<boolean>(false)
+const onShowNodes = (event: any): void => {
+  emits('show-compute-resource-tree', event)
+}
+const onSelectNode = (node: UI_I_TreeNode): void => {
+  emits('select-compute-resource-tree', node)
+
+  emits('update:modelValue', node)
+}
+</script>
+
+<style scoped lang="scss">
+.tree-view {
+  &__loading {
+    :deep(.spinner.spinner-inverse) {
+      position: static;
+      width: 45px;
+      height: 45px;
+      min-width: 45px;
+      min-height: 45px;
+    }
+  }
+}
+</style>

package/components/common/wizards/vm/common/validation/compatibility/Compatibility.vue

@@ -4,8 +4,8 @@
     <div class="flex-align-center compatibility__content">
       <template v-if="!props.loading">
         <div class="compatibility__message">
-          <div class="icon icon-status-ok" />
-          <span>{{ localization.compatibilityChecksSucceeded }}</span>
+          <div :class="['icon', iconStatus]" />
+          <span>{{ validationText }}</span>
         </div>
       </template>
     </div>
@@ -14,10 +14,13 @@
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/models/interfaces'
+import { UI_E_ValidationCompatibilityStatusIcon } from '~/components/common/wizards/vm/common/validation/models/enums'
 
 const props = withDefaults(
   defineProps<{
     loading?: boolean
+    text: string
+    status: 'Error' | 'Success' | 'Warning'
   }>(),
   {
     loading: true,
@@ -25,6 +28,12 @@ const props = withDefaults(
 )
 
 const localization = computed<UI_I_Localization>(() => useLocal())
+
+const iconStatus = computed<string>(
+  () => UI_E_ValidationCompatibilityStatusIcon[props.status]
+)
+
+const validationText = computed<string>(() => localization.value[props.text])
 </script>
 
 <style lang="scss" scoped>

package/components/common/wizards/vm/common/validation/models/enums.ts

@@ -0,0 +1,5 @@
+export enum UI_E_ValidationCompatibilityStatusIcon {
+  Success = 'icon-status-ok',
+  Error = 'vsphere-icon-status-error',
+  Warning = 'vsphere-icon-status-warning',
+}

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

@@ -28,8 +28,14 @@
           :project="props.project"
         />
 
+        <common-wizards-vm-migrate-select-target-server
+          v-show="currentBlockId === 'select-target-center'"
+        />
+
         <common-wizards-vm-migrate-select-compute-resource
           v-show="currentBlockId === 'select-compute-resource'"
+          :migrate-type="vmMigrateType"
+          :compute-resource-tree="props.computeResourceTree"
         />
 
         <common-wizards-vm-migrate-select-storage
@@ -37,7 +43,7 @@
           :submit="selectStorageSubmit"
           :get-datastore-table-func="props.getDatastoreTableFunc"
           :datastore="props.datastore"
-          :connected-storage-id="connectedStorageIdOnVm"
+          :connected-storage-id-default="connectedStorageIdOnVm"
           :configure-per-disks="props.configurePerDisks"
           @next-step="onSelectStorageAndNext"
         />
@@ -48,6 +54,7 @@
 
         <common-wizards-vm-migrate-select-priority
           v-show="currentBlockId === 'select-motion-priority'"
+          v-model="selectedVMotionPriority"
         />
       </div>
 
@@ -66,10 +73,13 @@ import type { UI_I_TablePayload } from '~/models/store/interfaces'
 import type { UI_I_DatastoreTableItem } from '~/models/store/storage/interfaces'
 import type { UI_I_VmSettings } from '~/models/store/vm/interfaces'
 import type { UI_T_VmMigrateType } from '~/components/common/wizards/vm/migrate/models/types'
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/models/interfaces'
 import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/table/disk/models/interfaces'
 import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/models/interfaces'
 import type { UI_I_SelectStorageReadyData } from '~/components/common/wizards/vm/migrate/select/storage/models/interfaces'
-import { UI_I_MigrateVerticalStepItem } from '~/components/common/wizards/vm/migrate/models/interfaces'
+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 { stepItemsFunc } from '~/components/common/wizards/vm/migrate/utils'
 import { constructDataReadyViewFunc } from '~/components/common/wizards/vm/migrate/config/constructDataReady'
 
@@ -80,6 +90,7 @@ const props = defineProps<{
   getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
   datastore: UI_I_DatastoreTableItem[]
   configurePerDisks: UI_I_StorageConfigurePerDiskItem[]
+  computeResourceTree?: UI_I_TreeNode
   readyCompleteTableInfo?: any // пока так потом если будет нужен изменит или удалить
   finishFunc: any
 }>()
@@ -95,6 +106,8 @@ const loading = ref<boolean>(false)
 
 const selectStorageSubmit = ref<number>(0)
 
+const selectedVMotionPriority = ref<UI_T_SelectVMotionPriority>('high-priority')
+
 const vmMigrateType = ref<UI_T_VmMigrateType>(
   props.project === 'procurator' ? 'storage' : 'resource'
 )
@@ -111,15 +124,34 @@ const connectedStorageIdOnVm = computed<string>(
   () => props.vmSettings?.storage.id || ''
 )
 
+const dataFormLocal = ref<UI_I_CollectedDataFormLocal>({
+  selectStorage: null,
+})
+
 const onSelectStorageAndNext = (event: UI_I_SelectStorageReadyData): void => {
-  dataReadyView.value = constructDataReadyViewFunc<UI_I_SelectStorageReadyData>(
-    vmMigrateType.value,
-    props.vmName,
-    event
-  )
+  dataFormLocal.value.selectStorage = event
+  // dataReadyView.value = constructDataReadyViewFunc<UI_I_SelectStorageReadyData>(
+  //   vmMigrateType.value,
+  //   props.vmName,
+  //   event
+  // )
 
   onNextStep(true)
 }
+
+watch(
+  currentBlockId,
+  (newValue: string) => {
+    if (newValue !== 'ready-complete') return
+
+    dataReadyView.value = constructDataReadyViewFunc<any>(
+      vmMigrateType.value,
+      props.vmName,
+      dataFormLocal.value
+    )
+  },
+  { deep: true, immediate: true }
+)
 const onFinish = (): void => {
   loading.value = true
   props.finishFunc().then(() => {

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

@@ -2,20 +2,26 @@ 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 { UI_I_MigrateReadyBlockData } from '~/components/common/wizards/vm/migrate/models/interfaces'
-import { UI_I_SelectStorageReadyData } from '~/components/common/wizards/vm/migrate/select/storage/models/interfaces'
+import {
+  UI_I_CollectedDataFormLocal,
+  UI_I_MigrateReadyBlockData,
+} from '~/components/common/wizards/vm/migrate/models/interfaces'
+import { UI_E_SelectStorageDiskFormat } from '~/components/common/wizards/vm/migrate/select/storage/models/enums'
+// import { UI_I_SelectStorageReadyData } from '~/components/common/wizards/vm/migrate/select/storage/models/interfaces'
 import { vmDiskFormatOptions } from '~/components/common/wizards/vm/migrate/select/storage/diskFormat/config/formatOptions'
 
 const storageDetailsFunc = (
   localization: UI_I_Localization,
   migrationType: string,
   name: string,
-  event: UI_I_SelectStorageReadyData
+  event: UI_I_CollectedDataFormLocal
 ): UI_I_MigrateReadyBlockData[] => {
-  const isActivePerDiskTab: boolean = event.tab === 'configure-disk'
+  const { selectStorage } = event
+
+  const isActivePerDiskTab: boolean = selectStorage.tab === 'configure-disk'
 
   const diskFormat = vmDiskFormatOptions().find(
-    (file) => file.value === event.vmDiskFormat
+    (file) => file.value === selectStorage.vmDiskFormat
   )!
 
   let result: UI_I_MigrateReadyBlockData[] = [
@@ -31,7 +37,7 @@ const storageDetailsFunc = (
     },
     {
       label: localization.storage,
-      value: event.storage?.name,
+      value: selectStorage.storage?.name,
       permissions: ['batch-configure'],
     },
     {
@@ -40,43 +46,56 @@ const storageDetailsFunc = (
       permissions: ['batch-configure'],
     },
     {
-      label: localization.diskFormat,
-      value: diskFormat.text,
+      label: name,
+      value: '',
       permissions: ['configure-disk'],
     },
   ]
 
-  if (isActivePerDiskTab && event.configureDisks) {
-    const perDiskItems: UI_I_MigrateReadyBlockData[] = event.configureDisks.map(
-      (item) => ({
-        label: item.name,
-        value: `${item.file} ${item.disk_format}`,
-        permissions: ['configure-disk'],
-        isProperty: true,
+  if (isActivePerDiskTab && selectStorage.configureDisks) {
+    const perDiskItems: UI_I_MigrateReadyBlockData[] =
+      selectStorage.configureDisks.map((disk) => {
+        const isConfigurationFile = disk.file === 'Configuration file'
+        const diskFormat = UI_E_SelectStorageDiskFormat[disk.disk_format]
+
+        const text = isConfigurationFile
+          ? disk.storage
+          : `${disk.storage} (${diskFormat})`
+
+        return {
+          label: disk.file,
+          value: text,
+          permissions: ['configure-disk'],
+          isProperty: true,
+        }
       })
-    )
     result = result.concat(perDiskItems)
   }
 
-  return result.filter((option) => option.permissions.includes(event.tab))
+  return result.filter((option) =>
+    option.permissions.includes(selectStorage.tab)
+  )
 }
-export const constructDataReadyViewFunc = <T>(
+export const constructDataReadyViewFunc = (
   type: UI_T_VmMigrateType,
   name: string,
-  data: T
+  data: UI_I_CollectedDataFormLocal
 ): UI_I_TableInfoItem[] => {
   const localization: UI_I_Localization = useLocal()
 
-  const details = {
-    storage: storageDetailsFunc,
-  }
+  // const details = {
+  //   storage: storageDetailsFunc,
+  //   'resource-storage': storageDetailsFunc, //  временно чтобы не было ошибка при исползоване сфере
+  // }
 
   const migrationType = localization[UI_E_VmMigrationType[type]]
 
-  return details[type as keyof typeof details](
-    localization,
-    migrationType,
-    name,
-    data
-  )
+  return storageDetailsFunc(localization, migrationType, name, data)
+
+  // return details[type as keyof typeof details](
+  //   localization,
+  //   migrationType,
+  //   name,
+  //   data
+  // )
 }

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

@@ -2,8 +2,8 @@ import type { UI_I_VerticalStepItem } from '~/components/atoms/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 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_Project } from '~/models/types'
-
 export interface UI_I_MigrateVerticalStepItem extends UI_I_VerticalStepItem {
   id: string
   project: UI_T_Project[]
@@ -14,3 +14,7 @@ export interface UI_I_MigrateVerticalStepItem extends UI_I_VerticalStepItem {
 export interface UI_I_MigrateReadyBlockData extends UI_I_TableInfoItem {
   permissions: UI_T_VmMigrateSelectStorageTab[]
 }
+
+export interface UI_I_CollectedDataFormLocal {
+  selectStorage: UI_I_SelectStorageReadyData
+}

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

@@ -1,33 +1,141 @@
 <template>
   <div class="compute-resource">
-    <atoms-tabs
-      v-model="activeTab"
-      test-id="migrate-select-storage-tabs"
-      :items="selectStorageTabs"
-      size="small"
-      class="compute-resource__tabs"
-    />
+    <div
+      v-if="props.migrateType === 'resource-storage'"
+      class="tree-view-wrap mt-1"
+    >
+      <common-wizards-vm-common-compute-resource-tree-view
+        v-model="computeResourceDataLocal.selectedNode"
+        :compute-resource-tree="nodes"
+        @show-compute-resource-tree="onShowComputeResourceTree"
+        @select-compute-resource-tree="onSelectComputeResourceTree"
+      />
+    </div>
+
+    <template v-else>
+      <atoms-tabs
+        v-model="activeTab"
+        test-id="migrate-select-storage-tabs"
+        :items="selectStorageTabs"
+        size="small"
+        class="compute-resource__tabs"
+      />
 
-    <common-wizards-vm-common-validation-compatibility />
+      <common-wizards-vm-migrate-select-compute-resource-table-view
+        v-model:selected-data="selectedData"
+        :data-table="[]"
+        :type="activeTab"
+      />
+    </template>
+
+    <common-wizards-vm-common-validation-compatibility
+      :loading="!computeResourceDataLocal.selectedNode"
+      :status="compatibilityText[0]"
+      :text="compatibilityText[1]"
+    />
   </div>
 </template>
 
 <script lang="ts" setup>
 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_T_SelectComputeResourceTabType } from '~/components/common/wizards/vm/migrate/select/storage/models/types'
+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<{
+  migrateType: UI_T_VmMigrateType
+  computeResourceTree: UI_I_TreeNode
+}>()
+
 const localization = computed<UI_I_Localization>(() => useLocal())
+const { $recursion } = useNuxtApp()
 
 const activeTab = ref<UI_T_SelectComputeResourceTabType>('host')
 const selectStorageTabs = computed<UI_I_CollapseNavItem[]>(() =>
   vmMigrateComputeResourceTabsFunc(localization.value)
 )
+
+const computeResourceDataLocal = ref<any>({
+  selectedNode: null,
+})
+
+const nodes = ref<UI_I_TreeNode[]>([])
+
+watch(
+  props.computeResourceTree,
+  (newValue) => {
+    if (nodes.value.length) return
+
+    nodes.value = useDeepCopy([newValue])
+  },
+  { immediate: true, deep: true }
+)
+
+const onShowComputeResourceTree = ({
+  node,
+  cb,
+}: {
+  node: UI_I_TreeNode
+  cb: () => void
+}): void => {
+  $recursion.findAndShow(
+    nodes.value,
+    [node.id, node.type],
+    ['id', 'type'],
+    'nodes'
+  )
+  cb()
+}
+const onSelectComputeResourceTree = (node: UI_I_TreeNode): void => {
+  $recursion.findAndActivate(
+    nodes.value,
+    [node.type, node.id],
+    ['type', 'id'],
+    'nodes'
+  )
+}
+const compatibilityText = computed<[string, string]>(() => {
+  const { selectedNode } = computeResourceDataLocal.value
+
+  if (!selectedNode) return ['Success', '']
+
+  let res: [string, string] = ['Success', 'compatibilityChecksSucceeded']
+
+  if (selectedNode.type === 'datacenter' || selectedNode.type === 'folder') {
+    res = ['Error', 'selectValidClusterOrHostDestination']
+  }
+  if (selectedNode.type === 'cluster') {
+    const hasHost = !!selectedNode.nodes.length
+    if (!hasHost) {
+      res = ['Error', 'clusterNotContainAnyHosts']
+    }
+  }
+
+  if (selectedNode.type === 'host') {
+    if (selectedNode.state === 'Error') {
+      // TODO check Maintenance Mode
+      res = ['Error', 'selectedHostDisconnectedMaintenanceMode']
+    }
+  }
+
+  return res
+})
+
+const selectedData = ref([])
 </script>
 
 <style lang="scss" scoped>
 .compute-resource {
+  .tree-view-wrap {
+    max-height: 250px;
+    min-height: 200px;
+    position: relative;
+    border: 1px solid #000;
+    padding: 5px 0 0 5px;
+    overflow: auto;
+  }
   &__tabs {
     width: 100%;
     :deep(.nav) {