Skip to content

Commit c441268

Browse files
authored
Polish configure actions (#6872)
Fixes #6842
1 parent fe5f00f commit c441268

5 files changed

Lines changed: 59 additions & 3 deletions

File tree

package.json

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1533,6 +1533,12 @@
15331533
"category": "%command.issues.category%",
15341534
"icon": "$(sparkle)"
15351535
},
1536+
{
1537+
"command": "issues.configureIssuesViewlet",
1538+
"title": "%command.issues.configureIssuesViewlet.title%",
1539+
"category": "%command.issues.category%",
1540+
"icon": "$(gear)"
1541+
},
15361542
{
15371543
"command": "notifications.refresh",
15381544
"title": "%command.notifications.refresh.title%",
@@ -1589,6 +1595,12 @@
15891595
"title": "%command.notifications.markPullRequestsAsDone.title%",
15901596
"category": "%command.notifications.category%",
15911597
"icon": "$(git-pull-request)"
1598+
},
1599+
{
1600+
"command": "notifications.configureNotificationsViewlet",
1601+
"title": "%command.notifications.configureNotificationsViewlet.title%",
1602+
"category": "%command.notifications.category%",
1603+
"icon": "$(gear)"
15921604
}
15931605
],
15941606
"viewsWelcome": [
@@ -2217,6 +2229,10 @@
22172229
"command": "issue.copyGithubHeadLinkWithoutRange",
22182230
"when": "false"
22192231
},
2232+
{
2233+
"command": "issues.configureIssuesViewlet",
2234+
"when": "false"
2235+
},
22202236
{
22212237
"command": "pr.refreshActivePullRequest",
22222238
"when": "false"
@@ -2285,6 +2301,10 @@
22852301
"command": "notifications.markPullRequestsAsDone",
22862302
"when": "false"
22872303
},
2304+
{
2305+
"command": "notifications.configureNotificationsViewlet",
2306+
"when": "false"
2307+
},
22882308
{
22892309
"command": "review.copyPrLink",
22902310
"when": "github:inReviewMode"
@@ -2357,7 +2377,7 @@
23572377
"group": "overflow@1"
23582378
},
23592379
{
2360-
"command": "pr.configurePRViewlet",
2380+
"command": "issues.configureIssuesViewlet",
23612381
"when": "gitHubOpenRepositoryCount != 0 && github:initialized && view == issues:github",
23622382
"group": "overflow@2"
23632383
},
@@ -2416,6 +2436,11 @@
24162436
"when": "gitHubOpenRepositoryCount != 0 && github:initialized && view == notifications:github",
24172437
"group": "sortNotifications@2"
24182438
},
2439+
{
2440+
"command": "notifications.configureNotificationsViewlet",
2441+
"when": "view == notifications:github",
2442+
"group": "sortNotifications@3"
2443+
},
24192444
{
24202445
"command": "notifications.markPullRequestsAsRead",
24212446
"when": "gitHubOpenRepositoryCount != 0 && github:initialized && view == notifications:github && config.githubPullRequests.experimental.notificationsMarkPullRequests == markAsRead",

package.nls.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@
288288
"command.issue.signinAndRefreshList.title": "Sign in and Refresh",
289289
"command.issue.goToLinkedCode.title": "Go to Linked Code",
290290
"command.issues.openIssuesWebsite.title": "Open on GitHub",
291+
"command.issues.configureIssuesViewlet.title": "Configure...",
291292
"command.issue.chatSummarizeIssue.title": "Summarize With Copilot",
292293
"command.issue.chatSuggestFix.title": "Suggest a Fix with Copilot",
293294
"command.notifications.category": "GitHub Notifications",
@@ -301,6 +302,7 @@
301302
"command.notifications.markAsDone.title": "Mark as Done",
302303
"command.notifications.markPullRequestsAsRead.title": "Mark Pull Requests as Read",
303304
"command.notifications.markPullRequestsAsDone.title": "Mark Pull Requests as Done",
305+
"command.notifications.configureNotificationsViewlet.title": "Configure...",
304306
"command.notification.chatSummarizeNotification.title": "Summarize With Copilot",
305307
"welcome.github.login.contents": {
306308
"message": "You have not yet signed in with GitHub\n[Sign in](command:pr.signin)",

src/issues/issueFeatureRegistrar.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import {
2121
} from '../common/settingKeys';
2222
import { ITelemetry } from '../common/telemetry';
2323
import { fromRepoUri, RepoUriParams, Schemes, toNewIssueUri } from '../common/uri';
24+
import { EXTENSION_ID } from '../constants';
2425
import { OctokitCommon } from '../github/common';
2526
import { FolderRepositoryManager, PullRequestDefaults } from '../github/folderRepositoryManager';
2627
import { IProject } from '../github/interface';
@@ -523,6 +524,15 @@ export class IssueFeatureRegistrar extends Disposable {
523524
commands.executeCommand(chatCommandID, vscode.l10n.t('@githubpr Find a fix for issue {0}/{1}#{2}', issue.remote.owner, issue.remote.repositoryName, issue.number));
524525
}),
525526
);
527+
this._register(vscode.commands.registerCommand('issues.configureIssuesViewlet', async () => {
528+
/* __GDPR__
529+
"issues.configureIssuesViewlet" : {}
530+
*/
531+
return vscode.commands.executeCommand(
532+
'workbench.action.openSettings',
533+
`@ext:${EXTENSION_ID} issues`,
534+
);
535+
}));
526536
this._stateManager.tryInitializeAndWait().then(() => {
527537
this.registerCompletionProviders();
528538

src/notifications/notificationsFeatureRegistar.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import * as vscode from 'vscode';
77
import { Disposable } from '../common/lifecycle';
88
import { ITelemetry } from '../common/telemetry';
99
import { onceEvent } from '../common/utils';
10+
import { EXTENSION_ID } from '../constants';
1011
import { CredentialStore } from '../github/credentials';
1112
import { RepositoriesManager } from '../github/repositoriesManager';
1213
import { chatCommand } from '../lm/utils';
@@ -141,6 +142,18 @@ export class NotificationsFeatureRegister extends Disposable {
141142
return notificationsManager.markPullRequests(true);
142143
})
143144
);
145+
this._register(
146+
vscode.commands.registerCommand('notifications.configureNotificationsViewlet', () => {
147+
/* __GDPR__
148+
"notifications.configureNotificationsViewlet" : {}
149+
*/
150+
this._telemetry.sendTelemetryEvent('notifications.configureNotificationsViewlet');
151+
return vscode.commands.executeCommand(
152+
'workbench.action.openSettings',
153+
`@ext:${EXTENSION_ID} notifications`,
154+
);
155+
})
156+
);
144157

145158
// Events
146159
this._register(onceEvent(this._repositoriesManager.onDidLoadAnyRepositories)(() => {

src/view/prsTreeDataProvider.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,26 @@ export class PullRequestsTreeDataProvider extends Disposable implements vscode.T
7373
this._register(vscode.commands.registerCommand('pr.configurePRViewlet', async () => {
7474
const configuration = await vscode.window.showQuickPick([
7575
'Configure Remotes...',
76-
'Configure Queries...'
76+
'Configure Queries...',
77+
'Configure All Pull Request Settings...'
7778
]);
7879

7980
switch (configuration) {
8081
case 'Configure Queries...':
8182
return vscode.commands.executeCommand(
8283
'workbench.action.openSettings',
83-
`@ext:${EXTENSION_ID} queries`,
84+
`@ext:${EXTENSION_ID} pull request queries`,
8485
);
8586
case 'Configure Remotes...':
8687
return vscode.commands.executeCommand(
8788
'workbench.action.openSettings',
8889
`@ext:${EXTENSION_ID} remotes`,
8990
);
91+
case 'Configure All Pull Request Settings...':
92+
return vscode.commands.executeCommand(
93+
'workbench.action.openSettings',
94+
`@ext:${EXTENSION_ID} pull request`,
95+
);
9096
default:
9197
return;
9298
}

0 commit comments

Comments
 (0)