Skip to content

Commit 48ff62f

Browse files
committed
Make message and succesful required
1 parent 82c7dd5 commit 48ff62f

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

extensions/ql-vscode/src/query-history/store/query-history-local-query-dto-mapper.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ function mapCompletedQueryInfoToDomainModel(
5757
return new CompletedQueryInfo(
5858
mapQueryEvaluationInfoToDomainModel(completedQuery.query),
5959
completedQuery.logFileLocation,
60-
completedQuery.successful ?? completedQuery.sucessful,
61-
completedQuery.message,
60+
completedQuery.successful ?? false,
61+
completedQuery.message ?? "",
6262
sortState,
6363
completedQuery.resultCount,
6464
sortedResults,

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ export class CompletedQueryInfo implements QueryWithResults {
5353
constructor(
5454
public readonly query: QueryEvaluationInfo,
5555
public readonly logFileLocation: string | undefined,
56-
public readonly successful: boolean | undefined,
57-
public readonly message: string | undefined,
56+
public readonly successful: boolean,
57+
public readonly message: string,
5858
/**
5959
* How we're currently sorting alerts. This is not mere interface
6060
* state due to truncation; on re-sort, we want to read in the file
@@ -76,11 +76,7 @@ export class CompletedQueryInfo implements QueryWithResults {
7676
}
7777

7878
get statusString(): string {
79-
if (this.message) {
80-
return this.message;
81-
} else {
82-
throw new Error("No status available");
83-
}
79+
return this.message;
8480
}
8581

8682
getResultsPath(selectedTable: string, useSorted = true): string {

extensions/ql-vscode/src/run-queries-shared.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@ export class QueryEvaluationInfo extends QueryOutputDir {
367367
export interface QueryWithResults {
368368
readonly query: QueryEvaluationInfo;
369369
readonly logFileLocation?: string;
370-
readonly successful?: boolean;
371-
readonly message?: string;
370+
readonly successful: boolean;
371+
readonly message: string;
372372
}
373373

374374
/**

extensions/ql-vscode/test/factories/query-history/local-query-history-item.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,8 @@ export function createMockQueryWithResults({
9393
metadata,
9494
} as unknown as QueryEvaluationInfo,
9595
successful: didRunSuccessfully,
96+
message: didRunSuccessfully
97+
? "finished in 0 seconds"
98+
: "compilation failed: unknown error",
9699
};
97100
}

0 commit comments

Comments
 (0)