diff --git a/lib/shared/addon/components/form-cluster-select/component.js b/lib/shared/addon/components/form-cluster-select/component.js index 0b91f6f20..aa55d06d3 100644 --- a/lib/shared/addon/components/form-cluster-select/component.js +++ b/lib/shared/addon/components/form-cluster-select/component.js @@ -5,26 +5,28 @@ import { next } from '@ember/runloop'; export default Component.extend({ layout, - tagName: 'div', - classNames: ['box'], + tagName: 'div', + classNames: ['box'], requestedClusterId: null, - requestedRoles: null, - defaultExpand: null, - hasCluster: null, - setDisabled: false, + requestedClusterName: null, + requestedRoles: null, + defaultExpand: null, + hasCluster: null, + setDisabled: false, didReceiveAttrs() { if (get(this, 'hasCluster')) { next(() => { setProperties(this, { setDisabled: true, - requestedClusterId: get(this, 'hasCluster.id') + requestedClusterId: get(this, 'hasCluster.id'), + requestedClusterName: get(this, 'hasCluster.name') || `(${get(this, 'hasCluster.id')})`, }); }) } }, actions: { addRole(role) { - let roles = (get(this, 'requestedRoles')||[]).slice(); + let roles = (get(this, 'requestedRoles') || []).slice(); if (roles.includes(role)) { roles = roles.without(role); diff --git a/lib/shared/addon/components/form-cluster-select/template.hbs b/lib/shared/addon/components/form-cluster-select/template.hbs index 319365326..1b2229be1 100644 --- a/lib/shared/addon/components/form-cluster-select/template.hbs +++ b/lib/shared/addon/components/form-cluster-select/template.hbs @@ -3,7 +3,7 @@
{{#if hasCluster }} - + {{else}} {{searchable-select content=clusters value=requestedClusterId optionLabelPath="name" optionValuePath="id" localizedLabel=false}} {{/if}} diff --git a/lib/shared/addon/components/node-condition-list/component.js b/lib/shared/addon/components/node-condition-list/component.js index 7f3f38dee..35ce3d033 100644 --- a/lib/shared/addon/components/node-condition-list/component.js +++ b/lib/shared/addon/components/node-condition-list/component.js @@ -33,7 +33,7 @@ export default Component.extend({ name: 'reason', sort: ['reason'], translationKey: 'conditionSections.table.reason', - width: 200, + width: 250, }, { name: 'message',