From 09efd20b4209e014aaf20b61429105f8658d8d49 Mon Sep 17 00:00:00 2001 From: Vadim Ogievetsky Date: Thu, 16 Jan 2020 10:13:47 -0800 Subject: [PATCH] fix refresh button (#9195) --- .../src/views/segments-view/segments-view.tsx | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/web-console/src/views/segments-view/segments-view.tsx b/web-console/src/views/segments-view/segments-view.tsx index 8faa07446ffe..a7d4e398d6dc 100644 --- a/web-console/src/views/segments-view/segments-view.tsx +++ b/web-console/src/views/segments-view/segments-view.tsx @@ -224,7 +224,7 @@ export class SegmentsView extends React.PureComponent { + return nestedResults.flat().sort((d1: any, d2: any) => { return d2.start.localeCompare(d1.start); }); - - return results.slice(0, SegmentsView.PAGE_SIZE); }, onStateChange: ({ result, loading, error }) => { this.setState({ allSegments: result, - segments: result, + segments: result ? result.slice(0, SegmentsView.PAGE_SIZE) : undefined, segmentsLoading: loading, segmentsError: error, }); @@ -360,6 +358,11 @@ export class SegmentsView extends React.PureComponent { + return filtered.every((f: any) => { + return d[f.id].includes(f.value); + }); + }) .sort((d1: any, d2: any) => { const v1 = d1[sortPivot]; const v2 = d2[sortPivot]; @@ -369,14 +372,10 @@ export class SegmentsView extends React.PureComponent { - return filtered.every((f: any) => { - return d[f.id].includes(f.value); - }); - }); - const segments = selectedSegments.slice(startPage, endPage); + .slice(startPage, endPage); + this.setState({ - segments, + segments: selectedSegments, }); }; @@ -683,9 +682,9 @@ export class SegmentsView extends React.PureComponent - capabilities - ? this.segmentsNoSqlQueryManager.rerunLastQuery(auto) - : this.segmentsSqlQueryManager.rerunLastQuery(auto) + capabilities.hasSql() + ? this.segmentsSqlQueryManager.rerunLastQuery(auto) + : this.segmentsNoSqlQueryManager.rerunLastQuery(auto) } localStorageKey={LocalStorageKeys.SEGMENTS_REFRESH_RATE} />