diff --git a/app/mixins/cattle-transitioning-resource.js b/app/mixins/cattle-transitioning-resource.js index e06cd4999..cc3abe84d 100644 --- a/app/mixins/cattle-transitioning-resource.js +++ b/app/mixins/cattle-transitioning-resource.js @@ -20,7 +20,7 @@ const defaultStateMap = { 'initializing': {icon: 'icon icon-alert', color: 'text-warning'}, 'migrating': {icon: 'icon icon-info', color: 'text-info' }, 'provisioning': {icon: 'icon icon-circle', color: 'text-info' }, - 'garbage-collection': {icon: 'icon icon-trash', color: 'text-success'}, + 'pending-delete': {icon: 'icon icon-trash', color: 'text-muted' }, 'purged': {icon: 'icon icon-purged', color: 'text-error' }, 'purging': {icon: 'icon icon-purged', color: 'text-info' }, 'reconnecting': {icon: 'icon icon-alert', color: 'text-error' }, diff --git a/app/mixins/state-counts.js b/app/mixins/state-counts.js index cbd9203ef..2643a22b6 100644 --- a/app/mixins/state-counts.js +++ b/app/mixins/state-counts.js @@ -16,6 +16,10 @@ export default Ember.Mixin.create({ this.get(inputKey).sortBy('stateSort').forEach((inst) => { let color = inst.get('stateBackground'); + if ( color === 'bg-muted' ) { + color = 'bg-success'; + } + let state = inst.get('displayState'); let entry = byName.findBy('state', state); if ( entry ) { @@ -42,7 +46,7 @@ export default Ember.Mixin.create({ this.set(sortProperty, Ember.computed(countsProperty, `${inputKey}.[]`, () => { let colors = this.get(`${countsProperty}.byColor`); - let success = (colors.findBy('bg-success')||{}).count; + let success = (colors.findBy('bg-success')||{}).count + (colors.findBy('bg-muted')||{}).coun; let error = (colors.findBy('bg-error')||{}).count; let other = this.get(`${inputKey}.length`) - success - error; diff --git a/app/models/container.js b/app/models/container.js index 377bfac4e..cfd6b9931 100644 --- a/app/models/container.js +++ b/app/models/container.js @@ -143,8 +143,8 @@ var Container = Instance.extend({ var health = this.get('healthState'); var hasCheck = !!this.get('healthCheck'); - if ( this.get('desired') === false ) { - return 'garbage-collection'; + if ( resource === 'stopped' && this.get('desired') === false ) { + return 'pending-delete'; } else if ( C.ACTIVEISH_STATES.indexOf(resource) >= 0 ) { diff --git a/app/styles/components/_badge-state.scss b/app/styles/components/_badge-state.scss index ab7cd7b46..4ded207cc 100644 --- a/app/styles/components/_badge-state.scss +++ b/app/styles/components/_badge-state.scss @@ -11,6 +11,16 @@ &.text-success:hover { color: $success; } + + // Successful states are de-emphasized by using [text-]color instead of background-color + &.bg-muted { + background-color: transparent; + color: $text-muted; + } + + &.text-success:hover { + color: $text-muted; + } } .grid TD.state {