Merge pull request cockroachdb#62797 from elkmaster/upgrade-to-cluste…

…r-ui release-20.2: ui: fix aggregation on txn details
fqazi · Apr 1, 2021 · fcda846 · fcda846
2 parents f85bc60 + 6478947
commit fcda846
Show file tree

Hide file tree

Showing 15 changed files with 130 additions and 65 deletions.
diff --git a/pkg/ui/package.json b/pkg/ui/package.json
@@ -13,7 +13,7 @@
     "cypress:update-snapshots": "yarn cypress run --env updateSnapshots=true --spec 'cypress/integration/**/*.visual.spec.ts'"
   },
   "dependencies": {
-    "@cockroachlabs/admin-ui-components": "^0.1.28",
+    "@cockroachlabs/cluster-ui": "^0.1.63",
     "analytics-node": "^3.4.0-beta.1",
     "antd": "^3.25.2",
     "babel-polyfill": "^6.26.0",

diff --git a/pkg/ui/src/app.spec.tsx b/pkg/ui/src/app.spec.tsx
@@ -32,7 +32,7 @@ import {
 } from "src/views/databases/containers/databases";
 import { TableMain } from "src/views/databases/containers/tableDetails";
 import { DataDistributionPage } from "src/views/cluster/containers/dataDistribution";
-import { StatementsPage } from "@cockroachlabs/admin-ui-components";
+import { StatementsPage } from "@cockroachlabs/cluster-ui";
 import { StatementDetails } from "src/views/statements/statementDetails";
 import Debug from "src/views/reports/containers/debug";
 import { ReduxDebug } from "src/views/reports/containers/redux";

diff --git a/pkg/ui/src/views/cluster/containers/nodeOverview/index.tsx b/pkg/ui/src/views/cluster/containers/nodeOverview/index.tsx
@@ -23,7 +23,7 @@ import { Bytes, DATE_FORMAT, Percentage } from "src/util/format";
 import { INodeStatus, MetricConstants, StatusMetrics } from "src/util/proto";
 import { getMatchParamByName } from "src/util/query";
 import { SummaryBar, SummaryLabel, SummaryValue } from "src/views/shared/components/summaryBar";
-import { Button } from "@cockroachlabs/admin-ui-components";
+import { Button } from "@cockroachlabs/cluster-ui";
 import { ArrowLeft } from "@cockroachlabs/icons";
 import "./nodeOverview.styl";
 import { LiveBytesTooltip, KeyBytesTooltip, ValueBytesTooltip, IntentBytesTooltip, SystemBytesTooltip, NodeUsedCapacityTooltip, NodeAvailableCapacityTooltip, NodeMaximumCapacityTooltip } from "./tooltips";

diff --git a/pkg/ui/src/views/databases/containers/tableDetails/index.tsx b/pkg/ui/src/views/databases/containers/tableDetails/index.tsx
@@ -26,7 +26,7 @@ import { SortedTable } from "src/views/shared/components/sortedtable";
 const { TabPane } = Tabs;
 import { getMatchParamByName } from "src/util/query";
 import { databaseDetails } from "../databaseSummary";
-import { Button } from "@cockroachlabs/admin-ui-components";
+import { Button } from "@cockroachlabs/cluster-ui";
 import { ArrowLeft } from "@cockroachlabs/icons";
 import SqlBox from "src/views/shared/components/sql/box";
 

diff --git a/pkg/ui/src/views/jobs/jobDetails.tsx b/pkg/ui/src/views/jobs/jobDetails.tsx
@@ -27,7 +27,7 @@ import { SummaryCard } from "../shared/components/summaryCard";
 import Job = cockroach.server.serverpb.JobsResponse.IJob;
 import JobsRequest = cockroach.server.serverpb.JobsRequest;
 import JobsResponse = cockroach.server.serverpb.JobsResponse;
-import { Button } from "@cockroachlabs/admin-ui-components";
+import { Button } from "@cockroachlabs/cluster-ui";
 import { ArrowLeft } from "@cockroachlabs/icons";
 import { DATE_FORMAT } from "src/util/format";
 import { JobStatusCell } from "./jobStatusCell";

diff --git a/pkg/ui/src/views/jobs/jobTable.tsx b/pkg/ui/src/views/jobs/jobTable.tsx
@@ -20,7 +20,7 @@ import { isEmpty, isEqual, map } from "lodash";
 import {JobDescriptionCell} from "src/views/jobs/jobDescriptionCell";
 import Job = cockroach.server.serverpb.JobsResponse.IJob;
 import JobsResponse = cockroach.server.serverpb.JobsResponse;
-import { Pagination, ResultsPerPageLabel } from "@cockroachlabs/admin-ui-components";
+import { Pagination, ResultsPerPageLabel } from "@cockroachlabs/cluster-ui";
 import { jobTable } from "src/util/docs";
 import { trackDocsLink } from "src/util/analytics";
 

diff --git a/pkg/ui/src/views/sessions/sessionDetails.tsx b/pkg/ui/src/views/sessions/sessionDetails.tsx
@@ -33,7 +33,7 @@ import {nodeDisplayNameByIDSelector} from "src/redux/nodes";
 import {NodeLink, StatementLinkTarget} from "src/views/statements/statementsTableContent";
 import TerminateSessionModal, {TerminateSessionModalRef} from "src/views/sessions/terminateSessionModal";
 import TerminateQueryModal, {TerminateQueryModalRef} from "src/views/sessions/terminateQueryModal";
-import { Button } from "@cockroachlabs/admin-ui-components";
+import { Button } from "@cockroachlabs/cluster-ui";
 import { ArrowLeft } from "@cockroachlabs/icons";
 import { Text, TextTypes } from "src/components";
 

diff --git a/pkg/ui/src/views/sessions/sessionsPage.tsx b/pkg/ui/src/views/sessions/sessionsPage.tsx
@@ -31,7 +31,7 @@ import {SessionsResponseMessage} from "src/util/api";
 import TerminateSessionModal, {TerminateSessionModalRef} from "src/views/sessions/terminateSessionModal";
 import TerminateQueryModal, {TerminateQueryModalRef} from "src/views/sessions/terminateQueryModal";
 import {showSessions} from "src/util/docs";
-import { Pagination, ResultsPerPageLabel } from "@cockroachlabs/admin-ui-components";
+import { Pagination, ResultsPerPageLabel } from "@cockroachlabs/cluster-ui";
 
 const sortableTableCx = classNames.bind(sortableTableStyles);
 const cx = classNames.bind(styles);

diff --git a/pkg/ui/src/views/shared/components/sortabletable/index.tsx b/pkg/ui/src/views/shared/components/sortabletable/index.tsx
@@ -278,7 +278,7 @@ export class SortableTable extends React.Component<TableProps> {
                   classes.push(cx("sort-table__cell--sortable"));
                   onClick = () => {
                     // TODO (koorosh): `title` field has ReactNode type isn't correct field to
-                    // track column name. `SortableColumn` has to be imported from `@cockroachlabs/admin-ui-components`
+                    // track column name. `SortableColumn` has to be imported from `@cockroachlabs/cluster-ui`
                     // package which has extended field to track column name.
                     trackTableSort(className, c.title.toString(), sortSetting.ascending);
                     this.clickSort(c.sortKey);

diff --git a/pkg/ui/src/views/statements/statementDetails.tsx b/pkg/ui/src/views/statements/statementDetails.tsx
@@ -47,7 +47,7 @@ import classNames from "classnames/bind";
 import {
   selectDiagnosticsReportsCountByStatementFingerprint,
 } from "src/redux/statements/statementsSelectors";
-import { Button } from "@cockroachlabs/admin-ui-components";
+import { Button } from "@cockroachlabs/cluster-ui";
 import { ArrowLeft } from "@cockroachlabs/icons";
 import { trackSubnavSelection } from "src/util/analytics";
 import styles from "./statementDetails.module.styl";

diff --git a/pkg/ui/src/views/statements/statementsPage.fixture.ts b/pkg/ui/src/views/statements/statementsPage.fixture.ts
@@ -8,7 +8,7 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-import { StatementsPageProps } from "@cockroachlabs/admin-ui-components";
+import { StatementsPageProps } from "@cockroachlabs/cluster-ui";
 import { createMemoryHistory } from "history";
 import Long from "long";
 import * as protos from "src/js/protos";

diff --git a/pkg/ui/src/views/statements/statementsPage.tsx b/pkg/ui/src/views/statements/statementsPage.tsx
@@ -35,7 +35,7 @@ import {
 import { createStatementDiagnosticsAlertLocalSetting } from "src/redux/alerts";
 import { getMatchParamByName } from "src/util/query";
 
-import { StatementsPage, AggregateStatistics } from "@cockroachlabs/admin-ui-components";
+import { StatementsPage, AggregateStatistics } from "@cockroachlabs/cluster-ui";
 import { createOpenDiagnosticsModalAction, createStatementDiagnosticsReportAction } from "src/redux/statements";
 import {
   trackStatementsPaginationAction,

diff --git a/pkg/ui/src/views/transactions/transactionsPage.tsx b/pkg/ui/src/views/transactions/transactionsPage.tsx
@@ -21,7 +21,7 @@ import { StatementsResponseMessage } from "src/util/api";
 import { TimestampToMoment } from "src/util/convert";
 import { PrintTime } from "src/views/reports/containers/range/print";
 
-import { TransactionsPage } from "@cockroachlabs/admin-ui-components";
+import { TransactionsPage } from "@cockroachlabs/cluster-ui";
 
 // selectStatements returns the array of AggregateStatistics to show on the
 // TransactionsPage, based on if the appAttr route parameter is set.

diff --git a/pkg/ui/yarn-vendor b/pkg/ui/yarn-vendor
+ −		@babel-runtime-7.13.10.tgz
+ −		@cockroachlabs-cluster-ui-0.1.63.tgz
+ −		@cockroachlabs-crdb-protobuf-client-0.0.4.tgz
+ −		@cockroachlabs-ui-components-0.2.14-alpha.0.tgz
+ −		@popperjs-core-2.9.1.tgz
+ −		@reduxjs-toolkit-1.5.1.tgz
+ −		d3-array-2.12.1.tgz
+ −		d3-scale-3.2.4.tgz
+ −		highlight.js-10.7.1.tgz
+ −		immer-8.0.4.tgz
+ −		internmap-1.0.1.tgz
+ −		react-popper-2.2.5.tgz
+ −		regenerator-runtime-0.13.7.tgz