bfg-common 1.5.552 → 1.5.553

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

@@ -28,12 +28,17 @@ const { $store, $recursion }: any = useNuxtApp()
 const computeResourceLocal = defineModel<UI_I_TreeNode | null>({
   required: true,
 })
-const props = defineProps<{
-  node: UI_I_TreeNode | null
-  alertMessages: string[]
-  compatibilityText: [UI_T_CompatibilityStatus, string]
-  isLoading: boolean
-}>()
+const props = withDefaults(
+  defineProps<{
+    node: UI_I_TreeNode | null
+    compatibilityText: [UI_T_CompatibilityStatus, string]
+    alertMessages?: string[] // используется только в старом виде
+    isLoading: boolean
+  }>(),
+  {
+    alertMessages: [],
+  }
+)
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const nodesLocal = ref<UI_I_TreeNode[]>([])

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

@@ -21,6 +21,7 @@
     :vm-info="vmInfo"
     :networks="networks"
     :vm-origin="vmOrigin"
+    :data-ready-view="dataReadyView"
     @change-steps="onChangeSteps"
     @submit="onMigrateVm"
     @hide="onHideModal"
@@ -48,6 +49,7 @@
     :vm-info="vmInfo"
     :networks="props.networks"
     :vm-origin="vmOrigin"
+    :data-ready-view="dataReadyView"
     @change-steps="onChangeSteps"
     @hide-alert="onHideAlert"
     @submit="onMigrateVm"

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

@@ -166,7 +166,12 @@
             </div>
           </div>
         </template>
-        <template #content> Content </template>
+        <template #content>
+          <common-ready-to-complete
+            v-if="selectedStep.id === dynamicSteps.readyComplete"
+            :data="props.dataReadyView"
+          />
+        </template>
       </ui-wizard-block>
     </template>
   </ui-wizard>
@@ -182,6 +187,7 @@ import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 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_MigrateFormLocal } from '~/components/common/wizards/vm/migrate/lib/models/interfaces'
 import type { UI_I_VmOrigin } from '~/components/common/wizards/vm/migrate/vmOrigin/lib/models/interfaces'
 import { dynamicSteps } from '~/components/common/wizards/vm/migrate/lib/config/steps'
@@ -196,6 +202,7 @@ const props = withDefaults(
     selectedNode: UI_I_TreeNode
     title: string
     vmOrigin: UI_I_VmOrigin | undefined
+    dataReadyView: UI_I_TableInfoItem
   }>(),
   {}
 )

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

@@ -48,7 +48,7 @@
           v-show="selectedStep.id === dynamicSteps.selectComputeResource"
           v-model="formModel"
           :vm-state="props.vmState"
-          :alert-messages="alertMessages[3]"
+          :alert-messages="alertMessages[dynamicSteps.selectComputeResource]"
           :get-compute-resource-data="props.getComputeResourceData"
           :compute-resource-data="props.computeResourceTableData"
           :compute-resource-tree="props.computeResourceTree"
@@ -95,7 +95,7 @@ import Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/util
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_MigrateFormLocal } from '~/components/common/wizards/vm/migrate/lib/models/interfaces'
-import type { UI_T_VmMigrateType } from '~/components/common/wizards/vm/migrate/select/type/lib/models/types'
+import type { UI_T_VmMigrateType } from '~/components/common/wizards/vm/migrate/steps/type/lib/models/types'
 import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
 import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
 import type { UI_I_VmSettings } from '~/lib/models/store/vm/interfaces'
@@ -105,7 +105,6 @@ import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/model
 import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
 import type { UI_I_VmOrigin } from '~/components/common/wizards/vm/migrate/vmOrigin/lib/models/interfaces'
 import { dynamicSteps } from '~/components/common/wizards/vm/migrate/lib/config/steps'
-import { constructDataReadyViewFunc } from '~/components/common/wizards/vm/migrate/lib/config/constructDataReady'
 
 const formModel = defineModel<UI_I_MigrateFormLocal>({ required: true })
 const modelSchedulerTask = defineModel<UI_I_ScheduleNewTasksForm>(
@@ -121,6 +120,7 @@ const props = withDefaults(
     title: string
     isScheduledTasks: boolean
     vmOrigin: UI_I_VmOrigin | undefined
+    dataReadyView: UI_I_TableInfoItem
     vmSettings: UI_I_VmSettings | null
     vmName: string
     getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
@@ -198,10 +198,6 @@ watch(
 const connectedStorageIdOnVm = computed<string>(
   () => props.vmSettings?.storage.id || ''
 )
-
-const dataReadyView = computed<UI_I_TableInfoItem>(() =>
-  constructDataReadyViewFunc(props.vmName, form.value)
-)
 const onHideModal = (): void => emits('hide')
 const onMigrateVm = (): void => emits('submit')
 </script>

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

@@ -1,11 +1,11 @@
 import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
 import type { UI_T_VmMigrateSelectStorageTab } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/types'
-import type { UI_T_VmMigrateType } from '~/components/common/wizards/vm/migrate/select/type/lib/models/types'
+import type { UI_T_VmMigrateType } from '~/components/common/wizards/vm/migrate/steps/type/lib/models/types'
 import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/configure/disk/table/lib/models/interfaces'
-import type { UI_T_SelectVMotionPriority } from '~/components/common/wizards/vm/migrate/select/priority/lib/models/types'
+import type { UI_T_SelectVMotionPriority } from '~/components/common/wizards/vm/migrate/steps/priority/lib/models/types'
 import type { UI_I_ConnectEsxiServerForm } from '~/components/common/wizards/vm/migrate/select/targetServer/new/lib/models/interfaces'
 import type { UI_I_SelectNetworksFormLocal } from '~/components/common/wizards/vm/migrate/select/network/lib/models/interfaces'
-import type { UI_I_ComputeResourceFormLocal } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/interfaces'
+import type { UI_I_ComputeResourceFormLocal } from '~/components/common/wizards/vm/migrate/steps/computeResource/lib/models/interfaces'
 
 export interface UI_I_MigrateFormLocal {
   migrate_type: UI_T_VmMigrateType

package/components/common/wizards/vm/migrate/lib/validations.ts

@@ -4,7 +4,7 @@ import type {
 } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
 import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_ComputeResourceFormLocal } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/interfaces'
+import type { UI_I_ComputeResourceFormLocal } from '~/components/common/wizards/vm/migrate/steps/computeResource/lib/models/interfaces'
 import { dynamicSteps } from '~/components/common/wizards/vm/migrate/lib/config/steps'
 
 export const checkSelectedDatastoreSync = (
@@ -47,7 +47,7 @@ export const checkSelectedResourceSync = (
       dynamicSteps.selectComputeResource,
       'resource',
       {
-        fieldMessage: '',
+        fieldMessage: localization.common.selectValidDestinationComputeResource,
         alertMessage: localization.common.selectValidDestinationComputeResource,
       }
     )

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

@@ -12,6 +12,8 @@
     :get-compute-resource-data="props.getComputeResourceData"
     :compute-resource-data="props.computeResourceData"
     :select-storage-tabs="selectStorageTabs"
+    :alert-messages="props.alertMessages"
+    @hide-alert="emits('hide-alert', $event)"
   />
 </template>
 
@@ -30,13 +32,14 @@ import { vmMigrateComputeResourceTabsFunc } from '~/components/common/wizards/vm
 const model = defineModel<UI_I_MigrateFormLocal>({ required: true })
 const props = withDefaults(
   defineProps<{
-    alertMessages: string[]
     getComputeResourceData: (payload: UI_I_TablePayload) => Promise<void>
     computeResourceData: any
     computeResourceTree: UI_I_TreeNode | null
+    alertMessages?: string[] // используется только в старом виде
     vmState?: number
   }>(),
   {
+    alertMessages: undefined,
     vmState: undefined,
   }
 )

package/components/common/wizards/vm/migrate/steps/computeResource/ComputeResourceNew.vue

@@ -1,22 +1,13 @@
 <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
+      <common-wizards-common-steps-compute-resource
         v-model="model.resource.selectedNode"
-        :compute-resource-tree="nodes"
-        @show-compute-resource-tree="onShowComputeResourceTree"
-        @select-compute-resource-tree="onSelectComputeResourceTree"
+        :node="props.computeResourceNode"
+        :compatibility-text="compatibilityText"
       />
     </div>
 
@@ -37,13 +28,12 @@
         :total-pages="props.computeResourceData?.total_pages || 1"
         :get-compute-resource-data="props.getComputeResourceData"
       />
+      <common-wizards-common-compatibility
+        :loading="!model.resource.selectedNode"
+        :status="compatibilityText[0]"
+        :text="compatibilityText[1]"
+      />
     </template>
-
-    <common-wizards-common-compatibility
-      :loading="!model.resource.selectedNode"
-      :status="compatibilityText[0]"
-      :text="compatibilityText[1]"
-    />
   </div>
 </template>
 
@@ -61,10 +51,9 @@ import { vmMigrateComputeResourceTabsFunc } from '~/components/common/wizards/vm
 
 const props = withDefaults(
   defineProps<{
-    alertMessages: string[]
     getComputeResourceData: (payload: UI_I_TablePayload) => Promise<void>
     computeResourceData: any
-    computeResourceTree: UI_I_TreeNode | null
+    computeResourceNode: UI_I_TreeNode | null
     vmState?: number
   }>(),
   {
@@ -73,12 +62,10 @@ const props = withDefaults(
 )
 const model = defineModel<UI_I_MigrateFormLocal>({ required: true })
 const emits = defineEmits<{
-  (event: 'hide-alert', value: number): void
-  (event: 'next-step', value: any): void
+  (event: 'next-step', value: any): void // TODO удалить
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-const { $recursion }: any = useNuxtApp()
 
 const activeTab = ref<UI_T_SelectComputeResourceTabType>('host')
 const selectStorageTabs = computed<UI_I_CollapseNavItem[]>(() =>
@@ -107,41 +94,6 @@ watch(
   },
   { 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
 
@@ -177,9 +129,6 @@ const compatibilityText = computed<[UI_T_CompatibilityStatus, string]>(() => {
 
   return res
 })
-const onHideAlert = (): void => {
-  emits('hide-alert', 3)
-}
 </script>
 
 <style lang="scss" scoped>

package/components/common/wizards/vm/migrate/steps/computeResource/ComputeResourceOld.vue

@@ -1,26 +1,26 @@
 <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
+      <common-wizards-common-steps-compute-resource
         v-model="model.resource.selectedNode"
-        :compute-resource-tree="nodes"
-        @show-compute-resource-tree="onShowComputeResourceTree"
-        @select-compute-resource-tree="onSelectComputeResourceTree"
+        :node="props.computeResourceNode"
+        :compatibility-text="compatibilityText"
+        :alert-messages="props.alertMessages"
       />
     </div>
 
     <template v-else>
+      <atoms-alert
+        v-show="props.alertMessages?.length"
+        :items="props.alertMessages"
+        test-id="compute-resource-alert"
+        status="alert-danger"
+        @remove="onHideAlert"
+      />
+
       <atoms-tabs
         v-model="activeTabLocal"
         :items="selectStorageTabs"
@@ -37,13 +37,13 @@
         :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]"
-    />
+      <common-wizards-common-compatibility
+        :loading="!model.resource.selectedNode"
+        :status="compatibilityText[0]"
+        :text="compatibilityText[1]"
+      />
+    </template>
   </div>
 </template>
 
@@ -58,15 +58,19 @@ import type { UI_I_SelectedTableDataKeys } from '~/components/common/wizards/vm/
 import type { UI_T_CompatibilityStatus } from '~/components/common/wizards/common/compatibility/lib/models/types'
 import { UI_E_ComputeResourceTabKamelKeys } from '~/components/common/wizards/vm/migrate/steps/computeResource/lib/models/enums'
 import { vmMigrateComputeResourceTabsFunc } from '~/components/common/wizards/vm/migrate/steps/computeResource/lib/config/tabsPannel'
+import { dynamicSteps } from '~/components/common/wizards/vm/migrate/lib/config/steps'
 
 const model = defineModel<UI_I_MigrateFormLocal>({ required: true })
-const activeTabLocal = defineModel<UI_T_SelectComputeResourceTabType>('activeTab',{ required: true })
+const activeTabLocal = defineModel<UI_T_SelectComputeResourceTabType>(
+  'activeTab',
+  { required: true }
+)
 const props = withDefaults(
   defineProps<{
     alertMessages: string[]
     getComputeResourceData: (payload: UI_I_TablePayload) => Promise<void>
     computeResourceData: any
-    computeResourceTree: UI_I_TreeNode | null
+    computeResourceNode: UI_I_TreeNode | null
     vmState?: number
   }>(),
   {
@@ -78,7 +82,6 @@ const emits = defineEmits<{
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-const { $recursion }: any = useNuxtApp()
 
 const selectStorageTabs = computed<UI_I_CollapseNavItem[]>(() =>
   vmMigrateComputeResourceTabsFunc(localization.value, props.vmState || -1)
@@ -107,40 +110,6 @@ watch(
   { 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
 
@@ -177,7 +146,7 @@ const compatibilityText = computed<[UI_T_CompatibilityStatus, string]>(() => {
   return res
 })
 const onHideAlert = (): void => {
-  emits('hide-alert', 3)
+  emits('hide-alert', dynamicSteps.selectComputeResource)
 }
 </script>
 

package/package.json

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