mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into koesie10/view-loaded-message

Browse Source
This commit is contained in:
Koen Vlaswinkel
2022-10-12 10:41:18 +02:00
parent 627bb59bd5 2104cb3d09
commit 60faed1ccc
6 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@@ -139,7 +139,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
version: ['v2.6.3', 'v2.7.6', 'v2.8.5', 'v2.9.4', 'v2.10.5', 'v2.11.0', 'nightly']
version: ['v2.6.3', 'v2.7.6', 'v2.8.5', 'v2.9.4', 'v2.10.5', 'v2.11.1', 'nightly']
env:
CLI_VERSION: ${{ matrix.version }}
NIGHTLY_URL: ${{ needs.find-nightly.outputs.url }}

5
CODEOWNERS
View File

@@ -1,4 +1,3 @@
**/* @github/codeql-vscode-reviewers
/extensions/ql-vscode/src/remote-queries/ @github/code-scanning-secexp-reviewers
/extensions/ql-vscode/src/view/remote-queries/ @github/code-scanning-secexp-reviewers
/extensions/ql-vscode/src/view/variant-analysis/ @github/code-scanning-secexp-reviewers
**/remote-queries/ @github/code-scanning-secexp-reviewers
**/variant-analysis/ @github/code-scanning-secexp-reviewers

11
extensions/ql-vscode/src/view/compare/Compare.tsx
View File

@@ -31,7 +31,7 @@ export function Compare(_: Record<string, never>): JSX.Element {
const hasRows = comparison.rows && (comparison.rows.to.length || comparison.rows.from.length);
useEffect(() => {
window.addEventListener('message', (evt: MessageEvent) => {
const listener = (evt: MessageEvent) => {
if (evt.origin === window.origin) {
const msg: ToCompareViewMessage = evt.data;
switch (msg.t) {
@@ -43,8 +43,13 @@ export function Compare(_: Record<string, never>): JSX.Element {
const origin = evt.origin.replace(/\n|\r/g, '');
console.error(`Invalid event origin ${origin}`);
}
});
});
};
window.addEventListener('message', listener);
return () => {
window.removeEventListener('message', listener);
};
}, []);
if (!comparison) {
return <div>Waiting for results to load.</div>;
}

11
extensions/ql-vscode/src/view/remote-queries/RemoteQueries.tsx
View File

@@ -395,7 +395,7 @@ export function RemoteQueries(): JSX.Element {
const [sort, setSort] = useState<Sort>('name');
useEffect(() => {
window.addEventListener('message', (evt: MessageEvent) => {
const listener = (evt: MessageEvent) => {
if (evt.origin === window.origin) {
const msg: ToRemoteQueriesMessage = evt.data;
if (msg.t === 'setRemoteQueryResult') {
@@ -408,8 +408,13 @@ export function RemoteQueries(): JSX.Element {
const origin = evt.origin.replace(/\n|\r/g, '');
console.error(`Invalid event origin ${origin}`);
}
});
});
};
window.addEventListener('message', listener);
return () => {
window.removeEventListener('message', listener);
};
}, []);
if (!queryResult) {
return <div>Waiting for results to load.</div>;

11
extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx
View File

@@ -28,7 +28,7 @@ export function VariantAnalysis({
const [repoResults, setRepoResults] = useState<VariantAnalysisScannedRepositoryResult[]>(initialRepoResults);
useEffect(() => {
window.addEventListener('message', (evt: MessageEvent) => {
const listener = (evt: MessageEvent) => {
if (evt.origin === window.origin) {
const msg: ToVariantAnalysisMessage = evt.data;
if (msg.t === 'setVariantAnalysis') {
@@ -52,8 +52,13 @@ export function VariantAnalysis({
const origin = evt.origin.replace(/\n|\r/g, '');
console.error(`Invalid event origin ${origin}`);
}
});
});
};
window.addEventListener('message', listener);
return () => {
window.removeEventListener('message', listener);
};
}, []);
if (variantAnalysis?.actionsWorkflowRunId === undefined) {
return <VariantAnalysisLoading />;

2
extensions/ql-vscode/src/vscode-tests/ensureCli.ts
View File

@@ -44,7 +44,7 @@ const _10MB = _1MB * 10;
// CLI version to test. Hard code the latest as default. And be sure
// to update the env if it is not otherwise set.
const CLI_VERSION = process.env.CLI_VERSION || 'v2.11.0';
const CLI_VERSION = process.env.CLI_VERSION || 'v2.11.1';
process.env.CLI_VERSION = CLI_VERSION;
// Base dir where CLIs will be downloaded into