diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 192bc5d6a..c86ffa64b 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -7,6 +7,7 @@ - [Import] Avoid blocking the UI when dropping a big OVA file on the UI (PR [#4018](https://github.com/vatesfr/xen-orchestra/pull/4018)) - [Backup NG/Overview] Make backup list title clearer [#4111](https://github.com/vatesfr/xen-orchestra/issues/4111) (PR [#4129](https://github.com/vatesfr/xen-orchestra/pull/4129)) - [Dashboard] Hide "Report" section for non-admins [#4123](https://github.com/vatesfr/xen-orchestra/issues/4123) (PR [#4126](https://github.com/vatesfr/xen-orchestra/pull/4126)) +- [VM migration] Auto select default SR and collapse optional actions [#3326](https://github.com/vatesfr/xen-orchestra/issues/3326) (PR [#4121](https://github.com/vatesfr/xen-orchestra/pull/4121)) ### Bug fixes diff --git a/packages/xo-web/src/common/intl/locales/fr.js b/packages/xo-web/src/common/intl/locales/fr.js index 54525ad8b..efa32d3bd 100644 --- a/packages/xo-web/src/common/intl/locales/fr.js +++ b/packages/xo-web/src/common/intl/locales/fr.js @@ -3016,7 +3016,8 @@ export default { "Le SR par défaut n'est pas connecté à l'hôte", // Original text: "For each VDI, select an SR:" - chooseSrForEachVdisModalSelectSr: 'Pour chaque VDI, sélectionner un SR :', + chooseSrForEachVdisModalSelectSr: + 'Pour chaque VDI, sélectionner un SR (optionnel)', // Original text: "Select main SR…" chooseSrForEachVdisModalMainSr: 'Sélectionner le SR principal…', diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js index 7b468af82..cab29d4c5 100644 --- a/packages/xo-web/src/common/intl/messages.js +++ b/packages/xo-web/src/common/intl/messages.js @@ -1609,7 +1609,7 @@ const messages = { migrateVmNoTargetHostMessage: 'A target host is required to migrate a VM', migrateVmNoDefaultSrError: 'No default SR', migrateVmNotConnectedDefaultSrError: 'Default SR not connected to host', - chooseSrForEachVdisModalSelectSr: 'For each VDI, select an SR:', + chooseSrForEachVdisModalSelectSr: 'For each VDI, select an SR (optional)', chooseSrForEachVdisModalMainSr: 'Select main SR…', chooseSrForEachVdisModalVdiLabel: 'VDI', chooseSrForEachVdisModalSrLabel: 'SR*', diff --git a/packages/xo-web/src/common/xo/choose-sr-for-each-vdis-modal/index.js b/packages/xo-web/src/common/xo/choose-sr-for-each-vdis-modal/index.js index 5629f10c4..a09a2702b 100644 --- a/packages/xo-web/src/common/xo/choose-sr-for-each-vdis-modal/index.js +++ b/packages/xo-web/src/common/xo/choose-sr-for-each-vdis-modal/index.js @@ -70,7 +70,8 @@ export default class ChooseSrForEachVdisModal extends Component { {props.vdis != null && mainSr != null && ( = 3} + collapsible + size='small' >
diff --git a/packages/xo-web/src/common/xo/migrate-vm-modal/index.js b/packages/xo-web/src/common/xo/migrate-vm-modal/index.js index 1e38886bd..a10dfb391 100644 --- a/packages/xo-web/src/common/xo/migrate-vm-modal/index.js +++ b/packages/xo-web/src/common/xo/migrate-vm-modal/index.js @@ -152,7 +152,7 @@ export default class MigrateVmModalBody extends BaseComponent { return } - const { vbds, vm } = this.props + const { pools, vbds, vm } = this.props const intraPool = vm.$pool === host.$pool // Intra-pool @@ -178,7 +178,7 @@ export default class MigrateVmModalBody extends BaseComponent { intraPool, mapVifsNetworks: undefined, migrationNetwork: undefined, - targetSrs: {}, + targetSrs: { mainSr: pools[host.$pool].default_SR }, }) return }