bfg-common 1.4.91 → 1.4.93

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

@@ -13,9 +13,9 @@
       @submit="onFinish"
     >
       <template #modalBody="{ selectedStep }">
-        <common-wizards-vm-migrate-select-type
-          v-show="selectedStep.id === 0"
-          v-model="vmMigrateType"
+        <common-wizards-vm-new-migrate-select-type
+          v-if="selectedStep.id === 0"
+          v-model="form.migrate_type"
           :project="props.project"
         />
 
@@ -25,6 +25,7 @@
 
         <common-wizards-vm-migrate-select-compute-resource
           v-show="currentBlockId === 'select-compute-resource'"
+          v-model="form"
           :submit="selectComputeResourceSubmit"
           :get-compute-resource-data="props.getComputeResourceData"
           :migrate-type="vmMigrateType"
@@ -32,8 +33,8 @@
           :compute-resource-tree="props.computeResourceTree"
         />
 
-        <common-wizards-vm-migrate-select-storage
-          v-show="currentBlockId === 'select-storage'"
+        <common-wizards-vm-new-migrate-select-storage
+          v-show="selectedStep.id === 3"
           :submit="selectStorageSubmit"
           :get-datastore-table-func="props.getDatastoreTableFunc"
           :datastore="props.datastore"
@@ -76,6 +77,7 @@ import {
 
 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/vmNew/migrate/lib/models/interfaces'
 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'
@@ -114,6 +116,10 @@ const wizard: Wizard = new Wizard(
 const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
 const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
 
+const form = ref<UI_I_MigrateFormLocal>({
+  migrate_type: props.project === 'procurator' ? 'storage' : 'resource',
+})
+
 const validationFunc = async (
   value: UI_I_WizardStep[],
   currentStep: UI_I_WizardStep,

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

@@ -76,9 +76,7 @@ export const stepsFunc = (
 ]
 
 export const stepsSchemeInitial: number[][] = [
-  [0, 1, 3, 4, 5, 6], // Procurator Scheme for "local" type
-  [0, 1, 3, 4, 5, 6], // Procurator Scheme for "shared-storm" type
-  [0, 1, 3, 4, 5, 6], // Procurator Scheme for "nfs" type
+  [0, 3, 6], // Procurator Scheme for "Change storage only" type
   [0, 1, 3, 4, 5, 6], // Sphere Scheme for "shared-storm" type
   [0, 1, 3, 4, 5, 6], // Sphere Scheme for "nfs" type
 ]

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

@@ -3,6 +3,11 @@ import type { UI_T_VmMigrateSelectStorageTab } from '~/components/common/wizards
 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'
+
+export interface UI_I_MigrateFormLocal {
+  migrate_type: UI_T_VmMigrateType
+}
 
 export interface UI_I_MigrateReadyBlockData extends UI_I_TableInfoItem {
   permissions: UI_T_VmMigrateSelectStorageTab[]

package/components/common/wizards/vmNew/migrate/select/type/Type.vue

@@ -1,38 +1,27 @@
 <template>
-  <div>
-    <common-select-radio-group
-      v-model="selectedType"
-      :options="vmMigrationTypes"
-    />
-  </div>
+  <common-select-radio-group
+    v-model="selectedMigrateTypeLocal"
+    :options="vmMigrationTypes"
+  />
 </template>
 
 <script lang="ts" setup>
 import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_VmMigrateTypeOption } from '~/components/common/wizards/vm/migrate/select/type/lib/models/interfaces'
-import { vmMigrateTypesFunc } from '~/components/common/wizards/vm/migrate/select/type/lib/config/typeOptions'
+import type { UI_I_VmMigrateTypeOption } from '~/components/common/wizards/vmNew/migrate/select/type/lib/models/interfaces'
+import type { UI_T_VmMigrateType } from '~/components/common/wizards/vmNew/migrate/select/type/lib/models/types'
+import { vmMigrateTypesFunc } from '~/components/common/wizards/vmNew/migrate/select/type/lib/config/typeOptions'
 
 const props = defineProps<{
-  modelValue: string
   project: UI_T_Project
 }>()
-const emits = defineEmits<{
-  (event: 'update:model-value', value: string | number): void
-}>()
+const selectedMigrateTypeLocal = defineModel<UI_T_VmMigrateType>({
+  required: true,
+})
 const localization = computed<any>(() => useLocal())
 
 const vmMigrationTypes = ref<UI_I_VmMigrateTypeOption[]>(
   vmMigrateTypesFunc(localization.value, props.project)
 )
-
-const selectedType = computed<string>({
-  get() {
-    return props.modelValue
-  },
-  set(newValue) {
-    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.91",
+  "version": "1.4.93",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",