From b80e4ea6f5b76c1bd52cd995bbe2ac1adbeb029a Mon Sep 17 00:00:00 2001 From: Chris Kruining Date: Wed, 11 Dec 2024 10:06:18 +0100 Subject: [PATCH] use dataset functions --- src/components/table/table.tsx | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/src/components/table/table.tsx b/src/components/table/table.tsx index 12a9f91..a02dcd2 100644 --- a/src/components/table/table.tsx +++ b/src/components/table/table.tsx @@ -71,41 +71,19 @@ function InnerTable>(props: InnerTableProps) { const groupBy = table.groupBy(); const sort = table.sort(); - let kaas = createDataSet(props.rows); + let dataset = createDataSet(props.rows); if (sort) { - kaas = toSorted(kaas, { by: sort.by, reversed: sort.reversed ?? false, with: (a, b) => a < b ? -1 : a > b ? 1 : 0 }) + dataset = toSorted(dataset, { by: sort.by, reversed: sort.reversed ?? false, with: (a, b) => a < b ? -1 : a > b ? 1 : 0 }) } if (groupBy) { - kaas = toGrouped(kaas, { by: groupBy, with: columns.find(({ id }) => id === groupBy)?.groupBy ?? defaultGroupingFunction(groupBy) }); + dataset = toGrouped(dataset, { by: groupBy, with: columns.find(({ id }) => id === groupBy)?.groupBy ?? defaultGroupingFunction(groupBy) }); } - console.log(kaas); - - const rows = props.rows; - - if (sort) { - rows.sort((a, b) => a[sort.by] < b[sort.by] ? -1 : a[sort.by] > b[sort.by] ? 1 : 0); - - if (sort.reversed === true) { - rows.reverse(); - } - } - - const nodes = Object.entries(rows).map>(([i, row]) => ({ kind: 'row', key: i, value: row })); - - if (groupBy === undefined) { - return nodes; - } - - const groupingFunction = columns.find(({ id }) => id === groupBy)?.groupBy ?? defaultGroupingFunction(groupBy); - - return groupingFunction(nodes); + return dataset; }); - - return