From 8bfa82a6136e1f0ba348213ea51c6142e3df2142 Mon Sep 17 00:00:00 2001 From: Matthew Todd Date: Mon, 19 Dec 2022 10:49:18 -0500 Subject: [PATCH] ui: refresh nodes on tenants Part of #89949 Now that we can show meaningful region information for tenants, we need to actually trigger the fetching of that information. Release note: None --- .../workspaces/cluster-ui/src/sessions/sessionDetails.tsx | 2 +- .../cluster-ui/src/sessions/sessionDetailsConnected.tsx | 4 +++- .../cluster-ui/src/statementDetails/statementDetails.tsx | 4 ++-- .../cluster-ui/src/statementsPage/statementsPage.tsx | 4 ++-- .../src/transactionDetails/transactionDetails.tsx | 8 ++------ .../cluster-ui/src/transactionsPage/transactionsPage.tsx | 8 ++------ 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/pkg/ui/workspaces/cluster-ui/src/sessions/sessionDetails.tsx b/pkg/ui/workspaces/cluster-ui/src/sessions/sessionDetails.tsx index f17d9b1a22eb..e62f12ec6584 100644 --- a/pkg/ui/workspaces/cluster-ui/src/sessions/sessionDetails.tsx +++ b/pkg/ui/workspaces/cluster-ui/src/sessions/sessionDetails.tsx @@ -106,8 +106,8 @@ export class SessionDetails extends React.Component { }; componentDidMount(): void { + this.props.refreshNodes(); if (!this.props.isTenant) { - this.props.refreshNodes(); this.props.refreshNodesLiveness(); } this.props.refreshSessions(); diff --git a/pkg/ui/workspaces/cluster-ui/src/sessions/sessionDetailsConnected.tsx b/pkg/ui/workspaces/cluster-ui/src/sessions/sessionDetailsConnected.tsx index 33e8d1394805..4d9a928b960d 100644 --- a/pkg/ui/workspaces/cluster-ui/src/sessions/sessionDetailsConnected.tsx +++ b/pkg/ui/workspaces/cluster-ui/src/sessions/sessionDetailsConnected.tsx @@ -29,7 +29,9 @@ import { TimeScale } from "src/timeScaleDropdown"; export const SessionDetailsPageConnected = withRouter( connect( (state: AppState, props: RouteComponentProps) => ({ - nodeNames: nodeDisplayNameByIDSelector(state), + nodeNames: selectIsTenant(state) + ? {} + : nodeDisplayNameByIDSelector(state), session: selectSession(state, props), sessionError: state.adminUI.sessions.lastError, uiConfig: selectSessionDetailsUiConfig(state), diff --git a/pkg/ui/workspaces/cluster-ui/src/statementDetails/statementDetails.tsx b/pkg/ui/workspaces/cluster-ui/src/statementDetails/statementDetails.tsx index 6fad4dfc3af9..5ca0f8bb5de6 100644 --- a/pkg/ui/workspaces/cluster-ui/src/statementDetails/statementDetails.tsx +++ b/pkg/ui/workspaces/cluster-ui/src/statementDetails/statementDetails.tsx @@ -268,8 +268,8 @@ export class StatementDetails extends React.Component< this.props.location, ); this.props.refreshUserSQLRoles(); + this.props.refreshNodes(); if (!this.props.isTenant) { - this.props.refreshNodes(); this.props.refreshNodesLiveness(); if (!this.props.hasViewActivityRedactedRole) { this.props.refreshStatementDiagnosticsRequests(); @@ -291,8 +291,8 @@ export class StatementDetails extends React.Component< ); } + this.props.refreshNodes(); if (!this.props.isTenant) { - this.props.refreshNodes(); this.props.refreshNodesLiveness(); if (!this.props.hasViewActivityRedactedRole) { this.props.refreshStatementDiagnosticsRequests(); diff --git a/pkg/ui/workspaces/cluster-ui/src/statementsPage/statementsPage.tsx b/pkg/ui/workspaces/cluster-ui/src/statementsPage/statementsPage.tsx index 33cce77060ad..139541edf1d0 100644 --- a/pkg/ui/workspaces/cluster-ui/src/statementsPage/statementsPage.tsx +++ b/pkg/ui/workspaces/cluster-ui/src/statementsPage/statementsPage.tsx @@ -343,8 +343,8 @@ export class StatementsPage extends React.Component< } this.props.refreshUserSQLRoles(); + this.props.refreshNodes(); if (!this.props.isTenant) { - this.props.refreshNodes(); if (!this.props.hasViewActivityRedactedRole) { this.props.refreshStatementDiagnosticsRequests(); } @@ -385,8 +385,8 @@ export class StatementsPage extends React.Component< componentDidUpdate = (): void => { this.updateQueryParams(); + this.props.refreshNodes(); if (!this.props.isTenant) { - this.props.refreshNodes(); if (!this.props.hasViewActivityRedactedRole) { this.props.refreshStatementDiagnosticsRequests(); } diff --git a/pkg/ui/workspaces/cluster-ui/src/transactionDetails/transactionDetails.tsx b/pkg/ui/workspaces/cluster-ui/src/transactionDetails/transactionDetails.tsx index a6e5c747be6b..964793161c08 100644 --- a/pkg/ui/workspaces/cluster-ui/src/transactionDetails/transactionDetails.tsx +++ b/pkg/ui/workspaces/cluster-ui/src/transactionDetails/transactionDetails.tsx @@ -197,16 +197,12 @@ export class TransactionDetails extends React.Component< componentDidMount(): void { this.refreshData(""); this.props.refreshUserSQLRoles(); - if (!this.props.isTenant) { - this.props.refreshNodes(); - } + this.props.refreshNodes(); } componentDidUpdate(prevProps: TransactionDetailsProps): void { this.getTransactionStateInfo(prevProps.transactionFingerprintId); - if (!this.props.isTenant) { - this.props.refreshNodes(); - } + this.props.refreshNodes(); } onChangeSortSetting = (ss: SortSetting): void => { diff --git a/pkg/ui/workspaces/cluster-ui/src/transactionsPage/transactionsPage.tsx b/pkg/ui/workspaces/cluster-ui/src/transactionsPage/transactionsPage.tsx index 05e8fb93939c..21df50dc6328 100644 --- a/pkg/ui/workspaces/cluster-ui/src/transactionsPage/transactionsPage.tsx +++ b/pkg/ui/workspaces/cluster-ui/src/transactionsPage/transactionsPage.tsx @@ -237,9 +237,7 @@ export class TransactionsPage extends React.Component< ); } - if (!this.props.isTenant) { - this.props.refreshNodes(); - } + this.props.refreshNodes(); } componentWillUnmount(): void { @@ -280,9 +278,7 @@ export class TransactionsPage extends React.Component< componentDidUpdate(): void { this.updateQueryParams(); - if (!this.props.isTenant) { - this.props.refreshNodes(); - } + this.props.refreshNodes(); } onChangeSortSetting = (ss: SortSetting): void => {