bfg-common 1.4.131 → 1.4.132

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

@@ -4,7 +4,7 @@
       show
       :wizard="wizard"
       :selected-scheme="selectedScheme"
-      :title="localization.migrate"
+      :title="localization.common.migrate"
       :localization="localization"
       class="migrate-vm-wizard"
       test-id="migrate-vm-wizard"
@@ -51,9 +51,9 @@
           v-model:network-data="dataFormLocal.selectNetwork.data"
         />
 
-        <common-wizards-vm-migrate-select-priority
-          v-if="false"
-          v-model="selectedVMotionPriority"
+        <common-wizards-vm-new-migrate-select-priority
+          v-if="selectedStep.id === 5"
+          v-model="form.vMotion_priority"
         />
 
         <common-ready-to-complete
@@ -88,7 +88,6 @@ import type { UI_I_VmSettings } from '~/lib/models/store/vm/interfaces'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vmNew/migrate/select/storage/configure/disk/table/lib/models/interfaces'
 import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
-import type { UI_T_SelectVMotionPriority } from '~/components/common/wizards/vm/migrate/select/priority/lib/models/types'
 import type { UI_I_CollectedDataFormLocal } from '~/components/common/wizards/vm/migrate/lib/models/interfaces'
 import { constructDataReadyViewFunc } from '~/components/common/wizards/vmNew/migrate/lib/config/constructDataReady'
 import * as validation from '~/components/common/wizards/vmNew/migrate/lib/validations'
@@ -119,7 +118,6 @@ const wizard: Wizard = new Wizard(
 const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
 const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
 
-const selectedVMotionPriority = ref<UI_T_SelectVMotionPriority>('high')
 const form = ref<UI_I_MigrateFormLocal>({
   migrate_type: props.project === 'procurator' ? 'storage' : 'resource',
   disk_format: 0,
@@ -128,6 +126,7 @@ const form = ref<UI_I_MigrateFormLocal>({
     type: 'batch-configure',
     disks: [],
   },
+  vMotion_priority: 'high',
 })
 
 const validationFunc = async (
@@ -202,8 +201,7 @@ const dataFormLocal = ref<UI_I_CollectedDataFormLocal>({
   selectNetwork: {
     isShowNetworkBasic: true,
     data: null,
-  },
-  selectedVMotionPriority: 'high',
+  }
 })
 const onFinish = (): void => {
   loading.value = true

package/components/common/wizards/vmNew/migrate/lib/config/constructDataReady.ts

@@ -5,11 +5,10 @@ import { UI_E_VmMigrationType } from '~/components/common/wizards/vm/migrate/lib
 import { UI_E_SelectStorageDiskFormat } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/enums'
 import { vmDiskFormatOptions } from '~/components/common/wizards/vm/migrate/select/storage/diskFormat/lib/config/formatOptions'
 
-const storageDetailsFunc = (
+const migrateOnlyStorageDataView = (
   localization: UI_I_Localization,
-  migrationType: string,
-  name: string,
-  form: UI_I_MigrateFormLocal
+  form: UI_I_MigrateFormLocal,
+  vmName: string
 ): UI_I_MigrateReadyBlockData[] => {
   const { disk_format, configure, storage } = form
 
@@ -19,17 +18,7 @@ const storageDetailsFunc = (
     (file) => file.value === disk_format
   )!
 
-  let result: UI_I_MigrateReadyBlockData[] = [
-    {
-      label: localization.common.migrationType,
-      value: migrationType,
-      permissions: ['batch-configure', 'configure-disk'],
-    },
-    {
-      label: localization.common.virtualMachine,
-      value: name,
-      permissions: ['batch-configure', 'configure-disk'],
-    },
+  let storageResult: UI_I_MigrateReadyBlockData[] = [
     {
       label: localization.common.storage,
       value: storage?.name,
@@ -41,7 +30,7 @@ const storageDetailsFunc = (
       permissions: ['batch-configure'],
     },
     {
-      label: name,
+      label: vmName,
       value: '',
       permissions: ['configure-disk'],
     },
@@ -65,10 +54,43 @@ const storageDetailsFunc = (
         }
       }
     )
-    result = result.concat(perDiskItems)
+    storageResult = [...storageResult, ...perDiskItems]
   }
 
-  return result.filter((option) => option.permissions.includes(configure.type))
+  return storageResult.filter(
+    (option) =>
+      !option.permissions.length || option.permissions.includes(configure.type)
+  )
+}
+
+const storageDetailsFunc = (
+  localization: UI_I_Localization,
+  name: string,
+  form: UI_I_MigrateFormLocal
+): UI_I_MigrateReadyBlockData[] => {
+  const { migrate_type } = form
+
+  const migrationType = localization.common[UI_E_VmMigrationType[migrate_type]]
+
+  let result: UI_I_MigrateReadyBlockData[] = [
+    {
+      label: localization.common.migrationType,
+      value: migrationType,
+      permissions: ['batch-configure', 'configure-disk'],
+    },
+    {
+      label: localization.common.virtualMachine,
+      value: name,
+      permissions: ['batch-configure', 'configure-disk'],
+    },
+  ]
+
+  if (migrate_type === 'storage') {
+    const storageData = migrateOnlyStorageDataView(localization, form, name)
+    result = [...result, ...storageData]
+  }
+
+  return result
 }
 export const constructDataReadyViewFunc = (
   name: string,
@@ -76,8 +98,5 @@ export const constructDataReadyViewFunc = (
 ): UI_I_MigrateReadyBlockData[] => {
   const localization: UI_I_Localization = useLocal()
 
-  const migrationType =
-    localization.common[UI_E_VmMigrationType[data.migrate_type]]
-
-  return storageDetailsFunc(localization, migrationType, name, data)
+  return storageDetailsFunc(localization, name, data)
 }

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

@@ -1,10 +1,10 @@
 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_I_SelectStorageReadyData } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/interfaces'
-import type { UI_T_SelectVMotionPriority } from '~/components/common/wizards/vm/migrate/select/priority/lib/models/types'
 import type { UI_I_ComputeResourceDataLocal } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/interfaces'
 import type { UI_T_VmMigrateType } from '~/components/common/wizards/vmNew/migrate/select/type/lib/models/types'
 import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/table/disk/lib/models/interfaces'
+import type { UI_T_SelectVMotionPriority } from '~/components/common/wizards/vmNew/migrate/select/priority/lib/models/types'
 
 export interface UI_I_MigrateFormLocal {
   migrate_type: UI_T_VmMigrateType
@@ -15,6 +15,8 @@ export interface UI_I_MigrateFormLocal {
     type: UI_T_VmMigrateSelectStorageTab
     disks: UI_I_StorageConfigurePerDiskItem[]
   }
+
+  vMotion_priority: UI_T_SelectVMotionPriority
 }
 
 export interface UI_I_ChangeStepsSchemes {
@@ -34,5 +36,4 @@ export interface UI_I_CollectedDataFormLocal {
     isShowNetworkBasic: boolean
     data: any // добавить интерфае потом
   }
-  selectedVMotionPriority: UI_T_SelectVMotionPriority
 }

package/components/common/wizards/vmNew/migrate/select/priority/Priority.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="select-priority">
     <common-select-radio-group
-      v-model="selectedPriorityType"
+      v-model="selectedPriorityTypeLocal"
       :options="vmMigrationPriorityTypes"
     />
   </div>
@@ -11,29 +11,15 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
 import type { UI_T_SelectVMotionPriority } from '~/components/common/wizards/vm/migrate/select/priority/lib/models/types'
-import { vmMigrateSelectPriorityTypesFunc } from '~/components/common/wizards/vm/migrate/select/priority/lib/config/typeOptions'
+import { vmMigrateSelectPriorityTypesFunc } from '~/components/common/wizards/vmNew/migrate/select/priority/lib/config/typeOptions'
 
-const props = defineProps<{
-  modelValue: UI_T_SelectVMotionPriority
-}>()
-const emits = defineEmits<{
-  (event: 'update:model-value', value: UI_T_SelectVMotionPriority): void
-}>()
+const selectedPriorityTypeLocal = defineModel<UI_T_SelectVMotionPriority>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const vmMigrationPriorityTypes = computed<UI_I_RadioOption[]>(() =>
   vmMigrateSelectPriorityTypesFunc(localization.value)
 )
-
-const selectedPriorityType = computed<UI_T_SelectVMotionPriority>({
-  get() {
-    return props.modelValue
-  },
-  set(newValue: UI_T_SelectVMotionPriority) {
-    emits('update:model-value', newValue)
-  },
-})
 </script>
 
 <style lang="scss" scoped></style>

package/package.json

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