From 0cae3541fa65dcf18547a44c8ad4952bd9d87436 Mon Sep 17 00:00:00 2001 From: David Kaltschmidt Date: Fri, 20 Nov 2015 13:01:09 +0100 Subject: [PATCH] Use rank to determine color in details --- client/app/scripts/components/node-details.js | 2 +- render/detailed_node.go | 2 ++ render/detailed_node_test.go | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/client/app/scripts/components/node-details.js b/client/app/scripts/components/node-details.js index 35e1773cb..fba553293 100644 --- a/client/app/scripts/components/node-details.js +++ b/client/app/scripts/components/node-details.js @@ -61,7 +61,7 @@ const NodeDetails = React.createClass({ return this.renderLoading(); } - const nodeColor = this.getNodeColorDark(details.label_major); + const nodeColor = this.getNodeColorDark(details.rank); const styles = { controls: { 'backgroundColor': this.brightenColor(nodeColor) diff --git a/render/detailed_node.go b/render/detailed_node.go index 18367e28c..ffe7ea626 100644 --- a/render/detailed_node.go +++ b/render/detailed_node.go @@ -26,6 +26,7 @@ type DetailedNode struct { ID string `json:"id"` LabelMajor string `json:"label_major"` LabelMinor string `json:"label_minor,omitempty"` + Rank string `json:"rank,omitempty"` Pseudo bool `json:"pseudo,omitempty"` Tables []Table `json:"tables"` Controls []ControlInstance `json:"controls"` @@ -115,6 +116,7 @@ func MakeDetailedNode(r report.Report, n RenderableNode) DetailedNode { ID: n.ID, LabelMajor: n.LabelMajor, LabelMinor: n.LabelMinor, + Rank: n.Rank, Pseudo: n.Pseudo, Tables: tables, Controls: controls(r, n), diff --git a/render/detailed_node_test.go b/render/detailed_node_test.go index 0d8f48625..fa31f411e 100644 --- a/render/detailed_node_test.go +++ b/render/detailed_node_test.go @@ -88,6 +88,7 @@ func TestMakeDetailedHostNode(t *testing.T) { ID: render.MakeHostID(fixture.ClientHostID), LabelMajor: "client", LabelMinor: "hostname.com", + Rank: "hostname.com", Pseudo: false, Controls: []render.ControlInstance{}, Tables: []render.Table{ @@ -155,6 +156,7 @@ func TestMakeDetailedContainerNode(t *testing.T) { ID: fixture.ServerContainerID, LabelMajor: "server", LabelMinor: fixture.ServerHostName, + Rank: "imageid456", Pseudo: false, Controls: []render.ControlInstance{}, Tables: []render.Table{