mirror of https://github.com/rancher/ui.git
Fixups
This commit is contained in:
parent
f19f9a8fc6
commit
dbf742643b
|
|
@ -27,7 +27,7 @@ export default Component.extend({
|
||||||
}),
|
}),
|
||||||
|
|
||||||
unhealthyComponents: computed('componentStataus.@each.conditions', function () {
|
unhealthyComponents: computed('componentStataus.@each.conditions', function () {
|
||||||
return this.get('componentStatuses')
|
return (this.get('componentStatuses')||[])
|
||||||
.filter(s => !s.conditions.any(c => c.status === 'True'));
|
.filter(s => !s.conditions.any(c => c.status === 'True'));
|
||||||
}),
|
}),
|
||||||
|
|
||||||
|
|
@ -97,7 +97,7 @@ export default Component.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
isHealthy(field) {
|
isHealthy(field) {
|
||||||
return this.get('componentStatuses')
|
return (this.get('componentStatuses')||[])
|
||||||
.filter(s => s.name.startsWith(field))
|
.filter(s => s.name.startsWith(field))
|
||||||
.any(s => s.conditions.any(c => c.status === 'True'));
|
.any(s => s.conditions.any(c => c.status === 'True'));
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@
|
||||||
addInitialEmptyRow=true
|
addInitialEmptyRow=true
|
||||||
base64Value=true
|
base64Value=true
|
||||||
concealValue=true
|
concealValue=true
|
||||||
editing=notIsView
|
editing=notView
|
||||||
changed=(action "updateData")
|
changed=(action "updateData")
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,12 @@
|
||||||
{{badge-state model=model}}
|
{{badge-state model=model}}
|
||||||
</td>
|
</td>
|
||||||
<td data-title="{{dt.name}}">
|
<td data-title="{{dt.name}}">
|
||||||
{{#link-to-external 'secrets.detail' model.id}}{{model.displayName}}{{/link-to-external}}
|
{{#link-to-external 'secrets.detail' model.id}}{{model.displayName}}{{/link-to-external}}
|
||||||
|
{{#if model.description}}
|
||||||
|
<p data-title="{{t 'generic.description'}}" class="text-small text-muted m-0 clip">
|
||||||
|
{{model.description}}
|
||||||
|
</p>
|
||||||
|
{{/if}}
|
||||||
</td>
|
</td>
|
||||||
<td data-title="{{dt.description}}">
|
<td data-title="{{dt.description}}">
|
||||||
{{model.description}}
|
{{model.description}}
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
{{badge-state model=model}}
|
{{badge-state model=model}}
|
||||||
</td>
|
</td>
|
||||||
<td data-title="{{dt.name}}" class="clip">
|
<td data-title="{{dt.name}}" class="clip">
|
||||||
<a href="{{href-to "service" model.id}}">{{model.displayName}} <i class="icon icon-service"></i></a>
|
<a href="{{href-to "workload" model.id}}">{{model.displayName}} <i class="icon icon-service"></i></a>
|
||||||
{{#if model.showTransitioningMessage}}
|
{{#if model.showTransitioningMessage}}
|
||||||
<div class="clip text-small {{model.stateColor}}">{{model.transitioningMessage}}</div>
|
<div class="clip text-small {{model.stateColor}}">{{model.transitioningMessage}}</div>
|
||||||
{{else if model.displayEndpoints}}
|
{{else if model.displayEndpoints}}
|
||||||
|
|
|
||||||
|
|
@ -101,7 +101,7 @@ export default Mixin.create({
|
||||||
const clusterStore = this.get('clusterStore');
|
const clusterStore = this.get('clusterStore');
|
||||||
const globalStore = this.get('globalStore');
|
const globalStore = this.get('globalStore');
|
||||||
|
|
||||||
let count = 0;
|
//let count = 0;
|
||||||
let event = queue.dequeue();
|
let event = queue.dequeue();
|
||||||
let projectId, clusterId, type, forceRemove;
|
let projectId, clusterId, type, forceRemove;
|
||||||
|
|
||||||
|
|
@ -112,11 +112,10 @@ export default Mixin.create({
|
||||||
}
|
}
|
||||||
|
|
||||||
projectId = get(event.data, 'projectId');
|
projectId = get(event.data, 'projectId');
|
||||||
clusterId = get(event.data, 'clusterId');
|
|
||||||
type = get(event.data, 'type');
|
type = get(event.data, 'type');
|
||||||
forceRemove = (event.name === 'resource.remove');
|
forceRemove = (event.name === 'resource.remove');
|
||||||
|
|
||||||
//console.log(this.label, (forceRemove ? 'Remove' : 'Change'), type +':'+ event.data.id, clusterId, projectId);
|
//console.log(this.label, (forceRemove ? 'Remove' : 'Change'), type +':'+ event.data.id, projectId);
|
||||||
|
|
||||||
if ( get(this, 'updateProjectStore') && projectId && projectStore.hasType(type) ) {
|
if ( get(this, 'updateProjectStore') && projectId && projectStore.hasType(type) ) {
|
||||||
//console.log(' Update project store', type, event.data.id, projectId);
|
//console.log(' Update project store', type, event.data.id, projectId);
|
||||||
|
|
@ -124,7 +123,7 @@ export default Mixin.create({
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( get(this,'updateClusterStore') && clusterStore.hasType(type) ) {
|
if ( get(this,'updateClusterStore') && clusterStore.hasType(type) ) {
|
||||||
//console.log(' Update cluster store', type, event.data.id, clusterId);
|
//console.log(' Update cluster store', type, event.data.id);
|
||||||
updateStore(clusterStore, event.data, forceRemove);
|
updateStore(clusterStore, event.data, forceRemove);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -133,7 +132,7 @@ export default Mixin.create({
|
||||||
updateStore(globalStore, event.data, forceRemove);
|
updateStore(globalStore, event.data, forceRemove);
|
||||||
}
|
}
|
||||||
|
|
||||||
count++;
|
//count++;
|
||||||
|
|
||||||
event = queue.dequeue();
|
event = queue.dequeue();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
import EmberObject from '@ember/object';
|
import EmberObject from '@ember/object';
|
||||||
import Subscribe from 'shared/mixins/subscribe';
|
import Subscribe from 'shared/mixins/subscribe';
|
||||||
import { get, set } from '@ember/object';
|
import { get, set } from '@ember/object';
|
||||||
import { inject as service } from '@ember/service';
|
|
||||||
|
|
||||||
export default EmberObject.extend(Subscribe, {
|
export default EmberObject.extend(Subscribe, {
|
||||||
updateProjectStore: false,
|
updateProjectStore: false,
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
import EmberObject from '@ember/object';
|
import EmberObject from '@ember/object';
|
||||||
import Subscribe from 'shared/mixins/subscribe';
|
import Subscribe from 'shared/mixins/subscribe';
|
||||||
import { get, set } from '@ember/object';
|
import { get, set } from '@ember/object';
|
||||||
import { inject as service } from '@ember/service';
|
|
||||||
|
|
||||||
export default EmberObject.extend(Subscribe, {
|
export default EmberObject.extend(Subscribe, {
|
||||||
updateClusterStore: false,
|
updateClusterStore: false,
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
import EmberObject from '@ember/object';
|
import EmberObject from '@ember/object';
|
||||||
import Subscribe from 'shared/mixins/subscribe';
|
import Subscribe from 'shared/mixins/subscribe';
|
||||||
import { get, set } from '@ember/object';
|
import { get, set } from '@ember/object';
|
||||||
import { inject as service } from '@ember/service';
|
|
||||||
|
|
||||||
export default EmberObject.extend(Subscribe, {
|
export default EmberObject.extend(Subscribe, {
|
||||||
init() {
|
init() {
|
||||||
|
|
|
||||||
|
|
@ -3655,7 +3655,7 @@ newReceiver:
|
||||||
|
|
||||||
newSecret:
|
newSecret:
|
||||||
title:
|
title:
|
||||||
add: Add Secret
|
new: Add Secret
|
||||||
edit: 'Edit Secret: {name}'
|
edit: 'Edit Secret: {name}'
|
||||||
view: 'Secret: {name}'
|
view: 'Secret: {name}'
|
||||||
name:
|
name:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue