Skip to content

Commit

Permalink
Merge #73917 #73923
Browse files Browse the repository at this point in the history
73917: ui: Updated old usage of "Query" on console UI filter drop-down to "Statement" for consistency r=THardy98 a=THardy98

Previously, the text on the filtering drop-down used both "query" and
"statement" to refer to the same thing.  This change removes the old
usage of "query" on the drop-down, replacing it with "statement" for
consistency.

Resolves: #73464

Release note (ui change): updated text of filter drop-down for
consistency

73923: ui: use cluster-ui appStats functions r=matthewtodd a=xinhaoz

Partially addresses #71826

Previously, `appStats.ts` which contains utils to aggregate
statement statistics from the server was being duplicated
between db-console and cluster-ui. This commit replaces
the db-console `appStats.ts` with cluster-ui's functions,
allowing us to delete the duplicated file in db-console.

Release note: None

Co-authored-by: Thomas Hardy <thardy@cockroachlabs.com>
Co-authored-by: Xin Hao Zhang <xzhang@cockroachlabs.com>
  • Loading branch information
3 people committed Dec 16, 2021
3 parents 21174bb + 75db2a2 + 6625e14 commit ae17f3d
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 680 deletions.
4 changes: 2 additions & 2 deletions pkg/ui/workspaces/cluster-ui/src/queryFilter/filter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ export class Filter extends React.Component<QueryFilter, FilterState> {
className={checkbox.input}
/>
<label htmlFor="full-table-scan-toggle" className={checkbox.label}>
Only show statements that contain queries with full table scans
Only show statements with full table scans
</label>
</div>
);
Expand All @@ -549,7 +549,7 @@ export class Filter extends React.Component<QueryFilter, FilterState> {
{showRegions ? regionsFilter : ""}
{showNodes ? nodesFilter : ""}
<div className={filterLabel.margin}>
Query fingerprint runs longer than
Statement fingerprint runs longer than
</div>
<section className={timePair.wrapper}>
<Input
Expand Down
Loading

0 comments on commit ae17f3d

Please sign in to comment.