github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 01:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small refactor of case insensitive table sorting.

Browse Source
This commit is contained in:
Simon Howe
2016-08-30 09:07:18 +02:00
parent 35ccc9acd1
commit a1dd4eb996
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,7 @@ function getDefaultSortBy(columns, nodes) {
}
function toLower(value) {
function maybeToLower(value) {
if (!value || !value.toLowerCase) {
return value;
}
@@ -63,33 +63,35 @@ function toLower(value) {
}
function getValueForSortBy(sortBy) {
// return the node's value based on the sortBy field
return (node) => {
if (sortBy !== null) {
let field = _.union(node.metrics, node.metadata).find(f => f.id === sortBy);
function getNodeValue(node, fieldId) {
if (fieldId !== null) {
let field = _.union(node.metrics, node.metadata).find(f => f.id === fieldId);
if (field) {
if (isNumberField(field)) {
return parseFloat(field.value);
}
return field.value;
}
if (node.parents) {
field = node.parents.find(f => f.topologyId === fieldId);
if (field) {
if (isNumberField(field)) {
return parseFloat(field.value);
}
return toLower(field.value);
}
if (node.parents) {
field = node.parents.find(f => f.topologyId === sortBy);
if (field) {
return toLower(field.label);
}
}
if (node[sortBy] !== undefined && node[sortBy] !== null) {
return toLower(node[sortBy]);
return field.label;
}
}
return null;
};
if (node[fieldId] !== undefined && node[fieldId] !== null) {
return node[fieldId];
}
}
return null;
}
function getValueForSortBy(sortBy) {
return (node) => maybeToLower(getNodeValue(node, sortBy));
}