Merge cockroachdb#93921 cockroachdb#93922

93921: ui: collapse these if statements r=matthewtodd a=matthewtodd Epic: None Release note: None 93922: ui: update cluster-ui to 23.1.0-prerelease.2 r=matthewtodd a=matthewtodd Just a quick bug fix and some cleanup in this one: ``` $ git log --format=%s --no-merges \ `@cockroachlabs/[email protected]` \ pkg/ui/workspaces/cluster-ui \ ui: update cluster-ui to 23.1.0-prerelease.2 ui: refresh nodes on tenants ui: remove unused nodeNames property ``` Epic: None Release note: None Co-authored-by: Matthew Todd <[email protected]>
AlexTalks · Dec 19, 2022 · 61f7c81 · 61f7c81
3 parents 2457613 + 97cc327 + 6b6a251
commit 61f7c81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/pkg/ui/workspaces/cluster-ui/package.json b/pkg/ui/workspaces/cluster-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cockroachlabs/cluster-ui",
-  "version": "23.1.0-prerelease.1",
+  "version": "23.1.0-prerelease.2",
   "description": "Cluster UI is a library of large features shared between CockroachDB and CockroachCloud",
   "repository": {
     "type": "git",

diff --git a/pkg/ui/workspaces/cluster-ui/src/statementsPage/statementsPage.tsx b/pkg/ui/workspaces/cluster-ui/src/statementsPage/statementsPage.tsx
@@ -344,10 +344,8 @@ export class StatementsPage extends React.Component<
 
     this.props.refreshUserSQLRoles();
     this.props.refreshNodes();
-    if (!this.props.isTenant) {
-      if (!this.props.hasViewActivityRedactedRole) {
-        this.props.refreshStatementDiagnosticsRequests();
-      }
+    if (!this.props.isTenant && !this.props.hasViewActivityRedactedRole) {
+      this.props.refreshStatementDiagnosticsRequests();
     }
   }
 
@@ -386,10 +384,8 @@ export class StatementsPage extends React.Component<
   componentDidUpdate = (): void => {
     this.updateQueryParams();
     this.props.refreshNodes();
-    if (!this.props.isTenant) {
-      if (!this.props.hasViewActivityRedactedRole) {
-        this.props.refreshStatementDiagnosticsRequests();
-      }
+    if (!this.props.isTenant && !this.props.hasViewActivityRedactedRole) {
+      this.props.refreshStatementDiagnosticsRequests();
     }
   };