summaryrefslogtreecommitdiff
path: root/web/src/pages
diff options
context:
space:
mode:
authorFabien Boucher <fboucher@redhat.com>2019-07-26 14:56:25 +0200
committerFabien Boucher <fboucher@redhat.com>2019-07-26 14:56:25 +0200
commit09846f7640b6953c142fc76f44b5311148479a05 (patch)
treed287351409a87a7f06d56ef9af0b73178022a6f9 /web/src/pages
parent267345125f8ca9907b9478ebb97cfe7af94c458b (diff)
downloadzuul-09846f7640b6953c142fc76f44b5311148479a05.tar.gz
Builds page - Fix bad labels display
When a node is attached multiple labels then all labels are displayed without seperator. This changes make sure the labels column is called "Labels" and that each node's labels is separated by a comma. Change-Id: I8d3d90ef131847ee6319bb19ec00a07bfd0e82a8
Diffstat (limited to 'web/src/pages')
-rw-r--r--web/src/pages/Nodes.jsx6
1 files changed, 4 insertions, 2 deletions
diff --git a/web/src/pages/Nodes.jsx b/web/src/pages/Nodes.jsx
index 33a7e6d4e..0036e5829 100644
--- a/web/src/pages/Nodes.jsx
+++ b/web/src/pages/Nodes.jsx
@@ -44,6 +44,7 @@ class NodesPage extends Refreshable {
const headerFormat = value => <Table.Heading>{value}</Table.Heading>
const cellFormat = value => <Table.Cell>{value}</Table.Cell>
+ const cellLabelsFormat = value => <Table.Cell>{value.join(',')}</Table.Cell>
const cellPreFormat = value => (
<Table.Cell style={{fontFamily: 'Menlo,Monaco,Consolas,monospace'}}>
{value}
@@ -55,14 +56,15 @@ class NodesPage extends Refreshable {
const columns = []
const myColumns = [
- 'id', 'label', 'connection', 'server', 'provider', 'state',
+ 'id', 'labels', 'connection', 'server', 'provider', 'state',
'age', 'comment'
]
myColumns.forEach(column => {
let formatter = cellFormat
let prop = column
- if (column === 'label') {
+ if (column === 'labels') {
prop = 'type'
+ formatter = cellLabelsFormat
} else if (column === 'connection') {
prop = 'connection_type'
} else if (column === 'server') {