Skip to content

Commit 1ac25dc

Browse files
craig[bot]j82w
andcommitted
Merge #87497
87497: ui: fix database page column capitalization r=j82w a=j82w Fixed capitalization on following fields Index recommendations to Index Recommendations, Range count to Range Count, and Regions/nodes to Regions/Nodes closes #87437 <img width="1707" alt="Screen Shot 2022-09-07 at 10 33 07 AM" src="https://user-images.githubusercontent.com/8868107/188905195-ff8148e6-d153-4114-a26d-d23657c8d674.png"> <img width="824" alt="Screen Shot 2022-09-07 at 10 33 40 AM" src="https://user-images.githubusercontent.com/8868107/188905166-bea29727-58ab-4429-ba34-12ae92bd02fa.png"> Release justification: Category 2: Bug fixes and low-risk updates to new functionality Release note: None Co-authored-by: j82w <[email protected]>
2 parents d68046c + 7603d84 commit 1ac25dc

File tree

4 files changed

+20
-19
lines changed

4 files changed

+20
-19
lines changed

pkg/ui/workspaces/cluster-ui/src/databaseDetailsPage/databaseDetailsPage.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ import { Pagination, ResultsPerPageLabel } from "src/pagination";
2323
import {
2424
ColumnDescriptor,
2525
ISortedTablePagination,
26-
SortSetting,
2726
SortedTable,
27+
SortSetting,
2828
} from "src/sortedtable";
2929
import * as format from "src/util/format";
30+
import { DATE_FORMAT } from "src/util/format";
3031
import { mvccGarbage, syncHistory } from "../util";
3132

3233
import styles from "./databaseDetailsPage.module.scss";
@@ -37,7 +38,6 @@ import {
3738
} from "src/transactionsPage/transactionsPageClasses";
3839
import { Moment } from "moment";
3940
import { Caution } from "@cockroachlabs/icons";
40-
import { DATE_FORMAT } from "src/util/format";
4141
import { Anchor } from "../anchor";
4242

4343
const cx = classNames.bind(styles);
@@ -378,7 +378,7 @@ export class DatabaseDetailsPage extends React.Component<
378378
title: (
379379
<Tooltip
380380
placement="bottom"
381-
title="Regions/nodes on which the table data is stored."
381+
title="Regions/Nodes on which the table data is stored."
382382
>
383383
Regions
384384
</Tooltip>

pkg/ui/workspaces/cluster-ui/src/databaseTablePage/databaseTablePage.tsx

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
// licenses/APL.txt.
1010

1111
import React from "react";
12-
import { Col, Row, Tabs } from "antd";
12+
import { Col, Row, Tabs, Tooltip } from "antd";
1313
import "antd/lib/col/style";
1414
import "antd/lib/row/style";
1515
import "antd/lib/tabs/style";
16-
import { RouteComponentProps } from "react-router-dom";
16+
import { Link, RouteComponentProps } from "react-router-dom";
1717
import classNames from "classnames/bind";
18-
import { Tooltip } from "antd";
18+
import classnames from "classnames/bind";
1919
import "antd/lib/tooltip/style";
2020
import { Heading } from "@cockroachlabs/ui-components";
2121

@@ -24,26 +24,25 @@ import { Breadcrumbs } from "src/breadcrumbs";
2424
import { CaretRight } from "src/icon/caretRight";
2525
import { StackIcon } from "src/icon/stackIcon";
2626
import { SqlBox } from "src/sql";
27-
import { ColumnDescriptor, SortSetting, SortedTable } from "src/sortedtable";
27+
import { ColumnDescriptor, SortedTable, SortSetting } from "src/sortedtable";
2828
import {
2929
SummaryCard,
3030
SummaryCardItem,
3131
SummaryCardItemBoolSetting,
3232
} from "src/summaryCard";
3333
import * as format from "src/util/format";
34+
import { DATE_FORMAT, DATE_FORMAT_24_UTC } from "src/util/format";
3435
import { syncHistory, tableStatsClusterSetting } from "src/util";
3536

3637
import styles from "./databaseTablePage.module.scss";
3738
import { commonStyles } from "src/common";
3839
import { baseHeadingClasses } from "src/transactionsPage/transactionsPageClasses";
3940
import moment, { Moment } from "moment";
4041
import { Search as IndexIcon } from "@cockroachlabs/icons";
41-
import { Link } from "react-router-dom";
42-
import classnames from "classnames/bind";
4342
import booleanSettingStyles from "../settings/booleanSetting.module.scss";
4443
import { CircleFilled } from "../icon";
4544
import { performanceTuningRecipes } from "src/util/docs";
46-
import { DATE_FORMAT_24_UTC, DATE_FORMAT } from "src/util/format";
45+
4746
const cx = classNames.bind(styles);
4847
const booleanSettingCx = classnames.bind(booleanSettingStyles);
4948

@@ -346,7 +345,7 @@ export class DatabaseTablePage extends React.Component<
346345
placement="bottom"
347346
title="Index recommendations will appear if the system detects improper index usage, such as the occurrence of unused indexes. Following index recommendations may help improve query performance."
348347
>
349-
Index recommendations
348+
Index Recommendations
350349
</Tooltip>
351350
),
352351
cell: this.renderIndexRecommendations,
@@ -492,7 +491,7 @@ export class DatabaseTablePage extends React.Component<
492491
<SummaryCard className={cx("summary-card")}>
493492
{this.props.showNodeRegionsSection && (
494493
<SummaryCardItem
495-
label="Regions/nodes"
494+
label="Regions/Nodes"
496495
value={this.props.stats.nodesByRegionString}
497496
/>
498497
)}

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { Link, RouteComponentProps } from "react-router-dom";
1313
import { Tooltip } from "antd";
1414
import "antd/lib/tooltip/style";
1515
import classNames from "classnames/bind";
16+
import classnames from "classnames/bind";
1617

1718
import { Anchor } from "src/anchor";
1819
import { StackIcon } from "src/icon/stackIcon";
@@ -21,8 +22,8 @@ import { BooleanSetting } from "src/settings/booleanSetting";
2122
import {
2223
ColumnDescriptor,
2324
ISortedTablePagination,
24-
SortSetting,
2525
SortedTable,
26+
SortSetting,
2627
} from "src/sortedtable";
2728
import * as format from "src/util/format";
2829

@@ -33,7 +34,6 @@ import {
3334
statisticsClasses,
3435
} from "src/transactionsPage/transactionsPageClasses";
3536
import { syncHistory, tableStatsClusterSetting } from "src/util";
36-
import classnames from "classnames/bind";
3737
import booleanSettingStyles from "../settings/booleanSetting.module.scss";
3838
import { CircleFilled } from "../icon";
3939

@@ -284,7 +284,7 @@ export class DatabasesPage extends React.Component<
284284
placement="bottom"
285285
title="The total number of ranges across all tables in the database."
286286
>
287-
Range count
287+
Range Count
288288
</Tooltip>
289289
),
290290
cell: database => database.rangeCount,
@@ -296,9 +296,9 @@ export class DatabasesPage extends React.Component<
296296
title: (
297297
<Tooltip
298298
placement="bottom"
299-
title="Regions/nodes on which the database tables are located."
299+
title="Regions/Nodes on which the database tables are located."
300300
>
301-
Regions/nodes
301+
Regions/Nodes
302302
</Tooltip>
303303
),
304304
cell: database => database.nodesByRegionString || "None",
@@ -313,7 +313,7 @@ export class DatabasesPage extends React.Component<
313313
placement="bottom"
314314
title="Index recommendations will appear if the system detects improper index usage, such as the occurrence of unused indexes. Following index recommendations may help improve query performance."
315315
>
316-
Index recommendations
316+
Index Recommendations
317317
</Tooltip>
318318
),
319319
cell: this.renderIndexRecommendations,

pkg/ui/workspaces/cluster-ui/src/pageConfig/pageConfig.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ export function PageConfig(props: PageConfigProps): React.ReactElement {
3030

3131
return (
3232
<div
33-
className={cx("page-config", { "page-config__white-background": isCockroachCloud })}
33+
className={cx("page-config", {
34+
"page-config__white-background": isCockroachCloud,
35+
})}
3436
>
3537
<ul className={classes}>{props.children}</ul>
3638
</div>

0 commit comments

Comments
 (0)