bfg-common 1.5.420 → 1.5.421

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

@@ -1,157 +1,157 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
-import { UI_E_WIZARD_STATUS } from '~/components/atoms/wizard/lib/models/enums'
-
-export const dynamicSteps = {
-  schedulingOptions: 0,
-  selectMigrationType: 1,
-  selectTargetVCenterSer: 2,
-  selectComputeResource: 3,
-  selectStorage: 4,
-  selectNetworks: 5,
-  migrationStrategy: 6,
-  readyComplete: 7,
-}
-export const stepsFunc = (
-  localization: UI_I_Localization,
-  isScheduledTasks: boolean
-): UI_I_WizardStep[] => {
-  return [
-    {
-      id: dynamicSteps.schedulingOptions,
-      stepName: '',
-      title: localization.common.schedulingOptions,
-      subTitle: '',
-      status: UI_E_WIZARD_STATUS[isScheduledTasks ? 'SELECTED' : 'INACTIVE'],
-      isValid: true,
-      fields: {},
-      testId: 'migrate-vm-scheduling-options',
-    },
-    {
-      id: dynamicSteps.selectMigrationType,
-      title: localization.common.selectMigrationType,
-      subTitle: localization.common.selectMigrationTypeDesc,
-      status: UI_E_WIZARD_STATUS[!isScheduledTasks ? 'SELECTED' : 'INACTIVE'],
-      fields: {},
-      isValid: true,
-      testId: 'migrate-vm-select-type',
-    },
-    {
-      id: dynamicSteps.selectTargetVCenterSer,
-      title: localization.common.selectTargetVCenterSer,
-      subTitle: localization.common.selectComputeResourceDesc,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      fields: {
-        sign_in: {
-          field: '',
-          alert: '',
-        },
-      },
-      isValid: true,
-      testId: 'migrate-vm-select-target-server',
-    },
-    {
-      id: dynamicSteps.selectComputeResource,
-      title: localization.common.selectComputeResource,
-      subTitle: localization.common.selectComputeResourceDesc,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      fields: {
-        resource: {
-          field: '',
-          alert: '',
-        },
-      },
-      isValid: true,
-      testId: 'migrate-vm-select-compute-resource',
-    },
-    {
-      id: dynamicSteps.selectStorage,
-      title: localization.common.selectStorage,
-      subTitle: localization.common.selectStorageDesc,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      fields: {
-        name: {
-          alert: '',
-          field: '',
-        },
-      },
-      isValid: true,
-      testId: 'migrate-vm-select-storage',
-    },
-    {
-      id: dynamicSteps.selectNetworks,
-      title: localization.common.selectNetworks,
-      subTitle: localization.common.selectNetworksDesc,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      fields: {},
-      isValid: true,
-      testId: 'migrate-vm-select-networks',
-    },
-    {
-      id: dynamicSteps.migrationStrategy,
-      title: localization.migrateVm.migrationStrategy,
-      subTitle: localization.common.selectVMotionPriorityDesc,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      fields: {},
-      isValid: true,
-      testId: 'migrate-vm-select-vMotion-priority',
-    },
-    {
-      id: dynamicSteps.readyComplete,
-      title: localization.common.readyComplete,
-      subTitle: '',
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      fields: {},
-      isValid: true,
-      testId: 'migrate-vm-ready-complete',
-    },
-  ]
-}
-
-export const stepsSchemeInitial: number[][] = [
-  [
-    dynamicSteps.selectMigrationType,
-    dynamicSteps.selectStorage,
-    dynamicSteps.readyComplete,
-  ], // Procurator and Sphere Scheme for "Change storage only" type
-  [
-    dynamicSteps.schedulingOptions,
-    dynamicSteps.selectMigrationType,
-    dynamicSteps.selectStorage,
-    dynamicSteps.readyComplete,
-  ], // Procurator and Sphere Scheme for "Change storage only" type (from Scheduled tasks)
-
-  [
-    dynamicSteps.selectMigrationType,
-    dynamicSteps.selectComputeResource,
-    // dynamicSteps.selectNetworks, // пока что скрываем
-    dynamicSteps.migrationStrategy,
-    dynamicSteps.readyComplete,
-  ], // Sphere Scheme for "Change compute resource only" type
-  [
-    dynamicSteps.schedulingOptions,
-    dynamicSteps.selectMigrationType,
-    dynamicSteps.selectComputeResource,
-    // dynamicSteps.selectNetworks, // пока что скрываем
-    dynamicSteps.migrationStrategy,
-    dynamicSteps.readyComplete,
-  ], // Sphere Scheme for "Change compute resource only" type (from Scheduled tasks)
-
-  [
-    dynamicSteps.selectMigrationType,
-    dynamicSteps.selectComputeResource,
-    dynamicSteps.selectStorage,
-    // dynamicSteps.selectNetworks, // пока что скрываем
-    dynamicSteps.migrationStrategy,
-    dynamicSteps.readyComplete,
-  ], // Sphere Scheme for "Change both compute resource and storage" type
-  [
-    dynamicSteps.selectMigrationType,
-    dynamicSteps.selectTargetVCenterSer,
-    dynamicSteps.selectComputeResource,
-    dynamicSteps.selectStorage,
-    // dynamicSteps.selectNetworks, // пока что скрываем
-    dynamicSteps.migrationStrategy,
-    dynamicSteps.readyComplete,
-  ], // Sphere Scheme for "Cross Sphere Zone export" type
-]
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
+import { UI_E_WIZARD_STATUS } from '~/components/atoms/wizard/lib/models/enums'
+
+export const dynamicSteps = {
+  schedulingOptions: 0,
+  selectMigrationType: 1,
+  selectTargetVCenterSer: 2,
+  selectComputeResource: 3,
+  selectStorage: 4,
+  selectNetworks: 5,
+  migrationStrategy: 6,
+  readyComplete: 7,
+}
+export const stepsFunc = (
+  localization: UI_I_Localization,
+  isScheduledTasks: boolean
+): UI_I_WizardStep[] => {
+  return [
+    {
+      id: dynamicSteps.schedulingOptions,
+      stepName: '',
+      title: localization.common.schedulingOptions,
+      subTitle: '',
+      status: UI_E_WIZARD_STATUS[isScheduledTasks ? 'SELECTED' : 'INACTIVE'],
+      isValid: true,
+      fields: {},
+      testId: 'migrate-vm-scheduling-options',
+    },
+    {
+      id: dynamicSteps.selectMigrationType,
+      title: localization.common.selectMigrationType,
+      subTitle: localization.common.selectMigrationTypeDesc,
+      status: UI_E_WIZARD_STATUS[!isScheduledTasks ? 'SELECTED' : 'INACTIVE'],
+      fields: {},
+      isValid: true,
+      testId: 'migrate-vm-select-type',
+    },
+    {
+      id: dynamicSteps.selectTargetVCenterSer,
+      title: localization.common.selectTargetVCenterSer,
+      subTitle: localization.common.selectComputeResourceDesc,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      fields: {
+        sign_in: {
+          field: '',
+          alert: '',
+        },
+      },
+      isValid: true,
+      testId: 'migrate-vm-select-target-server',
+    },
+    {
+      id: dynamicSteps.selectComputeResource,
+      title: localization.common.selectComputeResource,
+      subTitle: localization.common.selectComputeResourceDesc,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      fields: {
+        resource: {
+          field: '',
+          alert: '',
+        },
+      },
+      isValid: true,
+      testId: 'migrate-vm-select-compute-resource',
+    },
+    {
+      id: dynamicSteps.selectStorage,
+      title: localization.common.selectStorage,
+      subTitle: localization.common.selectStorageDesc,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      fields: {
+        name: {
+          alert: '',
+          field: '',
+        },
+      },
+      isValid: true,
+      testId: 'migrate-vm-select-storage',
+    },
+    {
+      id: dynamicSteps.selectNetworks,
+      title: localization.common.selectNetworks,
+      subTitle: localization.common.selectNetworksDesc,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      fields: {},
+      isValid: true,
+      testId: 'migrate-vm-select-networks',
+    },
+    {
+      id: dynamicSteps.migrationStrategy,
+      title: localization.migrateVm.migrationStrategy,
+      subTitle: localization.common.selectVMotionPriorityDesc,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      fields: {},
+      isValid: true,
+      testId: 'migrate-vm-select-vMotion-priority',
+    },
+    {
+      id: dynamicSteps.readyComplete,
+      title: localization.common.readyComplete,
+      subTitle: '',
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      fields: {},
+      isValid: true,
+      testId: 'migrate-vm-ready-complete',
+    },
+  ]
+}
+
+export const stepsSchemeInitial: number[][] = [
+  [
+    dynamicSteps.selectMigrationType,
+    dynamicSteps.selectStorage,
+    dynamicSteps.readyComplete,
+  ], // Procurator and Sphere Scheme for "Change storage only" type
+  [
+    dynamicSteps.schedulingOptions,
+    dynamicSteps.selectMigrationType,
+    dynamicSteps.selectStorage,
+    dynamicSteps.readyComplete,
+  ], // Procurator and Sphere Scheme for "Change storage only" type (from Scheduled tasks)
+
+  [
+    dynamicSteps.selectMigrationType,
+    dynamicSteps.selectComputeResource,
+    // dynamicSteps.selectNetworks, // пока что скрываем
+    dynamicSteps.migrationStrategy,
+    dynamicSteps.readyComplete,
+  ], // Sphere Scheme for "Change compute resource only" type
+  [
+    dynamicSteps.schedulingOptions,
+    dynamicSteps.selectMigrationType,
+    dynamicSteps.selectComputeResource,
+    // dynamicSteps.selectNetworks, // пока что скрываем
+    dynamicSteps.migrationStrategy,
+    dynamicSteps.readyComplete,
+  ], // Sphere Scheme for "Change compute resource only" type (from Scheduled tasks)
+
+  [
+    dynamicSteps.selectMigrationType,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.selectStorage,
+    // dynamicSteps.selectNetworks, // пока что скрываем
+    dynamicSteps.migrationStrategy,
+    dynamicSteps.readyComplete,
+  ], // Sphere Scheme for "Change both compute resource and storage" type
+  [
+    dynamicSteps.selectMigrationType,
+    dynamicSteps.selectTargetVCenterSer,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.selectStorage,
+    // dynamicSteps.selectNetworks, // пока что скрываем
+    dynamicSteps.migrationStrategy,
+    dynamicSteps.readyComplete,
+  ], // Sphere Scheme for "Cross Sphere Zone export" type
+]

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

@@ -1,68 +1,68 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_ValidationReturn,
-  UI_I_WizardStep,
-} from '~/components/atoms/wizard/lib/models/interfaces'
-import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
-import type { UI_I_ComputeResourceFormLocal } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/interfaces'
-import { dynamicSteps } from '~/components/common/wizards/vm/migrate/lib/config/steps'
-
-export const checkSelectedDatastoreSync = (
-  localization: UI_I_Localization,
-  name: string,
-  wizard: Wizard,
-  value: UI_I_WizardStep[]
-): UI_I_ValidationReturn => {
-  let stepHasError = false
-
-  if (!name) {
-    stepHasError = wizard.setValidation(dynamicSteps.selectStorage, 'name', {
-      fieldMessage: '',
-      alertMessage: localization.common.selectValidDestinationStorage,
-    })
-  } else if (wizard.hasMessage(dynamicSteps.selectStorage, 'name')) {
-    value = wizard.removeValidation(dynamicSteps.selectStorage, 'name', value)
-  }
-
-  return {
-    newValue: value,
-    stepHasError,
-  }
-}
-
-export const checkSelectedResourceSync = (
-  localization: UI_I_Localization,
-  resource: UI_I_ComputeResourceFormLocal,
-  wizard: Wizard,
-  value: UI_I_WizardStep[]
-): UI_I_ValidationReturn => {
-  let stepHasError = false
-
-  const hasSelectedData = Object.values(resource).some(
-    (value) => value !== null
-  )
-
-  if (!hasSelectedData) {
-    stepHasError = wizard.setValidation(
-      dynamicSteps.selectComputeResource,
-      'resource',
-      {
-        fieldMessage: '',
-        alertMessage: localization.common.selectValidDestinationComputeResource,
-      }
-    )
-  } else if (
-    wizard.hasMessage(dynamicSteps.selectComputeResource, 'resource')
-  ) {
-    value = wizard.removeValidation(
-      dynamicSteps.selectComputeResource,
-      'resource',
-      value
-    )
-  }
-
-  return {
-    newValue: value,
-    stepHasError,
-  }
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_ValidationReturn,
+  UI_I_WizardStep,
+} from '~/components/atoms/wizard/lib/models/interfaces'
+import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
+import type { UI_I_ComputeResourceFormLocal } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/interfaces'
+import { dynamicSteps } from '~/components/common/wizards/vm/migrate/lib/config/steps'
+
+export const checkSelectedDatastoreSync = (
+  localization: UI_I_Localization,
+  name: string,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  if (!name) {
+    stepHasError = wizard.setValidation(dynamicSteps.selectStorage, 'name', {
+      fieldMessage: '',
+      alertMessage: localization.common.selectValidDestinationStorage,
+    })
+  } else if (wizard.hasMessage(dynamicSteps.selectStorage, 'name')) {
+    value = wizard.removeValidation(dynamicSteps.selectStorage, 'name', value)
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}
+
+export const checkSelectedResourceSync = (
+  localization: UI_I_Localization,
+  resource: UI_I_ComputeResourceFormLocal,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  const hasSelectedData = Object.values(resource).some(
+    (value) => value !== null
+  )
+
+  if (!hasSelectedData) {
+    stepHasError = wizard.setValidation(
+      dynamicSteps.selectComputeResource,
+      'resource',
+      {
+        fieldMessage: '',
+        alertMessage: localization.common.selectValidDestinationComputeResource,
+      }
+    )
+  } else if (
+    wizard.hasMessage(dynamicSteps.selectComputeResource, 'resource')
+  ) {
+    value = wizard.removeValidation(
+      dynamicSteps.selectComputeResource,
+      'resource',
+      value
+    )
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}

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

@@ -23,8 +23,8 @@
     <template v-else>
       <atoms-tabs
         v-model="activeTab"
-        test-id="migrate-select-storage-tabs"
         :items="selectStorageTabs"
+        test-id="migrate-select-storage-tabs"
         size="small"
         class="compute-resource__tabs"
       />
@@ -58,13 +58,18 @@ import type { UI_I_SelectedTableDataKeys } from '~/components/common/wizards/vm/
 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 = defineProps<{
-  alertMessages: string[]
-  getComputeResourceData: (payload: UI_I_TablePayload) => Promise<void>
-  computeResourceData: any
-  computeResourceTree: UI_I_TreeNode | null
-  vmState?: number
-}>()
+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

package/components/common/wizards/vm/migrate/select/computeResource/tableView/lib/config/tableKeys.ts

@@ -1,11 +1,11 @@
 import type {
-  T_HostTableTuple,
-  T_ClusterTableTuple,
-  T_VAppsTableTuple,
-  T_ResourcePoolTableTuple,
+  UI_T_HostTableTuple,
+  UI_T_ClusterTableTuple,
+  UI_T_VAppsTableTuple,
+  UI_T_ResourcePoolTableTuple,
 } from '~/components/common/wizards/vm/migrate/select/computeResource/tableView/lib/models/types'
 
-export const hostTableItemKeys: T_HostTableTuple = [
+export const hostTableItemKeys: UI_T_HostTableTuple = [
   'name',
   'state',
   'cluster',
@@ -21,7 +21,7 @@ export const hostTableItemKeys: T_HostTableTuple = [
   'version',
   'alarm_action',
 ]
-export const clusterTableItemKeys: T_ClusterTableTuple = [
+export const clusterTableItemKeys: UI_T_ClusterTableTuple = [
   'name',
   'available_cpu',
   'available_memory',
@@ -40,7 +40,7 @@ export const clusterTableItemKeys: T_ClusterTableTuple = [
   'evc_cpu_mode',
   'evc_graphics_mode',
 ]
-export const vAppsTableItemKeys: T_VAppsTableTuple = [
+export const vAppsTableItemKeys: UI_T_VAppsTableTuple = [
   'name',
   'cpu_shares',
   'cpu_shares_val',
@@ -49,7 +49,7 @@ export const vAppsTableItemKeys: T_VAppsTableTuple = [
   'managed_by',
 ]
 
-export const resourcePoolsTableItemKeys: T_ResourcePoolTableTuple = [
+export const resourcePoolsTableItemKeys: UI_T_ResourcePoolTableTuple = [
   'name',
   'cpu_reservation',
   'cpu_limit',

package/components/common/wizards/vm/migrate/select/computeResource/tableView/lib/models/types.ts

@@ -1,4 +1,4 @@
-export type T_HostTableTuple = [
+export type UI_T_HostTableTuple = [
   'name',
   'state',
   'cluster',
@@ -15,7 +15,7 @@ export type T_HostTableTuple = [
   'alarm_action'
 ]
 
-export type T_ClusterTableTuple = [
+export type UI_T_ClusterTableTuple = [
   'name',
   'available_cpu',
   'available_memory',
@@ -35,7 +35,7 @@ export type T_ClusterTableTuple = [
   'evc_graphics_mode'
 ]
 
-export type T_VAppsTableTuple = [
+export type UI_T_VAppsTableTuple = [
   'name',
   'cpu_shares',
   'cpu_shares_val',
@@ -44,7 +44,7 @@ export type T_VAppsTableTuple = [
   'managed_by'
 ]
 
-export type T_ResourcePoolTableTuple = [
+export type UI_T_ResourcePoolTableTuple = [
   'name',
   'cpu_reservation',
   'cpu_limit',