Skip to content

[Backport] Web console: fix refresh button in segments view #9203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clintropolis merged 1 commit into from
Jan 17, 2020
Merged

[Backport] Web console: fix refresh button in segments view #9203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions web-console/src/views/segments-view/segments-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
` "segment_id", "datasource", "start", "end", "size", "version", "partition_num", "num_replicas", "num_rows", "is_published", "is_available", "is_realtime", "is_overshadowed", "payload"`,
`FROM sys.segments`,
`WHERE`,
` ("start" || '/' || "end") IN (${intervals})`,
intervals ? ` ("start" || '/' || "end") IN (${intervals})` : 'FALSE',
whereClause ? ` AND ${whereClause}` : '',
]);

Expand Down Expand Up @@ -311,16 +311,14 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
}),
);

const results: SegmentQueryResultRow[] = nestedResults.flat().sort((d1: any, d2: any) => {
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,
});
Expand Down Expand Up @@ -360,6 +358,11 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
const sortPivot = sorted[0].id;
const sortDesc = sorted[0].desc;
const selectedSegments = allSegments
.filter((d: any) => {
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];
Expand All @@ -369,14 +372,10 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
return sortDesc ? v2 - v1 : v1 - v2;
}
})
.filter((d: any) => {
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,
});
};

Expand Down Expand Up @@ -683,9 +682,9 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
<ViewControlBar label="Segments">
<RefreshButton
onRefresh={auto =>
capabilities
? this.segmentsNoSqlQueryManager.rerunLastQuery(auto)
: this.segmentsSqlQueryManager.rerunLastQuery(auto)
capabilities.hasSql()
? this.segmentsSqlQueryManager.rerunLastQuery(auto)
: this.segmentsNoSqlQueryManager.rerunLastQuery(auto)
}
localStorageKey={LocalStorageKeys.SEGMENTS_REFRESH_RATE}
/>
Expand Down