rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

display prefix of node name (drop domain) 

rancher/rancher#27873
This commit is contained in:
Westly Wright 2021-02-03 10:19:00 -07:00
parent 013986682f
commit 0d06a3e90b
No known key found for this signature in database
GPG Key ID: 4FAB3D8673DC54A3
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/models/node.js
View File

@ -98,16 +98,7 @@ var Node = Resource.extend(Grafana, StateCounts, ResourceUsage, {
name = get(this, 'nodeName');
if ( name ) {
if ( name.match(/[a-z]/i) ) {
name = name.replace(/\..*$/, '');
const nodesWithSamePrefix = (this.nodes || []).filter((node) => (node.nodeName || '').startsWith(`${ name }.`));
if ( nodesWithSamePrefix.length > 1 ) {
name = this.nodeName.slice(this.nodeName.lastIndexOf('.') + 1, this.nodeName.length)
if ( name.match(/^\d+$/) ) {
name = this.nodeName;
}
}
name = this.parseNodeName(name);
}
return name;
@ -209,6 +200,25 @@ var Node = Resource.extend(Grafana, StateCounts, ResourceUsage, {
return out;
}),
parseNodeName(nameIn) {
const suffix = nameIn.split('.').slice(1).join('.');
const nodesWithSameSuffix = (this.nodes || []).filter((node) => (node.nodeName || '').endsWith(suffix));
if (nodesWithSameSuffix.length === 1) {
return this.nodeName;
} else if (nodesWithSameSuffix.length > 1) {
const neu = nameIn.replace(/\..*$/, '');
if ( neu.match(/^\d+$/) ) {
return this.nodeName;
} else {
return neu;
}
}
return nameIn;
},
engineIcon: computed('info.os.dockerVersion', function() {
if ( (get(this, 'info.os.dockerVersion') || '').startsWith(CONTAINERD) ) {
return 'icon-container-d';