Updates delete cloud patch for my drafts only

Author: d13

package.json

@@ -12240,7 +12240,7 @@
 				},
 				{
 					"command": "gitlens.views.drafts.delete",
-					"when": "viewItem =~  /gitlens:draft\\b/ && gitlens:plus",
+					"when": "viewItem =~  /gitlens:draft\\b(?=.*?\\b\\+mine\\b)/ && gitlens:plus",
 					"group": "6_gitlens_actions@1"
 				},
 				{

src/gk/models/drafts.ts

@@ -23,6 +23,7 @@ export interface Draft {
 		email: string | undefined;
 		avatar?: string;
 	};
+	readonly isMine: boolean;
 	readonly organizationId?: string;
 	readonly role: 'owner' | 'admin' | 'editor' | 'viewer';
 	readonly isPublished: boolean;

src/plus/drafts/draftsService.ts

@@ -179,6 +179,7 @@ export class DraftService implements Disposable {
 				createdAt: new Date(draft.createdAt),
 				updatedAt: new Date(draft.updatedAt ?? draft.createdAt),
 				author: author,
+				isMine: true,
 				organizationId: draft.organizationId || undefined,
 				role: draft.role,
 				isPublished: draft.isPublished,
@@ -351,10 +352,12 @@ export class DraftService implements Disposable {
 			email: undefined,
 		};
 
+		let isMine = false;
 		const { account } = await this.container.subscription.getSubscription();
 		if (draft.createdBy === account?.id) {
 			author.name = `${account.name} (you)`;
 			author.email = account.email;
+			isMine = true;
 		}
 
 		return {
@@ -364,6 +367,7 @@ export class DraftService implements Disposable {
 			createdAt: new Date(draft.createdAt),
 			updatedAt: new Date(draft.updatedAt ?? draft.createdAt),
 			author: author,
+			isMine: isMine,
 			organizationId: draft.organizationId || undefined,
 			role: draft.role,
 			isPublished: draft.isPublished,
@@ -388,15 +392,16 @@ export class DraftService implements Disposable {
 		const draft = ((await rsp.json()) as Result).data;
 		const { account } = await this.container.subscription.getSubscription();
 
-		return draft.map(
-			(d): Draft => ({
+		return draft.map((d): Draft => {
+			const isMine = d.createdBy === account?.id;
+			return {
 				draftType: 'cloud',
 				type: d.type,
 				id: d.id,
-				author:
-					d.createdBy === account?.id
-						? { id: d.createdBy, name: `${account.name} (you)`, email: account.email }
-						: { id: d.createdBy, name: 'Unknown', email: undefined },
+				author: isMine
+					? { id: d.createdBy, name: `${account.name} (you)`, email: account.email }
+					: { id: d.createdBy, name: 'Unknown', email: undefined },
+				isMine: isMine,
 				organizationId: d.organizationId || undefined,
 				role: d.role,
 				isPublished: d.isPublished,

src/views/draftsView.ts

@@ -27,16 +27,12 @@ export class DraftsViewNode extends CacheableChildrenViewNode<'drafts', DraftsVi
 			const children: (GroupingNode | DraftNode)[] = [];
 
 			try {
-				const { account } = await this.view.container.subscription.getSubscription(true);
-				if (account == null) throw new AuthenticationRequiredError();
-
 				const drafts = await this.view.container.drafts.getDrafts();
 				drafts.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
 
-				const userId = account.id;
 				const groups = groupByFilterMap(
 					drafts,
-					d => (d.author.id === userId ? 'mine' : 'shared'),
+					d => (d.isMine ? 'mine' : 'shared'),
 					d => new DraftNode(this.uri, this.view, this, d),
 				);
 

src/views/nodes/draftNode.ts

@@ -40,7 +40,11 @@ export class DraftNode extends ViewNode<'draft', DraftsView> {
 		const showUpdated = this.draft.updatedAt.getTime() - this.draft.createdAt.getTime() >= 1000;
 
 		item.id = this.id;
-		item.contextValue = ContextValues.Draft;
+		let contextValue = `${ContextValues.Draft}`;
+		if (this.draft.isMine) {
+			contextValue += '+mine';
+		}
+		item.contextValue = contextValue;
 		item.iconPath = new ThemeIcon('cloud');
 		item.tooltip = new MarkdownString(
 			`${label}${this.draft.description ? `\\\n${this.draft.description}` : ''}\n\nCreated ${fromNow(