From e32e9146f088858a836112dba492167aee4a588e Mon Sep 17 00:00:00 2001
From: j82w <jwilley@cockroachlabs.com>
Date: Thu, 22 Sep 2022 16:13:33 -0400
Subject: [PATCH] ui: insights overview rename 'execution id' to 'latest
 execution id'

closes #88456

Release justification: Category 2: Bug fixes and
low-risk updates to new functionality

Release note: (ui change): Rename insights overview
table column 'execution id' to 'latest execution id'.
This will help avoid confusion since the ui only shows
the latest id per fingerprint.
---
 .../statementInsightsTable.tsx                 | 18 +++++++++---------
 .../transactionInsightsTable.tsx               |  4 ++--
 .../workloadInsights/util/insightsColumns.tsx  | 16 +++++++++++++++-
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/pkg/ui/workspaces/cluster-ui/src/insights/workloadInsights/statementInsights/statementInsightsTable.tsx b/pkg/ui/workspaces/cluster-ui/src/insights/workloadInsights/statementInsights/statementInsightsTable.tsx
index e18cd94d75df..8a4cc81da334 100644
--- a/pkg/ui/workspaces/cluster-ui/src/insights/workloadInsights/statementInsights/statementInsightsTable.tsx
+++ b/pkg/ui/workspaces/cluster-ui/src/insights/workloadInsights/statementInsights/statementInsightsTable.tsx
@@ -39,8 +39,8 @@ export function makeStatementInsightsColumns(): ColumnDescriptor<StatementInsigh
   const execType = InsightExecEnum.STATEMENT;
   return [
     {
-      name: "executionID",
-      title: insightsTableTitles.executionID(execType),
+      name: "latestExecutionID",
+      title: insightsTableTitles.latestExecutionID(execType),
       cell: (item: StatementInsightEvent) => (
         <Link to={`/insights/statement/${item.statementID}`}>
           {String(item.statementID)}
@@ -141,13 +141,6 @@ export function makeStatementInsightsColumns(): ColumnDescriptor<StatementInsigh
       sort: (item: StatementInsightEvent) => String(item.isFullScan),
       showByDefault: false,
     },
-    {
-      name: "transactionID",
-      title: insightsTableTitles.executionID(InsightExecEnum.TRANSACTION),
-      cell: (item: StatementInsightEvent) => item.transactionID,
-      sort: (item: StatementInsightEvent) => item.transactionID,
-      showByDefault: false,
-    },
     {
       name: "transactionFingerprintID",
       title: insightsTableTitles.fingerprintID(InsightExecEnum.TRANSACTION),
@@ -155,6 +148,13 @@ export function makeStatementInsightsColumns(): ColumnDescriptor<StatementInsigh
       sort: (item: StatementInsightEvent) => item.transactionFingerprintID,
       showByDefault: false,
     },
+    {
+      name: "transactionID",
+      title: insightsTableTitles.latestExecutionID(InsightExecEnum.TRANSACTION),
+      cell: (item: StatementInsightEvent) => item.transactionID,
+      sort: (item: StatementInsightEvent) => item.transactionID,
+      showByDefault: false,
+    },
   ];
 }
 
diff --git a/pkg/ui/workspaces/cluster-ui/src/insights/workloadInsights/transactionInsights/transactionInsightsTable.tsx b/pkg/ui/workspaces/cluster-ui/src/insights/workloadInsights/transactionInsights/transactionInsightsTable.tsx
index 7cb960cc2fa0..5a5776405746 100644
--- a/pkg/ui/workspaces/cluster-ui/src/insights/workloadInsights/transactionInsights/transactionInsightsTable.tsx
+++ b/pkg/ui/workspaces/cluster-ui/src/insights/workloadInsights/transactionInsights/transactionInsightsTable.tsx
@@ -32,8 +32,8 @@ export function makeTransactionInsightsColumns(): ColumnDescriptor<TransactionIn
   const execType = InsightExecEnum.TRANSACTION;
   return [
     {
-      name: "executionID",
-      title: insightsTableTitles.executionID(execType),
+      name: "latestExecutionID",
+      title: insightsTableTitles.latestExecutionID(execType),
       cell: (item: TransactionInsightEvent) => (
         <Link to={`/insights/transaction/${item.transactionID}`}>
           {String(item.transactionID)}
diff --git a/pkg/ui/workspaces/cluster-ui/src/insights/workloadInsights/util/insightsColumns.tsx b/pkg/ui/workspaces/cluster-ui/src/insights/workloadInsights/util/insightsColumns.tsx
index f87cb658eed6..c8326749060b 100644
--- a/pkg/ui/workspaces/cluster-ui/src/insights/workloadInsights/util/insightsColumns.tsx
+++ b/pkg/ui/workspaces/cluster-ui/src/insights/workloadInsights/util/insightsColumns.tsx
@@ -17,6 +17,7 @@ import { contentionTime, readFromDisk, writtenToDisk } from "../../../util";
 
 export const insightsColumnLabels = {
   executionID: "Execution ID",
+  latestExecutionID: "Latest Execution ID",
   query: "Execution",
   insights: "Insights",
   startTime: "Start Time (UTC)",
@@ -42,8 +43,14 @@ export function getLabel(
 ): string {
   switch (execType) {
     case InsightExecEnum.TRANSACTION:
+      if (key === "latestExecutionID") {
+        return "Latest Transaction Execution ID";
+      }
       return "Transaction " + insightsColumnLabels[key];
     case InsightExecEnum.STATEMENT:
+      if (key === "latestExecutionID") {
+        return "Latest Statement Execution ID";
+      }
       return "Statement " + insightsColumnLabels[key];
     default:
       return insightsColumnLabels[key];
@@ -71,12 +78,19 @@ export const insightsTableTitles: InsightsTableTitleType = {
     );
   },
   executionID: (execType: InsightExecEnum) => {
+    return makeToolTip(
+      <p>The ID of the execution with the {execType} fingerprint.</p>,
+      "executionID",
+      execType,
+    );
+  },
+  latestExecutionID: (execType: InsightExecEnum) => {
     return makeToolTip(
       <p>
         The execution ID of the latest execution with the {execType}{" "}
         fingerprint.
       </p>,
-      "executionID",
+      "latestExecutionID",
       execType,
     );
   },