From 4e32a108a6756b202dd9ec48d7739e8b89960c9d Mon Sep 17 00:00:00 2001
From: Asger F <asgerf@github.com>
Date: Tue, 19 Nov 2024 11:12:21 +0100
Subject: [PATCH] Make 'log' field non-nullable again.

---
 .../query-history-local-query-dto-mapper.ts      | 16 +++++++++-------
 extensions/ql-vscode/src/query-results.ts        |  8 +-------
 extensions/ql-vscode/src/run-queries-shared.ts   |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/extensions/ql-vscode/src/query-history/store/query-history-local-query-dto-mapper.ts b/extensions/ql-vscode/src/query-history/store/query-history-local-query-dto-mapper.ts
index b9bd41e51..7afe4b907 100644
--- a/extensions/ql-vscode/src/query-history/store/query-history-local-query-dto-mapper.ts
+++ b/extensions/ql-vscode/src/query-history/store/query-history-local-query-dto-mapper.ts
@@ -32,13 +32,15 @@ export function mapLocalQueryItemToDomainModel(
     localQuery.failureReason,
     localQuery.completedQuery &&
       mapCompletedQueryInfoToDomainModel(localQuery.completedQuery),
-    {
-      log: localQuery.evalLogLocation,
-      humanReadableSummary: localQuery.evalLogSummaryLocation,
-      jsonSummary: localQuery.jsonEvalLogSummaryLocation,
-      summarySymbols: localQuery.evalLogSummarySymbolsLocation,
-      endSummary: undefined,
-    },
+    localQuery.evalLogLocation
+      ? {
+          log: localQuery.evalLogLocation,
+          humanReadableSummary: localQuery.evalLogSummaryLocation,
+          jsonSummary: localQuery.jsonEvalLogSummaryLocation,
+          summarySymbols: localQuery.evalLogSummarySymbolsLocation,
+          endSummary: undefined,
+        }
+      : undefined,
   );
 }
 
diff --git a/extensions/ql-vscode/src/query-results.ts b/extensions/ql-vscode/src/query-results.ts
index ea4acd909..41a5cfd52 100644
--- a/extensions/ql-vscode/src/query-results.ts
+++ b/extensions/ql-vscode/src/query-results.ts
@@ -200,13 +200,7 @@ export class LocalQueryInfo {
     private cancellationSource?: CancellationTokenSource, // used to cancel in progress queries
     public failureReason?: string,
     public completedQuery?: CompletedQueryInfo,
-    public evalutorLogPaths: EvaluatorLogPaths = {
-      log: undefined,
-      humanReadableSummary: undefined,
-      endSummary: undefined,
-      jsonSummary: undefined,
-      summarySymbols: undefined,
-    },
+    public evalutorLogPaths?: EvaluatorLogPaths,
   ) {
     /**/
   }
diff --git a/extensions/ql-vscode/src/run-queries-shared.ts b/extensions/ql-vscode/src/run-queries-shared.ts
index 674da31ee..6dbaa8e65 100644
--- a/extensions/ql-vscode/src/run-queries-shared.ts
+++ b/extensions/ql-vscode/src/run-queries-shared.ts
@@ -45,7 +45,7 @@ import type { ProgressCallback } from "./common/vscode/progress";
  * Holds the paths to the various structured log summary files generated for a query evaluation.
  */
 export interface EvaluatorLogPaths {
-  log: string | undefined;
+  log: string;
   humanReadableSummary: string | undefined;
   endSummary: string | undefined;
   jsonSummary: string | undefined;