From bb855b5f2113968ce7477ef8e828890d389d0176 Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Tue, 29 May 2018 10:27:24 -0700 Subject: [PATCH] Add ineligibility to the status light --- ui/app/models/node.js | 6 ++++++ ui/app/styles/components/node-status-light.scss | 4 ++++ ui/app/templates/clients/client.hbs | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ui/app/models/node.js b/ui/app/models/node.js index d90057dfc..ead56d7cd 100644 --- a/ui/app/models/node.js +++ b/ui/app/models/node.js @@ -56,4 +56,10 @@ export default Model.extend({ unhealthyDriverNames: computed('unhealthyDrivers.@each.name', function() { return this.get('unhealthyDrivers').mapBy('name'); }), + + // A status attribute that includes states not included in node status. + // Useful for coloring and sorting nodes + compositeStatus: computed('status', 'isEligible', function() { + return this.get('isEligible') ? this.get('status') : 'ineligible'; + }), }); diff --git a/ui/app/styles/components/node-status-light.scss b/ui/app/styles/components/node-status-light.scss index 8acb0cfce..9077e333a 100644 --- a/ui/app/styles/components/node-status-light.scss +++ b/ui/app/styles/components/node-status-light.scss @@ -26,4 +26,8 @@ $size: 0.75em; darken($grey-lighter, 25%) 6px ); } + + &.ineligible { + background: $warning; + } } diff --git a/ui/app/templates/clients/client.hbs b/ui/app/templates/clients/client.hbs index f5ad36c9f..c68c67ac0 100644 --- a/ui/app/templates/clients/client.hbs +++ b/ui/app/templates/clients/client.hbs @@ -9,7 +9,7 @@ {{#gutter-menu class="page-body"}}

- + {{or model.name model.shortId}} {{model.id}}