Merge cockroachdb#93653

93653: ui: remove unused nodeNames property r=matthewtodd a=matthewtodd Epic: none Release note: None Co-authored-by: Matthew Todd <[email protected]>
DrewKimball · Dec 15, 2022 · 94854c9 · 94854c9
2 parents ada531f + acf65bc
commit 94854c9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 18 deletions.
diff --git a/pkg/ui/workspaces/cluster-ui/src/statementDetails/statementDetails.fixture.ts b/pkg/ui/workspaces/cluster-ui/src/statementDetails/statementDetails.fixture.ts
@@ -815,12 +815,6 @@ export const getStatementDetailsPropsFixture = (
   statementFingerprintID: "4705782015019656142",
   statementDetails: withData ? statementDetailsData : statementDetailsNoData,
   statementsError: null,
-  nodeNames: {
-    "1": "127.0.0.1:55529 (n1)",
-    "2": "127.0.0.1:55532 (n2)",
-    "3": "127.0.0.1:55538 (n3)",
-    "4": "127.0.0.1:55546 (n4)",
-  },
   nodeRegions: {
     "1": "gcp-us-east1",
     "2": "gcp-us-east1",

diff --git a/pkg/ui/workspaces/cluster-ui/src/statementDetails/statementDetails.tsx b/pkg/ui/workspaces/cluster-ui/src/statementDetails/statementDetails.tsx
@@ -133,7 +133,6 @@ export interface StatementDetailsStateProps {
   isLoading: boolean;
   statementsError: Error | null;
   timeScale: TimeScale;
-  nodeNames: { [nodeId: string]: string };
   nodeRegions: { [nodeId: string]: string };
   diagnosticsReports: StatementDiagnosticsReport[];
   uiConfig?: UIConfigState["pages"]["statementDetails"];

diff --git a/pkg/ui/workspaces/cluster-ui/src/statementDetails/statementDetailsConnected.ts b/pkg/ui/workspaces/cluster-ui/src/statementDetails/statementDetailsConnected.ts
@@ -25,10 +25,7 @@ import {
   selectIsTenant,
   selectHasViewActivityRedactedRole,
 } from "../store/uiConfig";
-import {
-  nodeDisplayNameByIDSelector,
-  nodeRegionsByIDSelector,
-} from "../store/nodes";
+import { nodeRegionsByIDSelector } from "../store/nodes";
 import { actions as sqlDetailsStatsActions } from "src/store/statementDetails";
 import { actions as sqlStatsActions } from "src/store/sqlStats";
 import {
@@ -62,8 +59,6 @@ const mapStateToProps = (state: AppState, props: RouteComponentProps) => {
     isLoading: isLoading,
     statementsError: lastError,
     timeScale: selectTimeScale(state),
-    // TODO(todd): Remove this unused property!
-    nodeNames: selectIsTenant(state) ? {} : nodeDisplayNameByIDSelector(state),
     nodeRegions: nodeRegionsByIDSelector(state),
     diagnosticsReports:
       selectIsTenant(state) || selectHasViewActivityRedactedRole(state)

diff --git a/pkg/ui/workspaces/db-console/src/views/statements/statementDetails.tsx b/pkg/ui/workspaces/db-console/src/views/statements/statementDetails.tsx
@@ -20,10 +20,7 @@ import {
   refreshUserSQLRoles,
 } from "src/redux/apiReducers";
 import { RouteComponentProps } from "react-router";
-import {
-  nodeDisplayNameByIDSelector,
-  nodeRegionsByIDSelector,
-} from "src/redux/nodes";
+import { nodeRegionsByIDSelector } from "src/redux/nodes";
 import { AdminUIState, AppDispatch } from "src/redux/state";
 import { selectDiagnosticsReportsByStatementFingerprint } from "src/redux/statements/statementsSelectors";
 import {
@@ -109,7 +106,6 @@ const mapStateToProps = (
     isLoading: isLoading,
     statementsError: lastError,
     timeScale: selectTimeScale(state),
-    nodeNames: nodeDisplayNameByIDSelector(state),
     nodeRegions: nodeRegionsByIDSelector(state),
     diagnosticsReports: selectDiagnosticsReportsByStatementFingerprint(
       state,