bfg-common 1.4.93 → 1.4.95

package/components/common/vm/actions/common/customizeHardware/virtualHardware/bus/Bus.vue

@@ -102,16 +102,25 @@ const busLocal = computed<string>({
 })
 const busOptions = ref<UI_I_OptionItem[]>([])
 watch(
-    () => props.guestMachineType,
-    () => {
-      if (props.guestMachineType) {
-        busOptions.value = capabilities.bus[props.guestMachineType.value]
-
-        const hasSelected = busOptions.value.some(option => option.value === busLocal.value)
-        if (!hasSelected) busLocal.value = busOptions.value[0].value
+  () => props.guestMachineType,
+  () => {
+    if (props.guestMachineType) {
+      busOptions.value = capabilities.bus[props.guestMachineType.value]
+      // TODO временно так
+      if (props.shortOptions) {
+        busOptions.value = [
+          { text: localization.value.common.ide, value: 'ide' },
+          { text: localization.value.common.sata, value: 'sata' },
+        ]
       }
-    },
-    { immediate: true, deep: true }
+
+      const hasSelected = busOptions.value.some(
+        (option) => option.value === busLocal.value
+      )
+      if (!hasSelected) busLocal.value = busOptions.value[0].value
+    }
+  },
+  { immediate: true, deep: true }
 )
 
 const busValidationType = computed<string>(

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

@@ -20,11 +20,11 @@
         />
 
         <common-wizards-vm-migrate-select-target-server
-          v-show="currentBlockId === 'select-target-center'"
+          v-if="false"
         />
 
         <common-wizards-vm-migrate-select-compute-resource
-          v-show="currentBlockId === 'select-compute-resource'"
+            v-if="false"
           v-model="form"
           :submit="selectComputeResourceSubmit"
           :get-compute-resource-data="props.getComputeResourceData"
@@ -43,7 +43,7 @@
         />
 
         <common-wizards-vm-migrate-select-network
-          v-if="currentBlockId === 'select-networks'"
+            v-if="false"
           v-model:is-basic-network-mode="
             dataFormLocal.selectNetwork.isShowNetworkBasic
           "
@@ -51,7 +51,7 @@
         />
 
         <common-wizards-vm-migrate-select-priority
-          v-show="currentBlockId === 'select-motion-priority'"
+            v-if="false"
           v-model="selectedVMotionPriority"
         />
 
@@ -73,15 +73,18 @@ import Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import {
   stepsFunc,
   stepsSchemeInitial,
-} from '~/components/common/wizards/datastore/add/lib/config/steps'
+} from '~/components/common/wizards/vmNew/migrate/lib/config/steps'
 
 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_MigrateFormLocal,
+  UI_I_ChangeStepsSchemes,
+} from '~/components/common/wizards/vmNew/migrate/lib/models/interfaces'
+import type { UI_T_VmMigrateType } from '~/components/common/wizards/vmNew/migrate/select/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'
-import type { UI_T_VmMigrateType } from '~/components/common/wizards/vm/migrate/lib/models/types'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/table/disk/lib/models/interfaces'
 import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
@@ -98,8 +101,6 @@ const props = defineProps<{
   configurePerDisks: UI_I_StorageConfigurePerDiskItem[]
   computeResourceTableData?: any
   computeResourceTree?: UI_I_TreeNode
-  readyCompleteTableInfo?: any // пока так потом если будет нужен изменит или удалить
-  finishFunc: any
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void
@@ -153,6 +154,29 @@ const validationFunc = async (
 const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> =>
   wizard.changeSteps(value, validationFunc)
 
+// Choosing Scheme
+watch(
+  form.migrate_type,
+  (newValue: UI_T_VmMigrateType) => {
+    const schemes: UI_I_ChangeStepsSchemes = {
+      procurator: {
+        storage: 0,
+      },
+      sphere: {
+        storage: 0,
+        resource: 1,
+      },
+    }
+
+    const projectSchemes = schemes[props.project]
+
+    if (projectSchemes && projectSchemes[newValue] !== undefined) {
+      wizard.changeScheme(projectSchemes[newValue] as number)
+    }
+  },
+  { deep: true, immediate: true }
+)
+
 const loading = ref<boolean>(false)
 
 const selectStorageSubmit = ref<number>(0)
@@ -165,8 +189,6 @@ const vmMigrateType = ref<UI_T_VmMigrateType>(
 )
 const dataReadyView = ref<UI_I_TableInfoItem[]>([])
 
-const currentBlockId = computed<string>(() => '')
-
 const connectedStorageIdOnVm = computed<string>(
   () => props.vmSettings?.storage.id || ''
 )
@@ -200,33 +222,4 @@ const onHideModal = (): void => {
     padding-left: 10px;
   }
 }
-
-//:deep(.has-solid.close-icon.clr-icon) {
-//  width: 20px;
-//  top: 0;
-//}
-//:deep(.modal .modal-dialog .modal-content .modal-footer) {
-//  flex: unset;
-//  height: unset;
-//  min-height: unset;
-//}
-//:deep(.wizard-modal-titlebar h3) {
-//  color: #000;
-//  font-size: 24px;
-//  font-weight: 200;
-//  line-height: 27px;
-//  margin: 0;
-//  padding: 0;
-//}
-//:deep(.clr-wizard-stepnav-item) {
-//  padding-left: 0;
-//}
-//:deep(.clr-wizard-stepnav
-//    .clr-wizard-stepnav-item
-//    button
-//    .clr-wizard-stepnav-link-title) {
-//  width: 189px;
-//  font-weight: 700;
-//  font-size: 13px;
-//}
 </style>

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

@@ -9,6 +9,12 @@ export interface UI_I_MigrateFormLocal {
   migrate_type: UI_T_VmMigrateType
 }
 
+export interface UI_I_ChangeStepsSchemes {
+  [key: string]: {
+    [key in UI_T_VmMigrateType]?: number
+  }
+}
+
 export interface UI_I_MigrateReadyBlockData extends UI_I_TableInfoItem {
   permissions: UI_T_VmMigrateSelectStorageTab[]
 }

package/package.json

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