From 96d27324d137e2697d099d3dbb64cc706085e9ba Mon Sep 17 00:00:00 2001 From: Zoe Steinkamp Date: Thu, 14 Nov 2019 14:55:07 -0700 Subject: [PATCH 1/2] fix(ui): arrows in table The fix for getting sorting to work --- ui/src/shared/components/tables/TableGraph.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/src/shared/components/tables/TableGraph.tsx b/ui/src/shared/components/tables/TableGraph.tsx index a8cd195b34..3f3e0d4479 100644 --- a/ui/src/shared/components/tables/TableGraph.tsx +++ b/ui/src/shared/components/tables/TableGraph.tsx @@ -71,7 +71,9 @@ class TableGraph extends PureComponent { sortOptions.field = fieldName sortOptions.direction = DEFAULT_SORT_DIRECTION } - this.setState({sortOptions}) + + const newSortOptions = {...sortOptions} + this.setState({sortOptions: newSortOptions}) } private get sortOptions(): SortOptions { From ae54fd34b2acb111b531f9e8ea47e1c37e39459a Mon Sep 17 00:00:00 2001 From: Zoe Steinkamp Date: Thu, 14 Nov 2019 17:09:29 -0700 Subject: [PATCH 2/2] fix(ui): arrows in table Change to function --- .../shared/components/tables/TableGraph.tsx | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/ui/src/shared/components/tables/TableGraph.tsx b/ui/src/shared/components/tables/TableGraph.tsx index 3f3e0d4479..ada8af443b 100644 --- a/ui/src/shared/components/tables/TableGraph.tsx +++ b/ui/src/shared/components/tables/TableGraph.tsx @@ -62,18 +62,17 @@ class TableGraph extends PureComponent { } public handleSetSort = (fieldName: string) => { - const {sortOptions} = this.state - - if (fieldName === sortOptions.field) { - sortOptions.direction = - sortOptions.direction === ASCENDING ? DESCENDING : ASCENDING - } else { - sortOptions.field = fieldName - sortOptions.direction = DEFAULT_SORT_DIRECTION - } - - const newSortOptions = {...sortOptions} - this.setState({sortOptions: newSortOptions}) + this.setState(({sortOptions}) => { + const newSortOptions = {...sortOptions} + if (fieldName === sortOptions.field) { + newSortOptions.direction = + sortOptions.direction === ASCENDING ? DESCENDING : ASCENDING + } else { + newSortOptions.field = fieldName + newSortOptions.direction = DEFAULT_SORT_DIRECTION + } + return {sortOptions: newSortOptions} + }) } private get sortOptions(): SortOptions {