bfg-common 1.5.537 → 1.5.539

package/components/common/vm/actions/register/Register.vue

@@ -72,6 +72,7 @@ import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 import type { UI_I_NameTestIds } from '~/components/common/wizards/common/steps/name/lib/models/interfaces'
+import type { UI_T_CompatibilityStatus } from '~/components/common/wizards/common/compatibility/lib/models/types'
 import {
   dynamicSteps,
   stepsFunc,
@@ -87,7 +88,6 @@ const props = withDefaults(
     nameRequestUrl: string
     isLoadingComputeTree?: boolean // для сферы
     computeResourceAlert?: string[] // для сферы
-    compatibilityText?: [string, string] // для сферы
     dataCenter?: UI_I_TreeNode | null // для сферы
     computeResourceTree?: UI_I_TreeNode[] // для сферы
     locationNodes?: UI_I_TreeNode[] // для сферы
@@ -95,7 +95,6 @@ const props = withDefaults(
   {
     isLoadingComputeTree: false,
     computeResourceAlert: () => [],
-    compatibilityText: () => [],
     dataCenter: null,
     computeResourceTree: undefined,
     locationNodes: () => [],
@@ -216,7 +215,7 @@ const onCheckName = async (
     }
   })
 }
-const compatibilityText = computed<[string, string]>(() => {
+const compatibilityText = computed<[UI_T_CompatibilityStatus, string]>(() => {
   const { computeResource } = vmForm.value
 
   if (!computeResource)
@@ -225,7 +224,7 @@ const compatibilityText = computed<[string, string]>(() => {
       localization.value.vmWizard.noDestinationComputeResourceSelected,
     ]
 
-  let res: [string, string] = [
+  let res: [UI_T_CompatibilityStatus, string] = [
     'success',
     localization.value.common.compatibilityChecksSucceeded,
   ]
@@ -334,7 +333,8 @@ const onSelectComputeResourceTree = (node: UI_I_TreeNode): void => {
   emits('select-compute-resource-tree', node)
 }
 
-const computeResourceTreeLocal = computed<UI_I_TreeNode | null>(() => { // для сферы
+const computeResourceTreeLocal = computed<UI_I_TreeNode | null>(() => {
+  // для сферы
   return props.computeResourceTree?.[0] || null
 })
 </script>

package/components/common/wizards/common/{steps/computeResource/compatibility → compatibility}/Compatibility.vue

@@ -1,11 +1,11 @@
 <template>
-  <common-wizards-common-steps-compute-resource-compatibility-new
+  <common-wizards-common-compatibility-new
     v-if="isNewView"
     :status="props.status"
     :text="props.text"
     :loading="props.loading"
   />
-  <common-wizards-common-steps-compute-resource-compatibility-old
+  <common-wizards-common-compatibility-old
     v-else
     :status="props.status"
     :text="props.text"
@@ -13,10 +13,14 @@
 </template>
 
 <script lang="ts" setup>
+import type {
+  UI_T_CompatibilityStatus
+} from "~/components/common/wizards/common/compatibility/lib/models/types";
+
 const props = withDefaults(
   defineProps<{
     text: string
-    status: 'success' | 'warning' | 'error' | 'none'
+    status: UI_T_CompatibilityStatus
     loading?: boolean
   }>(),
   {

package/components/common/wizards/common/{steps/computeResource/compatibility → compatibility}/New.vue

@@ -35,11 +35,12 @@
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_CompatibilityStatus } from '~/components/common/wizards/common/compatibility/lib/models/types'
 
 const props = withDefaults(
   defineProps<{
     text: string
-    status: 'success' | 'warning' | 'error' | 'none'
+    status: UI_T_CompatibilityStatus
     loading?: boolean
   }>(),
   {

package/components/common/wizards/common/{steps/computeResource/compatibility → compatibility}/Old.vue

@@ -16,18 +16,17 @@
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import {
-  UI_E_ValidationCompatibilityStatusIcon
-} from "~/components/common/wizards/common/steps/computeResource/compatibility/lib/models/enums";
+import type { UI_T_CompatibilityStatus } from '~/components/common/wizards/common/compatibility/lib/models/types'
+import { UI_E_CompatibilityStatusIcon } from '~/components/common/wizards/common/compatibility/lib/models/enums'
 
 const props = defineProps<{
   text: string
-  status: 'success' | 'warning' | 'error' | 'none'
+  status: UI_T_CompatibilityStatus
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 const iconStatus = computed<string>(
-    () => UI_E_ValidationCompatibilityStatusIcon[props.status]
+  () => UI_E_CompatibilityStatusIcon[props.status]
 )
 </script>
 

package/components/common/wizards/common/{steps/computeResource/compatibility → compatibility}/lib/models/enums.ts

@@ -1,4 +1,4 @@
-export enum UI_E_ValidationCompatibilityStatusIcon {
+export enum UI_E_CompatibilityStatusIcon {
   success = 'icon-status-ok',
   warning = 'vsphere-icon-status-warning',
   error = 'vsphere-icon-status-error',

package/components/common/wizards/common/compatibility/lib/models/types.ts

@@ -0,0 +1 @@
+export type UI_T_CompatibilityStatus = 'success' | 'warning' | 'error' | 'none';

package/components/common/wizards/common/steps/computeResource/ComputeResource.vue

@@ -21,6 +21,7 @@
 
 <script lang="ts" setup>
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+import type { UI_T_CompatibilityStatus } from '~/components/common/wizards/common/compatibility/lib/models/types'
 
 const { $store, $recursion }: any = useNuxtApp()
 
@@ -30,7 +31,7 @@ const computeResourceLocal = defineModel<UI_I_TreeNode | null>({
 const props = defineProps<{
   node: UI_I_TreeNode | null
   alertMessages: string[]
-  compatibilityText: [string, string]
+  compatibilityText: [UI_T_CompatibilityStatus, string]
   isLoading: boolean
 }>()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])

package/components/common/wizards/common/steps/computeResource/New.vue

@@ -18,7 +18,7 @@
       </ui-tree>
     </div>
 
-    <common-wizards-common-steps-compute-resource-compatibility
+    <common-wizards-common-compatibility
       :loading="props.isLoading"
       :status="props.compatibility[0]"
       :text="props.compatibility[1]"
@@ -28,11 +28,12 @@
 
 <script setup lang="ts">
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+import type { UI_T_CompatibilityStatus } from '~/components/common/wizards/common/compatibility/lib/models/types'
 
 const props = withDefaults(
   defineProps<{
     nodes: UI_I_TreeNode[]
-    compatibility: [string, string]
+    compatibility: [UI_T_CompatibilityStatus, string]
     isLoading?: boolean
   }>(),
   {

package/components/common/wizards/common/steps/computeResource/Old.vue

@@ -25,7 +25,7 @@
       />
     </div>
 
-    <common-wizards-common-steps-compute-resource-compatibility
+    <common-wizards-common-compatibility
       :loading="props.isLoading"
       :status="props.compatibility[0]"
       :text="props.compatibility[1]"
@@ -35,12 +35,13 @@
 
 <script setup lang="ts">
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+import type { UI_T_CompatibilityStatus } from '~/components/common/wizards/common/compatibility/lib/models/types'
 
 const props = withDefaults(
   defineProps<{
     nodes: UI_I_TreeNode[]
     alertMessages: string[]
-    compatibility: [string, string]
+    compatibility: [UI_T_CompatibilityStatus, string]
     isLoading?: boolean
   }>(),
   {

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

@@ -1,195 +1,205 @@
-<template>
-  <div class="compute-resource">
-    <atoms-alert
-      v-show="props.alertMessages?.length"
-      :items="props.alertMessages"
-      test-id="compute-resource-alert"
-      status="alert-danger"
-      @remove="onHideAlert"
-    />
-
-    <div
-      v-if="model.migrate_type === 'resource-storage'"
-      class="tree-view-wrap mt-1"
-    >
-      <common-wizards-vm-common-compute-resource-tree-view
-        v-model="model.resource.selectedNode"
-        :compute-resource-tree="nodes"
-        @show-compute-resource-tree="onShowComputeResourceTree"
-        @select-compute-resource-tree="onSelectComputeResourceTree"
-      />
-    </div>
-
-    <template v-else>
-      <atoms-tabs
-        v-model="activeTab"
-        :items="selectStorageTabs"
-        test-id="migrate-select-storage-tabs"
-        size="small"
-        class="compute-resource__tabs"
-      />
-
-      <common-wizards-vm-migrate-select-compute-resource-table-view
-        v-model="selectedTableDataKeys[activeTab]"
-        :type="activeTab"
-        :data-table="props.computeResourceData?.items || []"
-        :total-items="props.computeResourceData?.total_items || 0"
-        :total-pages="props.computeResourceData?.total_pages || 1"
-        :get-compute-resource-data="props.getComputeResourceData"
-      />
-    </template>
-
-    <common-wizards-common-steps-compute-resource-compatibility
-      :loading="!model.resource.selectedNode"
-      :status="compatibilityText[0]"
-      :text="compatibilityText[1]"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
-import type { UI_T_SelectComputeResourceTabType } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/types'
-import type { UI_I_MigrateFormLocal } from '~/components/common/wizards/vm/migrate/lib/models/interfaces'
-import type { UI_I_SelectedTableDataKeys } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/interfaces'
-import { UI_E_ComputeResourceTabKamelKeys } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/enums'
-import { vmMigrateComputeResourceTabsFunc } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/config/tabsPannel'
-
-const props = withDefaults(
-  defineProps<{
-    alertMessages: string[]
-    getComputeResourceData: (payload: UI_I_TablePayload) => Promise<void>
-    computeResourceData: any
-    computeResourceTree: UI_I_TreeNode | null
-    vmState?: number
-  }>(),
-  {
-    vmState: undefined,
-  }
-)
-const model = defineModel<UI_I_MigrateFormLocal>({ required: true })
-const emits = defineEmits<{
-  (event: 'hide-alert', value: number): void
-  (event: 'next-step', value: any): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $recursion }: any = useNuxtApp()
-
-const activeTab = ref<UI_T_SelectComputeResourceTabType>('host')
-const selectStorageTabs = computed<UI_I_CollapseNavItem[]>(() =>
-  vmMigrateComputeResourceTabsFunc(localization.value, props.vmState || -1)
-)
-
-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]
-      model.value.resource[dataKeys] = data
-      model.value.resource.selectedNode = data
-    }
-  },
-  { immediate: true, deep: true }
-)
-
-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 } = model.value.resource
-
-  if (!selectedNode) return ['none', '']
-
-  let res: [string, string] = ['success', localization.value.common.compatibilityChecksSucceeded]
-
-  if (selectedNode.type === 'datacenter' || selectedNode.type === 'folder') {
-    res = ['error', localization.value.common.selectValidClusterOrHostDestination]
-  }
-  if (selectedNode.type === 'cluster') {
-    const hasHost = !!selectedNode.nodes.length
-    if (!hasHost) {
-      res = ['error', localization.value.common.clusterNotContainAnyHosts]
-    }
-  }
-
-  if (selectedNode.type === 'host') {
-    if (selectedNode.state === 'Error') {
-      // TODO check Maintenance Mode
-      res = ['error', localization.value.common.selectedHostDisconnectedMaintenanceMode]
-    }
-  }
-
-  return res
-})
-const onHideAlert = (): void => {
-  emits('hide-alert', 3)
-}
-</script>
-
-<style lang="scss" scoped>
-@import 'assets/scss/common/mixins';
-.compute-resource {
-  @include flex($dir: column);
-  height: inherit;
-  .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) {
-      margin-top: 0;
-    }
-  }
-}
-</style>
+<template>
+  <div class="compute-resource">
+    <atoms-alert
+      v-show="props.alertMessages?.length"
+      :items="props.alertMessages"
+      test-id="compute-resource-alert"
+      status="alert-danger"
+      @remove="onHideAlert"
+    />
+
+    <div
+      v-if="model.migrate_type === 'resource-storage'"
+      class="tree-view-wrap mt-1"
+    >
+      <common-wizards-vm-common-compute-resource-tree-view
+        v-model="model.resource.selectedNode"
+        :compute-resource-tree="nodes"
+        @show-compute-resource-tree="onShowComputeResourceTree"
+        @select-compute-resource-tree="onSelectComputeResourceTree"
+      />
+    </div>
+
+    <template v-else>
+      <atoms-tabs
+        v-model="activeTab"
+        :items="selectStorageTabs"
+        test-id="migrate-select-storage-tabs"
+        size="small"
+        class="compute-resource__tabs"
+      />
+
+      <common-wizards-vm-migrate-select-compute-resource-table-view
+        v-model="selectedTableDataKeys[activeTab]"
+        :type="activeTab"
+        :data-table="props.computeResourceData?.items || []"
+        :total-items="props.computeResourceData?.total_items || 0"
+        :total-pages="props.computeResourceData?.total_pages || 1"
+        :get-compute-resource-data="props.getComputeResourceData"
+      />
+    </template>
+
+    <common-wizards-common-compatibility
+      :loading="!model.resource.selectedNode"
+      :status="compatibilityText[0]"
+      :text="compatibilityText[1]"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
+import type { UI_T_SelectComputeResourceTabType } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/types'
+import type { UI_I_MigrateFormLocal } from '~/components/common/wizards/vm/migrate/lib/models/interfaces'
+import type { UI_I_SelectedTableDataKeys } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/interfaces'
+import type { UI_T_CompatibilityStatus } from '~/components/common/wizards/common/compatibility/lib/models/types'
+import { UI_E_ComputeResourceTabKamelKeys } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/enums'
+import { vmMigrateComputeResourceTabsFunc } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/config/tabsPannel'
+
+const props = withDefaults(
+  defineProps<{
+    alertMessages: string[]
+    getComputeResourceData: (payload: UI_I_TablePayload) => Promise<void>
+    computeResourceData: any
+    computeResourceTree: UI_I_TreeNode | null
+    vmState?: number
+  }>(),
+  {
+    vmState: undefined,
+  }
+)
+const model = defineModel<UI_I_MigrateFormLocal>({ required: true })
+const emits = defineEmits<{
+  (event: 'hide-alert', value: number): void
+  (event: 'next-step', value: any): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $recursion }: any = useNuxtApp()
+
+const activeTab = ref<UI_T_SelectComputeResourceTabType>('host')
+const selectStorageTabs = computed<UI_I_CollapseNavItem[]>(() =>
+  vmMigrateComputeResourceTabsFunc(localization.value, props.vmState || -1)
+)
+
+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]
+      model.value.resource[dataKeys] = data
+      model.value.resource.selectedNode = data
+    }
+  },
+  { immediate: true, deep: true }
+)
+
+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<[UI_T_CompatibilityStatus, string]>(() => {
+  const { selectedNode } = model.value.resource
+
+  if (!selectedNode) return ['none', '']
+
+  let res: [UI_T_CompatibilityStatus, string] = [
+    'success',
+    localization.value.common.compatibilityChecksSucceeded,
+  ]
+
+  if (selectedNode.type === 'datacenter' || selectedNode.type === 'folder') {
+    res = [
+      'error',
+      localization.value.common.selectValidClusterOrHostDestination,
+    ]
+  }
+  if (selectedNode.type === 'cluster') {
+    const hasHost = !!selectedNode.nodes.length
+    if (!hasHost) {
+      res = ['error', localization.value.common.clusterNotContainAnyHosts]
+    }
+  }
+
+  if (selectedNode.type === 'host') {
+    if (selectedNode.state === 'Error') {
+      // TODO check Maintenance Mode
+      res = [
+        'error',
+        localization.value.common.selectedHostDisconnectedMaintenanceMode,
+      ]
+    }
+  }
+
+  return res
+})
+const onHideAlert = (): void => {
+  emits('hide-alert', 3)
+}
+</script>
+
+<style lang="scss" scoped>
+@import 'assets/scss/common/mixins';
+.compute-resource {
+  @include flex($dir: column);
+  height: inherit;
+  .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) {
+      margin-top: 0;
+    }
+  }
+}
+</style>

package/components/common/wizards/vm/migrate/select/network/Network.vue

@@ -10,7 +10,7 @@
       :source-networks="sourceNetworks"
     />
 
-    <common-wizards-common-steps-compute-resource-compatibility
+    <common-wizards-common-compatibility
       :loading="false"
       :text="localization.common.compatibilityChecksSucceeded"
       status="success"

package/components/common/wizards/vm/migrate/select/storage/Storage.vue

@@ -54,7 +54,7 @@
       @update-selected-per-disks="onChangePerDiskStorage"
     />
 
-    <common-wizards-common-steps-compute-resource-compatibility
+    <common-wizards-common-compatibility
       :loading="!model.storage"
       :text="localization.common.compatibilityChecksSucceeded"
       status="success"

package/package.json

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