mirror of https://github.com/rancher/ui.git
Show cluster name instead of cluster id
https://github.com/rancher/rancher/issues/10900
This commit is contained in:
parent
01a3a05361
commit
ddcc30faf5
|
|
@ -5,26 +5,28 @@ import { next } from '@ember/runloop';
|
||||||
|
|
||||||
export default Component.extend({
|
export default Component.extend({
|
||||||
layout,
|
layout,
|
||||||
tagName: 'div',
|
tagName: 'div',
|
||||||
classNames: ['box'],
|
classNames: ['box'],
|
||||||
requestedClusterId: null,
|
requestedClusterId: null,
|
||||||
requestedRoles: null,
|
requestedClusterName: null,
|
||||||
defaultExpand: null,
|
requestedRoles: null,
|
||||||
hasCluster: null,
|
defaultExpand: null,
|
||||||
setDisabled: false,
|
hasCluster: null,
|
||||||
|
setDisabled: false,
|
||||||
didReceiveAttrs() {
|
didReceiveAttrs() {
|
||||||
if (get(this, 'hasCluster')) {
|
if (get(this, 'hasCluster')) {
|
||||||
next(() => {
|
next(() => {
|
||||||
setProperties(this, {
|
setProperties(this, {
|
||||||
setDisabled: true,
|
setDisabled: true,
|
||||||
requestedClusterId: get(this, 'hasCluster.id')
|
requestedClusterId: get(this, 'hasCluster.id'),
|
||||||
|
requestedClusterName: get(this, 'hasCluster.name') || `(${get(this, 'hasCluster.id')})`,
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
actions: {
|
actions: {
|
||||||
addRole(role) {
|
addRole(role) {
|
||||||
let roles = (get(this, 'requestedRoles')||[]).slice();
|
let roles = (get(this, 'requestedRoles') || []).slice();
|
||||||
|
|
||||||
if (roles.includes(role)) {
|
if (roles.includes(role)) {
|
||||||
roles = roles.without(role);
|
roles = roles.without(role);
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
<div class="col span-6">
|
<div class="col span-6">
|
||||||
<label class="acc-label" for="">{{t 'hostsPage.new.addCluster.cluster.label'}}</label>
|
<label class="acc-label" for="">{{t 'hostsPage.new.addCluster.cluster.label'}}</label>
|
||||||
{{#if hasCluster }}
|
{{#if hasCluster }}
|
||||||
<input name="" type="text" value="{{requestedClusterId}}" disabled=true />
|
<input name="" type="text" value="{{requestedClusterName}}" disabled=true />
|
||||||
{{else}}
|
{{else}}
|
||||||
{{searchable-select content=clusters value=requestedClusterId optionLabelPath="name" optionValuePath="id" localizedLabel=false}}
|
{{searchable-select content=clusters value=requestedClusterId optionLabelPath="name" optionValuePath="id" localizedLabel=false}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ export default Component.extend({
|
||||||
name: 'reason',
|
name: 'reason',
|
||||||
sort: ['reason'],
|
sort: ['reason'],
|
||||||
translationKey: 'conditionSections.table.reason',
|
translationKey: 'conditionSections.table.reason',
|
||||||
width: 200,
|
width: 250,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'message',
|
name: 'message',
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue