Redesign query result summary and settings

extensions/mssql/l10n/bundle.l10n.json

@@ -893,42 +893,6 @@
     "Enter Database Description": "Enter Database Description",
     "Please select a workspace where you have sufficient permissions (Contributor or higher)": "Please select a workspace where you have sufficient permissions (Contributor or higher)",
     "This database name is already in use. Please choose a different name.": "This database name is already in use. Please choose a different name.",
-    "Count: {0}  Distinct Count: {1}  Null Count: {2}/{0} is the count, {1} is the distinct count, and {2} is the null count": {
-        "message": "Count: {0}  Distinct Count: {1}  Null Count: {2}",
-        "comment": ["{0} is the count, {1} is the distinct count, and {2} is the null count"]
-    },
-    "Average: {0}  Count: {1}  Sum: {2}/{0} is the average, {1} is the count, {2} is the sum": {
-        "message": "Average: {0}  Count: {1}  Sum: {2}",
-        "comment": ["{0} is the average, {1} is the count, {2} is the sum"]
-    },
-    "Average: {0}/{0} is the average": {
-        "message": "Average: {0}",
-        "comment": ["{0} is the average"]
-    },
-    "Count: {0}/{0} is the count": {
-        "message": "Count: {0}",
-        "comment": ["{0} is the count"]
-    },
-    "Distinct Count: {0}/{0} is the distinct count": {
-        "message": "Distinct Count: {0}",
-        "comment": ["{0} is the distinct count"]
-    },
-    "Max: {0}/{0} is the max": {
-        "message": "Max: {0}",
-        "comment": ["{0} is the max"]
-    },
-    "Min: {0}/{0} is the min": {
-        "message": "Min: {0}",
-        "comment": ["{0} is the min"]
-    },
-    "Null Count: {0}/{0} is the null count": {
-        "message": "Null Count: {0}",
-        "comment": ["{0} is the null count"]
-    },
-    "Sum: {0}/{0} is the sum": {
-        "message": "Sum: {0}",
-        "comment": ["{0} is the sum"]
-    },
     "An error occurred while copying results: {0}/{0} is the error message": {
         "message": "An error occurred while copying results: {0}",
         "comment": ["{0} is the error message"]
@@ -955,6 +919,7 @@
         "comment": ["{0} is the error message"]
     },
     "The query results panel failed to load. Please try running the query again.": "The query results panel failed to load. Please try running the query again.",
+    "Copying results cancelled": "Copying results cancelled",
     "{0} stopped successfully./{0} stopped successfully.": {
         "message": "{0} stopped successfully.",
         "comment": ["{0} stopped successfully."]
@@ -2604,6 +2569,10 @@
         "comment": ["{0} is the keyboard shortcut for the messages tab"]
     },
     "Open in New Tab": "Open in New Tab",
+    "Results Settings": "Results Settings",
+    "Open results in new tab": "Open results in new tab",
+    "Show query results in a new editor tab instead of the query pane.": "Show query results in a new editor tab instead of the query pane.",
+    "Close results settings": "Close results settings",
     "Showplan XML": "Showplan XML",
     "Show Menu ({0})/{0} is the keyboard shortcut for showing the menu": {
         "message": "Show Menu ({0})",
@@ -2685,6 +2654,60 @@
         "message": "({0} rows affected)",
         "comment": ["{0} is the number of rows affected"]
     },
+    "0 rows returned": "0 rows returned",
+    "1 row returned": "1 row returned",
+    "{0} rows returned/{0} is the number of rows returned": {
+        "message": "{0} rows returned",
+        "comment": ["{0} is the number of rows returned"]
+    },
+    "0 rows": "0 rows",
+    "1 row": "1 row",
+    "{0} rows/{0} is the number of rows": {
+        "message": "{0} rows",
+        "comment": ["{0} is the number of rows"]
+    },
+    "No rows affected": "No rows affected",
+    "Selected": "Selected",
+    "Rows": "Rows",
+    "Time": "Time",
+    "No selection": "No selection",
+    "Count": "Count",
+    "Avg": "Avg",
+    "Sum": "Sum",
+    "Min": "Min",
+    "Max": "Max",
+    "Distinct": "Distinct",
+    "Null": "Null",
+    "Execution cancelled": "Execution cancelled",
+    "Execution time unavailable": "Execution time unavailable",
+    "Running: {0}/{0} is how long the query has been running": {
+        "message": "Running: {0}",
+        "comment": ["{0} is how long the query has been running"]
+    },
+    "{0}ms/{0} is the number of milliseconds": {
+        "message": "{0}ms",
+        "comment": ["{0} is the number of milliseconds"]
+    },
+    "{0}s/{0} is the number of seconds": {
+        "message": "{0}s",
+        "comment": ["{0} is the number of seconds"]
+    },
+    "{0}m/{0} is the number of minutes": {
+        "message": "{0}m",
+        "comment": ["{0} is the number of minutes"]
+    },
+    "{0}m {1}s/{0} is the number of minutes{1} is the number of seconds": {
+        "message": "{0}m {1}s",
+        "comment": ["{0} is the number of minutes", "{1} is the number of seconds"]
+    },
+    "{0}h/{0} is the number of hours": {
+        "message": "{0}h",
+        "comment": ["{0} is the number of hours"]
+    },
+    "{0}h {1}m/{0} is the number of hours{1} is the number of minutes": {
+        "message": "{0}h {1}m",
+        "comment": ["{0} is the number of hours", "{1} is the number of minutes"]
+    },
     "Result Set Batch {0} - Query {1}/{0} is the batch number{1} is the query number": {
         "message": "Result Set Batch {0} - Query {1}",
         "comment": ["{0} is the batch number", "{1} is the query number"]

extensions/mssql/src/constants/locConstants.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { l10n } from "vscode";
-import * as os from "os";
 
 // Warning: Only update these strings if you are sure you want to affect _all_ locations they're shared between.
 export class Common {
@@ -1556,92 +1555,6 @@ export class FabricProvisioning {
 }
 
 export class QueryResult {
-    public static nonNumericSelectionSummary = (
-        count: number,
-        distinctCount: number,
-        nullCount: number,
-    ) =>
-        l10n.t({
-            message: "Count: {0}  Distinct Count: {1}  Null Count: {2}",
-            args: [count, distinctCount, nullCount],
-            comment: ["{0} is the count, {1} is the distinct count, and {2} is the null count"],
-        });
-    public static numericSelectionSummary = (average: string, count: number, sum: number) =>
-        l10n.t({
-            message: "Average: {0}  Count: {1}  Sum: {2}",
-            args: [average, count, sum],
-            comment: ["{0} is the average, {1} is the count, {2} is the sum"],
-        });
-    public static numericSelectionSummaryTooltip = (
-        average: string,
-        count: number,
-        distinctCount: number,
-        max: number,
-        min: number,
-        nullCount: number,
-        sum: number,
-    ) => {
-        return [
-            l10n.t({
-                message: "Average: {0}",
-                args: [average],
-                comment: ["{0} is the average"],
-            }),
-            l10n.t({
-                message: "Count: {0}",
-                args: [count],
-                comment: ["{0} is the count"],
-            }),
-            l10n.t({
-                message: "Distinct Count: {0}",
-                args: [distinctCount],
-                comment: ["{0} is the distinct count"],
-            }),
-            l10n.t({
-                message: "Max: {0}",
-                args: [max],
-                comment: ["{0} is the max"],
-            }),
-            l10n.t({
-                message: "Min: {0}",
-                args: [min],
-                comment: ["{0} is the min"],
-            }),
-            l10n.t({
-                message: "Null Count: {0}",
-                args: [nullCount],
-                comment: ["{0} is the null count"],
-            }),
-            l10n.t({
-                message: "Sum: {0}",
-                args: [sum],
-                comment: ["{0} is the sum"],
-            }),
-        ].join(os.EOL);
-    };
-    public static nonNumericSelectionSummaryTooltip = (
-        count: number,
-        distinctCount: number,
-        nullCount: number,
-    ) => {
-        return [
-            l10n.t({
-                message: "Count: {0}",
-                args: [count],
-                comment: ["{0} is the count"],
-            }),
-            l10n.t({
-                message: "Distinct Count: {0}",
-                args: [distinctCount],
-                comment: ["{0} is the distinct count"],
-            }),
-            l10n.t({
-                message: "Null Count: {0}",
-                args: [nullCount],
-                comment: ["{0} is the null count"],
-            }),
-        ].join(os.EOL);
-    };
     public static copyError = (error: string) =>
         l10n.t({
             message: "An error occurred while copying results: {0}",
@@ -1681,6 +1594,7 @@ export class QueryResult {
     public static queryResultPanelFailedToLoad = l10n.t(
         "The query results panel failed to load. Please try running the query again.",
     );
+    public static copyingResultsCancelled = l10n.t("Copying results cancelled");
 }
 
 export class LocalContainers {