Compare commits
4 Commits
xo-server-
...
better-sor
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
af55e0341b | ||
|
|
3a4f1f78ce | ||
|
|
1d765ebf49 | ||
|
|
3d416d75e9 |
@@ -16,7 +16,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"golike-defer": "^0.4.1",
|
||||
"xen-api": "^0.27.2"
|
||||
"xen-api": "^0.27.1"
|
||||
},
|
||||
"scripts": {
|
||||
"postversion": "npm publish"
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
- [Servers] IPv6 addresses can be used [#4520](https://github.com/vatesfr/xen-orchestra/issues/4520) (PR [#4521](https://github.com/vatesfr/xen-orchestra/pull/4521)) \
|
||||
Note: They must enclosed in brackets to differentiate with the port, e.g.: `[2001:db8::7334]` or `[ 2001:db8::7334]:4343`
|
||||
- [HUB] VM template store [#1918](https://github.com/vatesfr/xen-orchestra/issues/1918) (PR [#4442](https://github.com/vatesfr/xen-orchestra/pull/4442))
|
||||
- [Home/bulk vm migration] Display same-pool hosts first in the selector [#4462](https://github.com/vatesfr/xen-orchestra/issues/4462) (PR [#4474](https://github.com/vatesfr/xen-orchestra/pull/4474))
|
||||
|
||||
### Bug fixes
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
"human-format": "^0.10.0",
|
||||
"lodash": "^4.17.4",
|
||||
"pw": "^0.0.4",
|
||||
"xen-api": "^0.27.2"
|
||||
"xen-api": "^0.27.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/cli": "^7.1.5",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "xen-api",
|
||||
"version": "0.27.2",
|
||||
"version": "0.27.1",
|
||||
"license": "ISC",
|
||||
"description": "Connector to the Xen API",
|
||||
"keywords": [
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "xo-server-cloud",
|
||||
"version": "0.3.0",
|
||||
"version": "0.2.4",
|
||||
"license": "ISC",
|
||||
"description": "",
|
||||
"keywords": [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"private": true,
|
||||
"name": "xo-server",
|
||||
"version": "5.50.1",
|
||||
"version": "5.50.0",
|
||||
"license": "AGPL-3.0",
|
||||
"description": "Server part of Xen-Orchestra",
|
||||
"keywords": [
|
||||
@@ -124,7 +124,7 @@
|
||||
"value-matcher": "^0.2.0",
|
||||
"vhd-lib": "^0.7.0",
|
||||
"ws": "^6.0.0",
|
||||
"xen-api": "^0.27.2",
|
||||
"xen-api": "^0.27.1",
|
||||
"xml2js": "^0.4.19",
|
||||
"xo-acl-resolver": "^0.4.1",
|
||||
"xo-collection": "^0.4.1",
|
||||
|
||||
@@ -119,6 +119,11 @@ export default class MigrateVmsModalBody extends BaseComponent {
|
||||
return network => networks[network.id]
|
||||
}
|
||||
)
|
||||
|
||||
this._getSelectedVmsPoolIds = createSelector(
|
||||
() => this.props.vms,
|
||||
vms => map(vms, '$pool')
|
||||
)
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
@@ -262,6 +267,11 @@ export default class MigrateVmsModalBody extends BaseComponent {
|
||||
_toggleSmartVifMapping = () =>
|
||||
this.setState({ smartVifMapping: !this.state.smartVifMapping })
|
||||
|
||||
compareContainers = (pool1, pool2) => {
|
||||
const poolIds = this._getSelectedVmsPoolIds()
|
||||
return poolIds.includes(pool1.id) ? -1 : poolIds.includes(pool2.id) ? 1 : 0
|
||||
}
|
||||
|
||||
render() {
|
||||
const {
|
||||
defaultSrConnectedToHost,
|
||||
@@ -281,6 +291,7 @@ export default class MigrateVmsModalBody extends BaseComponent {
|
||||
<Col size={6}>{_('migrateVmSelectHost')}</Col>
|
||||
<Col size={6}>
|
||||
<SelectHost
|
||||
compareContainers={this.compareContainers}
|
||||
onChange={this._selectHost}
|
||||
predicate={this._getHostPredicate()}
|
||||
value={host}
|
||||
|
||||
Reference in New Issue
Block a user