From 14747721d1fc1f88d86d1d7ffb065633668b75f9 Mon Sep 17 00:00:00 2001 From: Gulshan Singh Date: Mon, 13 Mar 2023 15:36:27 -0700 Subject: [PATCH 1/3] Display EntityValue labels in CSV export --- extensions/ql-vscode/src/run-queries-shared.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/extensions/ql-vscode/src/run-queries-shared.ts b/extensions/ql-vscode/src/run-queries-shared.ts index 41fae0321ee..4ee8588fb55 100644 --- a/extensions/ql-vscode/src/run-queries-shared.ts +++ b/extensions/ql-vscode/src/run-queries-shared.ts @@ -30,7 +30,7 @@ import { nanoid } from "nanoid"; import { CodeQLCliServer } from "./cli"; import { SELECT_QUERY_NAME } from "./contextual/locationFinder"; import { DatabaseManager } from "./local-databases"; -import { DecodedBqrsChunk } from "./pure/bqrs-cli-types"; +import { DecodedBqrsChunk, EntityValue } from "./pure/bqrs-cli-types"; import { extLogger, Logger } from "./common"; import { generateSummarySymbolsFile } from "./log-insights/summary-parser"; import { getErrorMessage } from "./pure/helpers-pure"; @@ -351,11 +351,17 @@ export class QueryEvaluationInfo { chunk.tuples.forEach((tuple) => { out.write( `${tuple - .map((v, i) => - chunk.columns[i].kind === "String" - ? `"${typeof v === "string" ? v.replaceAll('"', '""') : v}"` - : v, - ) + .map((v, i) => { + if (chunk.columns[i].kind === "String") { + return `"${ + typeof v === "string" ? v.replaceAll('"', '""') : v + }"`; + } else if (chunk.columns[i].kind === "Entity") { + return (v as EntityValue).label; + } else { + return v; + } + }) .join(",")}\n`, ); }); From 7b6f778b65f27cd75051db24e2de75670a3e2426 Mon Sep 17 00:00:00 2001 From: Gulshan Singh Date: Mon, 20 Mar 2023 20:37:36 +0000 Subject: [PATCH 2/3] Update CHANGELOG.md --- extensions/ql-vscode/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index 385bf6f2574..903e09728ad 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -3,6 +3,7 @@ ## [UNRELEASED] - Show data flow paths of a variant analysis in a new tab +- Show labels of entities in CSV export [#2170](https://github.com/github/vscode-codeql/pull/2170) ## 1.8.0 - 9 March 2023 From 0c75ae309290717308761ca2fd35dbc3abf20736 Mon Sep 17 00:00:00 2001 From: Shati Patel <42641846+shati-patel@users.noreply.github.com> Date: Tue, 21 Mar 2023 11:44:19 +0000 Subject: [PATCH 3/3] Update extensions/ql-vscode/CHANGELOG.md --- extensions/ql-vscode/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index 903e09728ad..53184cdead7 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -3,7 +3,7 @@ ## [UNRELEASED] - Show data flow paths of a variant analysis in a new tab -- Show labels of entities in CSV export [#2170](https://github.com/github/vscode-codeql/pull/2170) +- Show labels of entities in exported CSV results [#2170](https://github.com/github/vscode-codeql/pull/2170) ## 1.8.0 - 9 March 2023