feat(xo-web/vm): migrate modal improvements (#4121)

Fixes #3326

- auto-select default SR as main SR
- hide optional per-VDI SR selection
This commit is contained in:
Rajaa.BARHTAOUI 2019-04-11 10:13:40 +02:00 committed by Pierre Donias
parent 21a7cf7158
commit f581e93b88
5 changed files with 8 additions and 5 deletions

View File

@ -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)) - [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)) - [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)) - [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 ### Bug fixes

View File

@ -3016,7 +3016,8 @@ export default {
"Le SR par défaut n'est pas connecté à l'hôte", "Le SR par défaut n'est pas connecté à l'hôte",
// Original text: "For each VDI, select an SR:" // 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…" // Original text: "Select main SR…"
chooseSrForEachVdisModalMainSr: 'Sélectionner le SR principal…', chooseSrForEachVdisModalMainSr: 'Sélectionner le SR principal…',

View File

@ -1609,7 +1609,7 @@ const messages = {
migrateVmNoTargetHostMessage: 'A target host is required to migrate a VM', migrateVmNoTargetHostMessage: 'A target host is required to migrate a VM',
migrateVmNoDefaultSrError: 'No default SR', migrateVmNoDefaultSrError: 'No default SR',
migrateVmNotConnectedDefaultSrError: 'Default SR not connected to host', 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…', chooseSrForEachVdisModalMainSr: 'Select main SR…',
chooseSrForEachVdisModalVdiLabel: 'VDI', chooseSrForEachVdisModalVdiLabel: 'VDI',
chooseSrForEachVdisModalSrLabel: 'SR*', chooseSrForEachVdisModalSrLabel: 'SR*',

View File

@ -70,7 +70,8 @@ export default class ChooseSrForEachVdisModal extends Component {
{props.vdis != null && mainSr != null && ( {props.vdis != null && mainSr != null && (
<Collapsible <Collapsible
buttonText={_('chooseSrForEachVdisModalSelectSr')} buttonText={_('chooseSrForEachVdisModalSelectSr')}
collapsible={props.vdis.length >= 3} collapsible
size='small'
> >
<br /> <br />
<Container> <Container>

View File

@ -152,7 +152,7 @@ export default class MigrateVmModalBody extends BaseComponent {
return return
} }
const { vbds, vm } = this.props const { pools, vbds, vm } = this.props
const intraPool = vm.$pool === host.$pool const intraPool = vm.$pool === host.$pool
// Intra-pool // Intra-pool
@ -178,7 +178,7 @@ export default class MigrateVmModalBody extends BaseComponent {
intraPool, intraPool,
mapVifsNetworks: undefined, mapVifsNetworks: undefined,
migrationNetwork: undefined, migrationNetwork: undefined,
targetSrs: {}, targetSrs: { mainSr: pools[host.$pool].default_SR },
}) })
return return
} }