From b11495eb1ee5dae94ac6e17b493363a87480c84e Mon Sep 17 00:00:00 2001 From: reslene Date: Mon, 6 Mar 2023 18:54:41 +0100 Subject: [PATCH] fix(Chart): order labels (x) Signed-off-by: reslene --- app/src/components/Dataviz/Charts/utils.ts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/app/src/components/Dataviz/Charts/utils.ts b/app/src/components/Dataviz/Charts/utils.ts index 145eb30c..4c9e994e 100644 --- a/app/src/components/Dataviz/Charts/utils.ts +++ b/app/src/components/Dataviz/Charts/utils.ts @@ -149,6 +149,9 @@ export const buildLabels = ( ) as string[]; return uniqLabels + + .sort((a, b) => (dayjs(a) < dayjs(b) ? 1 : -1)) + .reverse() .map((item: Date | string) => { const date = dayjs(item); if (date.isValid()) { @@ -156,13 +159,5 @@ export const buildLabels = ( } return item; - }) - .sort((a, b) => { - if (typeof a === 'string' && typeof b === 'string') { - return dayjs(a) < dayjs(b) ? 1 : -1; - } - - return a < b ? 1 : -1; - }) - .reverse(); + }); };