Skip to content

Sort by Node name before sorting on other values #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mikekmikek wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Sort by Node name before sorting on other values #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/containers/A_monitor/monitorpage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,25 +571,27 @@ We use string sort function if value is one of the arrays else do second sort nu
sortData(data, value = null, direction = null, worst_perform = false) {
const toSortBy = value === null ? this.state.sortBy : value
let newData = []
let alphabeticData = []
alphabeticData = data.sort((a, b) => a['node_address'].localeCompare(b['node_address']));
if (['node', 'isp', 'location', 'version', 'action', 'node_address'].includes(toSortBy)){ //Add items we want to sort by that are strings
//This sort function for strings
newData = data.sort((a, b) => a[toSortBy].localeCompare(b[toSortBy]));
newData = alphabeticData.sort((a, b) => a[toSortBy].localeCompare(b[toSortBy]));
} else if (toSortBy === 'bond_providers') {
//This is for bond provider sort as we need to go another layer deep in the object
newData = data.sort((a, b) => a[toSortBy].providers.length - b[toSortBy].providers.length);
newData = alphabeticData.sort((a, b) => a[toSortBy].providers.length - b[toSortBy].providers.length);
} else if (worst_perform === true) {
//This is for when we are sorting for action of worst performance as we want to exclude any with age under 3 days
const ageCutOffDays = 3
const a = data.filter(item => parseFloat(item.age) > ageCutOffDays)
const b = data.filter(item => parseFloat(item.age) <= ageCutOffDays)
const a = alphabeticData.filter(item => parseFloat(item.age) > ageCutOffDays)
const b = alphabeticData.filter(item => parseFloat(item.age) <= ageCutOffDays)

const aSorted = a.sort((a, b) => (b[toSortBy] - a[toSortBy]) );

aSorted[aSorted.length-1].action = 'Worst Performing'
newData = [...aSorted, ...b]
} else {
//This sort function for numbers
newData = data.sort((a, b) => a[toSortBy] - b[toSortBy]);
newData = alphabeticData.sort((a, b) => a[toSortBy] - b[toSortBy]);
}
//If we pass it a direction, we set it here, if not we take it from the state
const toDirection = direction === null ? this.state.sortDirection : direction
Expand Down