github/karma
1
0
Fork 0
mirror of https://github.com/prymitive/karma synced 2026-05-07 03:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #678 from prymitive/fix-ts-sort

Browse Source 
fix(ui): fix fallback sorting by timestamps
This commit is contained in:
Łukasz Mierzwa
2019-05-05 08:40:35 +01:00
committed by GitHub
parent c3e164aa2f 7aee212dc9
commit ee2667744d
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ui/src/Components/Grid/AlertGrid/index.js
View File

@@ -25,7 +25,8 @@ import { GridSizesConfig, GetGridElementWidth } from "./GridSize";
import "./index.css";
const getGroupStartsAt = g => moment.max(g.alerts.map(a => moment(a.startsAt)));
const getGroupStartsAt = g =>
moment.max(g.alerts.map(a => moment(a.startsAt))).valueOf();
const getLabelValue = (alertStore, settingsStore, sortOrder, sortLabel, g) => {
// if timestamp sort is enabled use latest alert for sorting
@@ -52,6 +53,18 @@ const getLabelValue = (alertStore, settingsStore, sortOrder, sortLabel, g) => {
return mappedValue !== undefined ? mappedValue : labelValue;
};
const compareByTimestamp = (a, b) => {
const ast = getGroupStartsAt(a);
const bst = getGroupStartsAt(b);
if (ast > bst) {
return -1;
} else if (ast < bst) {
return 1;
} else {
return 0;
}
};
const AlertGrid = observer(
class AlertGrid extends Component {
static propTypes = {
@@ -181,8 +194,8 @@ const AlertGrid = observer(
);
if (av === undefined && av === undefined) {
// if both alerts lack the label they are equal
return 0;
// if both alerts lack the label they are equal, fallback to timestamps
return compareByTimestamp(a, b);
} else if (av === undefined || av > bv) {
// if first one lacks it it's should be rendered after alerts with that label
return val;
@@ -192,15 +205,9 @@ const AlertGrid = observer(
} else if (
sortOrder !== settingsStore.gridConfig.options.startsAt.value
) {
const ast = getGroupStartsAt(a);
const bst = getGroupStartsAt(b);
if (ast > bst) {
return 1;
} else if (ast < bst) {
return -1;
} else {
return 0;
}
// if values are equal use timestamps as secondary sort, but only
// if we didn't already sort by timestamps
return compareByTimestamp(a, b);
} else {
return 0;
}

4
ui/src/Components/Grid/AlertGrid/index.test.js
View File

@@ -342,9 +342,9 @@ describe("<AlertGrid />", () => {
const tree = ShallowAlertGrid();
const alertGroups = tree.find("AlertGroup");
expect(alertGroups.map(g => g.props().group.id)).toEqual([
"id3",
"id2",
"id1",
"id2"
"id3"
]);
});