github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 10:11:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #895 from weaveworks/891-fix-details-columns

Browse Source 
Details panel table header looks up label in all rows
This commit is contained in:
David
2016-02-01 17:32:43 +01:00
parent 6f70e70192 9c4b4e2745
commit 02a449348b
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/app/scripts/components/node-details/node-details-table.js
View File

@@ -52,7 +52,7 @@ export default class NodeDetailsTable extends React.Component {
return field.value;
}
}
return 0;
return -1e-10; // just under 0 to treat missing values differently from 0
}
getValuesForNode(node) {
@@ -71,8 +71,16 @@ export default class NodeDetailsTable extends React.Component {
if (this.props.nodes && this.props.nodes.length > 0) {
let headers = [{id: 'label', label: this.props.label}];
// gather header labels from metrics and metadata
const firstValues = this.getValuesForNode(this.props.nodes[0]);
headers = headers.concat(this.props.columns.map(column => ({id: column, label: firstValues[column].label})));
const nodeValues = this.props.nodes.map(this.getValuesForNode);
headers = headers.concat(this.props.columns.map(column => {
// look for a node that has the column label
const valuesWithField = nodeValues.find(values => values[column] !== undefined);
if (valuesWithField) {
return {id: column, label: valuesWithField[column].label};
}
// fall back on column id as label
return {id: column, label: column};
}));
const defaultSortBy = this.getDefaultSortBy();
return (