Merge pull request #4054 from ollieh/issues/3771

Sorting of networks within a protocol based on name
This commit is contained in:
Matthew Hodgson 2017-10-14 23:21:51 +01:00 committed by GitHub
commit 6f819606c1

View file

@ -150,7 +150,21 @@ export default class NetworkDropdown extends React.Component {
if (this.props.protocols) { if (this.props.protocols) {
for (const proto of Object.keys(this.props.protocols)) { for (const proto of Object.keys(this.props.protocols)) {
if (!this.props.protocols[proto].instances) continue; if (!this.props.protocols[proto].instances) continue;
for (const instance of this.props.protocols[proto].instances) {
const sortedInstances = this.props.protocols[proto].instances;
sortedInstances.sort(function(x, y) {
const a = x.desc
const b = y.desc
if (a < b) {
return -1;
} else if (a > b) {
return 1;
} else {
return 0;
}
});
for (const instance of sortedInstances) {
if (!instance.instance_id) continue; if (!instance.instance_id) continue;
options.push(this._makeMenuOption(server, instance, false)); options.push(this._makeMenuOption(server, instance, false));
} }