Skip to content

Commit 0714f06

Browse files
authored
MRVA: Include number of repositories queried in confirmation message (#1393)
1 parent b290625 commit 0714f06

2 files changed

Lines changed: 16 additions & 26 deletions

File tree

extensions/ql-vscode/src/remote-queries/run-remote-query.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ interface QueriesResponse {
3939
invalid_repositories?: string[],
4040
repositories_without_database?: string[],
4141
},
42-
repositories_queried?: string[],
42+
repositories_queried: string[],
4343
}
4444

4545
/**
@@ -341,15 +341,16 @@ async function runRemoteQueriesApiRequest(
341341
const eol = os.EOL;
342342
const eol2 = os.EOL + os.EOL;
343343

344-
// exported for testng only
344+
// exported for testing only
345345
export function parseResponse(owner: string, repo: string, response: QueriesResponse) {
346-
const popupMessage = `Successfully scheduled runs. [Click here to see the progress](https://github.com/${owner}/${repo}/actions/runs/${response.workflow_run_id}).`
346+
const repositoriesQueried = response.repositories_queried;
347+
const numRepositoriesQueried = repositoriesQueried.length;
348+
349+
const popupMessage = `Successfully scheduled runs on ${numRepositoriesQueried} repositories. [Click here to see the progress](https://github.com/${owner}/${repo}/actions/runs/${response.workflow_run_id}).`
347350
+ (response.errors ? `${eol2}Some repositories could not be scheduled. See extension log for details.` : '');
348351

349-
let logMessage = `Successfully scheduled runs. See https://github.com/${owner}/${repo}/actions/runs/${response.workflow_run_id}.`;
350-
if (response.repositories_queried) {
351-
logMessage += `${eol2}Repositories queried:${eol}${response.repositories_queried.join(', ')}`;
352-
}
352+
let logMessage = `Successfully scheduled runs on ${numRepositoriesQueried} repositories. See https://github.com/${owner}/${repo}/actions/runs/${response.workflow_run_id}.`;
353+
logMessage += `${eol2}Repositories queried:${eol}${repositoriesQueried.join(', ')}`;
353354
if (response.errors) {
354355
logMessage += `${eol2}Some repositories could not be scheduled.`;
355356
if (response.errors.invalid_repositories?.length) {

extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/run-remote-query.test.ts

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,15 @@ describe('run-remote-query', () => {
1010
repositories_queried: ['a/b', 'c/d'],
1111
});
1212

13-
expect(result.popupMessage).to.equal('Successfully scheduled runs. [Click here to see the progress](https://github.com/org/name/actions/runs/123).');
13+
expect(result.popupMessage).to.equal('Successfully scheduled runs on 2 repositories. [Click here to see the progress](https://github.com/org/name/actions/runs/123).');
1414
expect(result.logMessage).to.equal(
15-
['Successfully scheduled runs. See https://github.com/org/name/actions/runs/123.',
15+
['Successfully scheduled runs on 2 repositories. See https://github.com/org/name/actions/runs/123.',
1616
'',
1717
'Repositories queried:',
1818
'a/b, c/d'].join(os.EOL),
1919
);
2020
});
2121

22-
it('should parse a response with no repositories queried', () => {
23-
const result = parseResponse('org', 'name', {
24-
workflow_run_id: 123,
25-
});
26-
27-
expect(result.popupMessage).to.equal('Successfully scheduled runs. [Click here to see the progress](https://github.com/org/name/actions/runs/123).');
28-
expect(result.logMessage).to.equal(
29-
'Successfully scheduled runs. See https://github.com/org/name/actions/runs/123.'
30-
);
31-
});
32-
3322
it('should parse a response with invalid repos', () => {
3423
const result = parseResponse('org', 'name', {
3524
workflow_run_id: 123,
@@ -40,12 +29,12 @@ describe('run-remote-query', () => {
4029
});
4130

4231
expect(result.popupMessage).to.equal(
43-
['Successfully scheduled runs. [Click here to see the progress](https://github.com/org/name/actions/runs/123).',
32+
['Successfully scheduled runs on 2 repositories. [Click here to see the progress](https://github.com/org/name/actions/runs/123).',
4433
'',
4534
'Some repositories could not be scheduled. See extension log for details.'].join(os.EOL)
4635
);
4736
expect(result.logMessage).to.equal(
48-
['Successfully scheduled runs. See https://github.com/org/name/actions/runs/123.',
37+
['Successfully scheduled runs on 2 repositories. See https://github.com/org/name/actions/runs/123.',
4938
'',
5039
'Repositories queried:',
5140
'a/b, c/d',
@@ -67,12 +56,12 @@ describe('run-remote-query', () => {
6756
});
6857

6958
expect(result.popupMessage).to.equal(
70-
['Successfully scheduled runs. [Click here to see the progress](https://github.com/org/name/actions/runs/123).',
59+
['Successfully scheduled runs on 2 repositories. [Click here to see the progress](https://github.com/org/name/actions/runs/123).',
7160
'',
7261
'Some repositories could not be scheduled. See extension log for details.'].join(os.EOL)
7362
);
7463
expect(result.logMessage).to.equal(
75-
['Successfully scheduled runs. See https://github.com/org/name/actions/runs/123.',
64+
['Successfully scheduled runs on 2 repositories. See https://github.com/org/name/actions/runs/123.',
7665
'',
7766
'Repositories queried:',
7867
'a/b, c/d',
@@ -96,12 +85,12 @@ describe('run-remote-query', () => {
9685
});
9786

9887
expect(result.popupMessage).to.equal(
99-
['Successfully scheduled runs. [Click here to see the progress](https://github.com/org/name/actions/runs/123).',
88+
['Successfully scheduled runs on 2 repositories. [Click here to see the progress](https://github.com/org/name/actions/runs/123).',
10089
'',
10190
'Some repositories could not be scheduled. See extension log for details.'].join(os.EOL)
10291
);
10392
expect(result.logMessage).to.equal(
104-
['Successfully scheduled runs. See https://github.com/org/name/actions/runs/123.',
93+
['Successfully scheduled runs on 2 repositories. See https://github.com/org/name/actions/runs/123.',
10594
'',
10695
'Repositories queried:',
10796
'a/b, c/d',

0 commit comments

Comments
 (0)