Address PR comments from @aeisenberg and @shati-patel

Author: edoardopirovano

extensions/ql-vscode/package.json

@@ -462,15 +462,15 @@
         "title": "Show Query Text"
       },
       {
-        "command": "codeQLQueryHistory.exportCsvResults",
-        "title": "Export Results (CSV)"
+        "command": "codeQLQueryHistory.viewCsvResults",
+        "title": "View Results (CSV)"
       },
       {
-        "command": "codeQLQueryHistory.viewCsvResults",
+        "command": "codeQLQueryHistory.viewCsvAlerts",
         "title": "View Alerts (CSV)"
       },
       {
-        "command": "codeQLQueryHistory.viewSarifResults",
+        "command": "codeQLQueryHistory.viewSarifAlerts",
         "title": "View Alerts (SARIF)"
       },
       {
@@ -648,17 +648,17 @@
           "when": "view == codeQLQueryHistory"
         },
         {
-          "command": "codeQLQueryHistory.exportCsvResults",
+          "command": "codeQLQueryHistory.viewCsvResults",
           "group": "9_qlCommands",
           "when": "view == codeQLQueryHistory && viewItem != interpretedResultsItem"
         },
         {
-          "command": "codeQLQueryHistory.viewCsvResults",
+          "command": "codeQLQueryHistory.viewCsvAlerts",
           "group": "9_qlCommands",
           "when": "view == codeQLQueryHistory && viewItem == interpretedResultsItem"
         },
         {
-          "command": "codeQLQueryHistory.viewSarifResults",
+          "command": "codeQLQueryHistory.viewSarifAlerts",
           "group": "9_qlCommands",
           "when": "view == codeQLQueryHistory && viewItem == interpretedResultsItem"
         },
@@ -810,15 +810,15 @@
           "when": "false"
         },
         {
-          "command": "codeQLQueryHistory.exportCsvResults",
+          "command": "codeQLQueryHistory.viewCsvResults",
           "when": "false"
         },
         {
-          "command": "codeQLQueryHistory.viewCsvResults",
+          "command": "codeQLQueryHistory.viewCsvAlerts",
           "when": "false"
         },
         {
-          "command": "codeQLQueryHistory.viewSarifResults",
+          "command": "codeQLQueryHistory.viewSarifAlerts",
           "when": "false"
         },
         {

extensions/ql-vscode/src/query-history.ts

@@ -1,4 +1,5 @@
 import * as path from 'path';
+import * as fs from 'fs-extra';
 import * as vscode from 'vscode';
 import { window as Window, env } from 'vscode';
 import { CompletedQuery } from './query-results';
@@ -306,20 +307,20 @@ export class QueryHistoryManager extends DisposableObject {
     );
     this.push(
       commandRunner(
-        'codeQLQueryHistory.exportCsvResults',
-        this.handleExportCsvResults.bind(this)
+        'codeQLQueryHistory.viewCsvResults',
+        this.handleViewCsvResults.bind(this)
       )
     );
     this.push(
       commandRunner(
-        'codeQLQueryHistory.viewCsvResults',
-        this.handleViewCsvResults.bind(this)
+        'codeQLQueryHistory.viewCsvAlerts',
+        this.handleViewCsvAlerts.bind(this)
       )
     );
     this.push(
       commandRunner(
-        'codeQLQueryHistory.viewSarifResults',
-        this.handleViewSarifResults.bind(this)
+        'codeQLQueryHistory.viewSarifAlerts',
+        this.handleViewSarifAlerts.bind(this)
       )
     );
     this.push(
@@ -556,7 +557,7 @@ export class QueryHistoryManager extends DisposableObject {
     await vscode.window.showTextDocument(doc, { preview: false });
   }
 
-  async handleViewSarifResults(
+  async handleViewSarifAlerts(
     singleItem: CompletedQuery,
     multiSelect: CompletedQuery[]
   ) {
@@ -577,33 +578,25 @@ export class QueryHistoryManager extends DisposableObject {
     }
   }
 
-  async handleExportCsvResults(
+  async handleViewCsvResults(
     singleItem: CompletedQuery,
     multiSelect: CompletedQuery[]
   ) {
     if (!this.assertSingleQuery(multiSelect)) {
       return;
     }
-
-    const saveLocation = await vscode.window.showSaveDialog({
-      title: 'CSV Results',
-      saveLabel: 'Export',
-      filters: {
-        'Comma-separated values': ['csv'],
-      }
-    });
-    if (!saveLocation) {
-      void showAndLogErrorMessage('No save location selected for CSV export!');
+    if (await singleItem.query.hasCsv()) {
+      void this.tryOpenExternalFile(singleItem.query.csvPath);
       return;
     }
-    await singleItem.query.exportCsvResults(this.qs, saveLocation.fsPath, () => {
+    await singleItem.query.exportCsvResults(this.qs, singleItem.query.csvPath, () => {
       void this.tryOpenExternalFile(
-        saveLocation.fsPath
+        singleItem.query.csvPath
       );
     });
   }
 
-  async handleViewCsvResults(
+  async handleViewCsvAlerts(
     singleItem: CompletedQuery,
     multiSelect: CompletedQuery[]
   ) {