Adding Mark as Done action (#6325)

* wip

* adding polish

* using different icon check-all

* adding commands

* polishing PR

* fixing compiler errors

* fetching url to check if organizations array has values

* adding comment

* making isInOrganization be string too

* Missed a spot

* Revert extraneous changes

* Don't modify proposal files

---------

Co-authored-by: Alex Ross <[email protected]>

Author: aiday-mar

package.json

@@ -1560,6 +1560,12 @@
 				"title": "%command.notifications.markAsRead.title%",
 				"category": "%command.notifications.category%",
 				"icon": "$(mail-read)"
+			},
+			{
+				"command": "notification.markAsDone",
+				"title": "%command.notifications.markAsDone.title%",
+				"category": "%command.notifications.category%",
+				"icon": "$(check-all)"
 			}
 		],
 		"viewsWelcome": [
@@ -2236,6 +2242,10 @@
 					"command": "notification.markAsRead",
 					"when": "false"
 				},
+				{
+					"command": "notification.markAsDone",
+					"when": "false"
+				},
 				{
 					"command": "notification.chatSummarizeNotification",
 					"when": "false"
@@ -2468,6 +2478,16 @@
 					"group": "issues_0@2",
 					"when": "view == notifications:github && (viewItem == 'Issue' || viewItem == 'PullRequest') && config.githubPullRequests.experimental.notificationsView"
 				},
+				{
+					"command": "notification.markAsDone",
+					"group": "inline@4",
+					"when": "view == notifications:github && (viewItem == 'Issue' || viewItem == 'PullRequest') && config.githubPullRequests.experimental.notificationsView"
+				},
+				{
+					"command": "notification.markAsDone",
+					"group": "issues_0@3",
+					"when": "view == notifications:github && (viewItem == 'Issue' || viewItem == 'PullRequest') && config.githubPullRequests.experimental.notificationsView"
+				},
 				{
 					"command": "pr.openDescriptionToTheSide",
 					"group": "inline@2",

package.nls.json

@@ -296,6 +296,7 @@
 	"command.notifications.sortByPriority.title": "Sort by Priority using Copilot",
 	"command.notifications.openOnGitHub.title": "Open on GitHub",
 	"command.notifications.markAsRead.title": "Mark as Read",
+	"command.notifications.markAsDone.title": "Mark as Done",
 	"command.notification.chatSummarizeNotification.title": "Summarize With Copilot",
 	"welcome.github.login.contents": {
 		"message": "You have not yet signed in with GitHub\n[Sign in](command:pr.signin)",

src/lm/tools/summarizeNotificationsTool.ts

@@ -76,8 +76,15 @@ Body: ${comment.body}
 				command: 'notification.markAsRead',
 				arguments: [{ threadId, notificationKey }]
 			};
+			const markAsDoneCommand: vscode.Command = {
+				title: 'Mark As Done',
+				command: 'notification.markAsDone',
+				arguments: [{ threadId, notificationKey }]
+			};
 			content.push(new vscode.LanguageModelTextPart(TOOL_COMMAND_RESULT));
 			content.push(new vscode.LanguageModelTextPart(JSON.stringify(markAsReadCommand)));
+			content.push(new vscode.LanguageModelTextPart(TOOL_COMMAND_RESULT));
+			content.push(new vscode.LanguageModelTextPart(JSON.stringify(markAsDoneCommand)));
 		}
 		const owner = options.input.owner;
 		const repo = options.input.repo;

src/notifications/notificationsFeatureRegistar.ts

@@ -102,28 +102,43 @@ export class NotificationsFeatureRegister extends Disposable {
 		);
 		this._register(
 			vscode.commands.registerCommand('notification.markAsRead', (options: any) => {
-				let threadId: string;
-				let notificationKey: string;
-				if (isNotificationTreeItem(options)) {
-					threadId = options.notification.id;
-					notificationKey = options.notification.key;
-				} else if ('threadId' in options && 'notificationKey' in options && typeof options.threadId === 'number' && typeof options.notificationKey === 'string') {
-					threadId = options.threadId;
-					notificationKey = options.notificationKey;
-				} else {
-					throw new Error(`Invalid arguments for command notification.markAsRead : ${JSON.stringify(options)}`);
-				}
+				const { threadId, notificationKey } = this._extractMarkAsCommandOptions(options);
 				/* __GDPR__
 					"notification.markAsRead" : {}
 				*/
 				this._telemetry.sendTelemetryEvent('notification.markAsRead');
 				notificationsManager.markAsRead({ threadId, notificationKey });
 			})
 		);
+		this._register(
+			vscode.commands.registerCommand('notification.markAsDone', (options: any) => {
+				const { threadId, notificationKey } = this._extractMarkAsCommandOptions(options);
+				/* __GDPR__
+					"notification.markAsDone" : {}
+				*/
+				this._telemetry.sendTelemetryEvent('notification.markAsDone');
+				notificationsManager.markAsDone({ threadId, notificationKey });
+			})
+		);
 
 		// Events
 		this._register(onceEvent(this._repositoriesManager.onDidLoadAnyRepositories)(() => {
 			notificationsManager.refresh();
 		}));
 	}
+
+	private _extractMarkAsCommandOptions(options: any): { threadId: string, notificationKey: string } {
+		let threadId: string;
+		let notificationKey: string;
+		if (isNotificationTreeItem(options)) {
+			threadId = options.notification.id;
+			notificationKey = options.notification.key;
+		} else if ('threadId' in options && 'notificationKey' in options && typeof options.threadId === 'number' && typeof options.notificationKey === 'string') {
+			threadId = options.threadId;
+			notificationKey = options.notificationKey;
+		} else {
+			throw new Error(`Invalid arguments for command notification.markAsRead : ${JSON.stringify(options)}`);
+		}
+		return { threadId, notificationKey };
+	}
 }

src/notifications/notificationsManager.ts

@@ -211,6 +211,18 @@ export class NotificationsManager extends Disposable implements vscode.TreeDataP
 		}
 	}
 
+	public async markAsDone(notificationIdentifier: { threadId: string, notificationKey: string }): Promise<void> {
+		const notification = this._notifications.get(notificationIdentifier.notificationKey);
+		if (notification) {
+			await this._notificationProvider.markAsDone(notificationIdentifier);
+
+			this._onDidChangeNotifications.fire([notification]);
+			this._notifications.delete(notificationIdentifier.notificationKey);
+
+			this._refresh(false);
+		}
+	}
+
 	public sortNotifications(method: NotificationsSortMethod): void {
 		if (this._sortingMethod === method) {
 			return;

src/notifications/notificationsProvider.ts

@@ -70,6 +70,16 @@ export class NotificationsProvider extends Disposable {
 		});
 	}
 
+	public async markAsDone(notificationIdentifier: { threadId: string, notificationKey: string }): Promise<void> {
+		const gitHub = this._getGitHub();
+		if (gitHub === undefined) {
+			return undefined;
+		}
+		await gitHub.octokit.call(gitHub.octokit.api.activity.markThreadAsDone, {
+			thread_id: Number(notificationIdentifier.threadId)
+		});
+	}
+
 	public async getNotifications(before: string, page: number): Promise<INotifications | undefined> {
 		const gitHub = this._getGitHub();
 		if (gitHub === undefined) {