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

table-mode: handle nodes w/ no value for sorted column gracefully

Browse Source 
- put empty values below those that have a value.

+-----+-----+
|3    |5    |
|4    |4    |
|5    |3    |
|null |null |
|null |null |
+-----+-----+
This commit is contained in:
Simon Howe
2016-08-03 14:21:33 +02:00
parent 5a872da0cf
commit 6c0f8ba638
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@ function getMetaDataSorters(nodes) {
}
function getSortedNodes(nodes, columns, sortBy, sortedDesc) {
function sortNodes(nodes, columns, sortBy, sortedDesc) {
const sortedNodes = _.sortBy(
nodes,
getValueForSortBy(sortBy || getDefaultSortBy(columns, nodes)),
@@ -101,6 +101,19 @@ function getSortedNodes(nodes, columns, sortBy, sortedDesc) {
}
function getSortedNodes(nodes, columns, sortBy, sortedDesc) {
const getValue = getValueForSortBy(sortBy || getDefaultSortBy(columns, nodes));
const withAndWithoutValues = _.groupBy(nodes, (n) => {
const v = getValue(n);
return v !== null && v !== undefined;
});
const withValues = sortNodes(withAndWithoutValues.true, columns, sortBy, sortedDesc);
const withoutValues = sortNodes(withAndWithoutValues.false, columns, sortBy, sortedDesc);
return _.concat(withValues, withoutValues);
}
function getColumnsWidths(headers) {
return headers.map((h, i) => {
//