From eee593973dd9ad3492a7f3187f10e504aa73f668 Mon Sep 17 00:00:00 2001 From: Asger F Date: Wed, 20 Nov 2024 11:22:32 +0100 Subject: [PATCH] Fix typo in 'evaluatorLogPaths' --- .../src/log-insights/log-scanner-service.ts | 4 ++-- .../src/query-history/query-history-manager.ts | 14 +++++++------- .../query-history-local-query-domain-mapper.ts | 8 ++++---- extensions/ql-vscode/src/query-results.ts | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/extensions/ql-vscode/src/log-insights/log-scanner-service.ts b/extensions/ql-vscode/src/log-insights/log-scanner-service.ts index 76e996633..3d78bb30a 100644 --- a/extensions/ql-vscode/src/log-insights/log-scanner-service.ts +++ b/extensions/ql-vscode/src/log-insights/log-scanner-service.ts @@ -94,12 +94,12 @@ export class LogScannerService extends DisposableObject { public async scanEvalLog(query: QueryHistoryInfo | undefined): Promise { this.diagnosticCollection.clear(); - if (query?.t !== "local" || query.evalutorLogPaths === undefined) { + if (query?.t !== "local" || query.evaluatorLogPaths === undefined) { return; } const { summarySymbols, jsonSummary, humanReadableSummary } = - query.evalutorLogPaths; + query.evaluatorLogPaths; if (jsonSummary === undefined || humanReadableSummary === undefined) { return; diff --git a/extensions/ql-vscode/src/query-history/query-history-manager.ts b/extensions/ql-vscode/src/query-history/query-history-manager.ts index c94db37f8..45d37e7eb 100644 --- a/extensions/ql-vscode/src/query-history/query-history-manager.ts +++ b/extensions/ql-vscode/src/query-history/query-history-manager.ts @@ -781,7 +781,7 @@ export class QueryHistoryManager extends DisposableObject { private async warnNoEvalLogSummary(item: LocalQueryInfo) { const evalLogLocation = - item.evalutorLogPaths?.log ?? item.initialInfo.outputDir?.evalLogPath; + item.evaluatorLogPaths?.log ?? item.initialInfo.outputDir?.evalLogPath; // Summary log file doesn't exist. if (evalLogLocation && (await pathExists(evalLogLocation))) { @@ -801,7 +801,7 @@ export class QueryHistoryManager extends DisposableObject { } const evalLogLocation = - item.evalutorLogPaths?.log ?? item.initialInfo.outputDir?.evalLogPath; + item.evaluatorLogPaths?.log ?? item.initialInfo.outputDir?.evalLogPath; if (evalLogLocation && (await pathExists(evalLogLocation))) { await tryOpenExternalFile(this.app.commands, evalLogLocation); @@ -816,14 +816,14 @@ export class QueryHistoryManager extends DisposableObject { } // If the summary file location wasn't saved, display error - if (!item.evalutorLogPaths?.humanReadableSummary) { + if (!item.evaluatorLogPaths?.humanReadableSummary) { await this.warnNoEvalLogSummary(item); return; } await tryOpenExternalFile( this.app.commands, - item.evalutorLogPaths.humanReadableSummary, + item.evaluatorLogPaths.humanReadableSummary, ); } @@ -833,7 +833,7 @@ export class QueryHistoryManager extends DisposableObject { } // If the JSON summary file location wasn't saved, display error - if (item.evalutorLogPaths?.jsonSummary === undefined) { + if (item.evaluatorLogPaths?.jsonSummary === undefined) { await this.warnNoEvalLogSummary(item); return; } @@ -841,7 +841,7 @@ export class QueryHistoryManager extends DisposableObject { // TODO(angelapwen): Stream the file in. try { const evalLogData: EvalLogData[] = await parseViewerData( - item.evalutorLogPaths.jsonSummary, + item.evaluatorLogPaths.jsonSummary, ); const evalLogTreeBuilder = new EvalLogTreeBuilder( item.getQueryName(), @@ -850,7 +850,7 @@ export class QueryHistoryManager extends DisposableObject { this.evalLogViewer.updateRoots(await evalLogTreeBuilder.getRoots()); } catch { throw new Error( - `Could not read evaluator log summary JSON file to generate viewer data at ${item.evalutorLogPaths.jsonSummary}.`, + `Could not read evaluator log summary JSON file to generate viewer data at ${item.evaluatorLogPaths.jsonSummary}.`, ); } } diff --git a/extensions/ql-vscode/src/query-history/store/query-history-local-query-domain-mapper.ts b/extensions/ql-vscode/src/query-history/store/query-history-local-query-domain-mapper.ts index 9812dd564..5f691e607 100644 --- a/extensions/ql-vscode/src/query-history/store/query-history-local-query-domain-mapper.ts +++ b/extensions/ql-vscode/src/query-history/store/query-history-local-query-domain-mapper.ts @@ -25,10 +25,10 @@ export function mapLocalQueryInfoToDto( return { initialInfo: mapInitialQueryInfoToDto(query.initialInfo), t: "local", - evalLogLocation: query.evalutorLogPaths?.log, - evalLogSummaryLocation: query.evalutorLogPaths?.humanReadableSummary, - jsonEvalLogSummaryLocation: query.evalutorLogPaths?.jsonSummary, - evalLogSummarySymbolsLocation: query.evalutorLogPaths?.summarySymbols, + evalLogLocation: query.evaluatorLogPaths?.log, + evalLogSummaryLocation: query.evaluatorLogPaths?.humanReadableSummary, + jsonEvalLogSummaryLocation: query.evaluatorLogPaths?.jsonSummary, + evalLogSummarySymbolsLocation: query.evaluatorLogPaths?.summarySymbols, failureReason: query.failureReason, completedQuery: query.completedQuery && mapCompletedQueryToDto(query.completedQuery), diff --git a/extensions/ql-vscode/src/query-results.ts b/extensions/ql-vscode/src/query-results.ts index 41a5cfd52..69a99837b 100644 --- a/extensions/ql-vscode/src/query-results.ts +++ b/extensions/ql-vscode/src/query-results.ts @@ -200,7 +200,7 @@ export class LocalQueryInfo { private cancellationSource?: CancellationTokenSource, // used to cancel in progress queries public failureReason?: string, public completedQuery?: CompletedQueryInfo, - public evalutorLogPaths?: EvaluatorLogPaths, + public evaluatorLogPaths?: EvaluatorLogPaths, ) { /**/ } @@ -226,7 +226,7 @@ export class LocalQueryInfo { /** Sets the paths to the various structured evaluator logs. */ public setEvaluatorLogPaths(logPaths: EvaluatorLogPaths): void { - this.evalutorLogPaths = logPaths; + this.evaluatorLogPaths = logPaths; } /**