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

Merge pull request #1747 from weaveworks/sort-nodes-nicely-1744

Browse Source 
table-mode: handle nodes w/ no value for sorted column gracefully
This commit is contained in:
Simon
2016-08-03 17:47:48 +02:00
committed by GitHub
parent 2bba18dbfa d02cb25495
commit 8ce5bdb00d
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 ? 'withValues' : 'withoutValues';
});
const withValues = sortNodes(withAndWithoutValues.withValues, columns, sortBy, sortedDesc);
const withoutValues = sortNodes(withAndWithoutValues.withoutValues, columns, sortBy, sortedDesc);
return _.concat(withValues, withoutValues);
}
function getColumnsWidths(headers) {
return headers.map((h, i) => {
//