Revive issue editor and fix related issues (#6767)

Author: alexr00

package.json

@@ -1316,6 +1316,11 @@
 				"title": "%command.pr.createPrMenuRebase.title%",
 				"category": "%command.pull.request.category%"
 			},
+			{
+				"command": "issue.openDescription",
+				"title": "%command.issue.openDescription.title%",
+				"category": "%command.issues.category%"
+			},
 			{
 				"command": "issue.createIssueFromSelection",
 				"title": "%command.issue.createIssueFromSelection.title%",
@@ -2070,6 +2075,10 @@
 					"command": "pr.acceptMerge",
 					"when": "isMergeResultEditor && mergeEditorBaseUri =~ /^(githubpr|gitpr):/"
 				},
+				{
+					"command": "issue.openDescription",
+					"when": "false"
+				},
 				{
 					"command": "issue.copyGithubPermalink",
 					"when": "github:hasGitHubRemotes"

package.nls.json

@@ -260,6 +260,7 @@
 	"command.pr.closeRelatedEditors.title": "Close All Pull Request Editors",
 	"command.pr.toggleEditorCommentingOn.title": "Toggle Editor Commenting On",
 	"command.pr.toggleEditorCommentingOff.title": "Toggle Editor Commenting Off",
+	"command.issue.openDescription.title": "View Issue Description",
 	"command.issue.copyGithubDevLink.title": "Copy github.dev Link",
 	"command.issue.copyGithubPermalink.title": "Copy GitHub Permalink",
 	"command.issue.copyGithubHeadLink.title": "Copy GitHub Head Link",

resources/icons/issue.svg

@@ -67,32 +67,37 @@ function ensurePR<TIssue extends Issue, TIssueModel extends IssueModel<TIssue>>(
 
 export async function openDescription(
 	telemetry: ITelemetry,
-	pullRequestModel: IssueModel,
+	issueModel: IssueModel,
 	descriptionNode: DescriptionNode | undefined,
 	folderManager: FolderRepositoryManager,
 	revealNode: boolean,
 	preserveFocus: boolean = true,
 	notificationProvider?: NotificationProvider
 ) {
-	const pullRequest = ensurePR(folderManager, pullRequestModel);
+	const issue = ensurePR(folderManager, issueModel);
 	if (revealNode) {
 		descriptionNode?.reveal(descriptionNode, { select: true, focus: true });
 	}
 	// Create and show a new webview
-	if (pullRequest instanceof PullRequestModel) {
-		await PullRequestOverviewPanel.createOrShow(telemetry, folderManager.context.extensionUri, folderManager, pullRequest, undefined, preserveFocus);
+	if (issue instanceof PullRequestModel) {
+		await PullRequestOverviewPanel.createOrShow(telemetry, folderManager.context.extensionUri, folderManager, issue, undefined, preserveFocus);
+		/* __GDPR__
+			"pr.openDescription" : {}
+		*/
+		telemetry.sendTelemetryEvent('pr.openDescription');
 	} else {
-		await IssueOverviewPanel.createOrShow(telemetry, folderManager.context.extensionUri, folderManager, pullRequest);
+		await IssueOverviewPanel.createOrShow(telemetry, folderManager.context.extensionUri, folderManager, issue);
+		/* __GDPR__
+			"issue.openDescription" : {}
+		*/
+		telemetry.sendTelemetryEvent('issue.openDescription');
 	}
 
-	if (notificationProvider?.hasNotification(pullRequest)) {
-		notificationProvider.markPrNotificationsAsRead(pullRequest);
+	if (notificationProvider?.hasNotification(issue)) {
+		notificationProvider.markPrNotificationsAsRead(issue);
 	}
 
-	/* __GDPR__
-		"pr.openDescription" : {}
-	*/
-	telemetry.sendTelemetryEvent('pr.openDescription');
+
 }
 
 async function chooseItem<T>(
@@ -115,7 +120,7 @@ async function chooseItem<T>(
 	return (await vscode.window.showQuickPick(items, options))?.itemValue;
 }
 
-export async function openPullRequestOnGitHub(e: PRNode | DescriptionNode | PullRequestModel | NotificationTreeItem, telemetry: ITelemetry) {
+export async function openPullRequestOnGitHub(e: PRNode | DescriptionNode | IssueModel | NotificationTreeItem, telemetry: ITelemetry) {
 	if (e instanceof PRNode || e instanceof DescriptionNode) {
 		vscode.commands.executeCommand('vscode.open', vscode.Uri.parse(e.pullRequestModel.html_url));
 	} else if (isNotificationTreeItem(e)) {
@@ -805,50 +810,61 @@ export function registerCommands(
 		}),
 	);
 
-	context.subscriptions.push(
-		vscode.commands.registerCommand(
-			'pr.openDescription',
-			async (argument: DescriptionNode | IssueModel | undefined) => {
-				let pullRequestModel: IssueModel | undefined;
-				if (!argument) {
-					const activePullRequests: PullRequestModel[] = reposManager.folderManagers
-						.map(manager => manager.activePullRequest!)
-						.filter(activePR => !!activePR);
-					if (activePullRequests.length >= 1) {
-						pullRequestModel = await chooseItem<PullRequestModel>(
-							activePullRequests,
-							itemValue => itemValue.title,
-						);
-					}
-				} else {
-					pullRequestModel = argument instanceof DescriptionNode ? argument.pullRequestModel : argument;
-				}
+	async function openDescriptionCommand(argument: DescriptionNode | IssueModel | undefined) {
+		let issueModel: IssueModel | undefined;
+		if (!argument) {
+			const activePullRequests: PullRequestModel[] = reposManager.folderManagers
+				.map(manager => manager.activePullRequest!)
+				.filter(activePR => !!activePR);
+			if (activePullRequests.length >= 1) {
+				issueModel = await chooseItem<PullRequestModel>(
+					activePullRequests,
+					itemValue => itemValue.title,
+				);
+			}
+		} else {
+			issueModel = argument instanceof DescriptionNode ? argument.pullRequestModel : argument;
+		}
 
-				if (!pullRequestModel) {
-					Logger.appendLine('No pull request found.', logId);
-					return;
-				}
+		if (!issueModel) {
+			Logger.appendLine('No pull request found.', logId);
+			return;
+		}
 
-				const folderManager = reposManager.getManagerForIssueModel(pullRequestModel);
-				if (!folderManager) {
-					return;
-				}
+		const folderManager = reposManager.getManagerForIssueModel(issueModel);
+		if (!folderManager) {
+			return;
+		}
 
-				let descriptionNode: DescriptionNode | undefined;
-				if (argument instanceof DescriptionNode) {
-					descriptionNode = argument;
-				} else {
-					const reviewManager = ReviewManager.getReviewManagerForFolderManager(reviewsManager.reviewManagers, folderManager);
-					if (!reviewManager) {
-						return;
-					}
+		let descriptionNode: DescriptionNode | undefined;
+		if (argument instanceof DescriptionNode) {
+			descriptionNode = argument;
+		} else {
+			const reviewManager = ReviewManager.getReviewManagerForFolderManager(reviewsManager.reviewManagers, folderManager);
+			if (!reviewManager) {
+				return;
+			}
 
-					descriptionNode = reviewManager.changesInPrDataProvider.getDescriptionNode(folderManager);
-				}
+			descriptionNode = reviewManager.changesInPrDataProvider.getDescriptionNode(folderManager);
+		}
 
-				await openDescription(telemetry, pullRequestModel, descriptionNode, folderManager, !(argument instanceof DescriptionNode), !(argument instanceof RepositoryChangesNode), tree.notificationProvider);
-			},
-		),
+		const revealDescription = !(argument instanceof DescriptionNode) && (!(argument instanceof IssueModel) || (argument instanceof PullRequestModel));
+
+		await openDescription(telemetry, issueModel, descriptionNode, folderManager, revealDescription, !(argument instanceof RepositoryChangesNode), tree.notificationProvider);
+	}
+
+	context.subscriptions.push(
+		vscode.commands.registerCommand(
+			'pr.openDescription',
+			openDescriptionCommand
+		)
+	);
+
+	context.subscriptions.push(
+		vscode.commands.registerCommand(
+			'issue.openDescription',
+			openDescriptionCommand
+		)
 	);
 
 	context.subscriptions.push(
@@ -1460,6 +1476,7 @@ ${contents}
 				vscode.env.openExternal(getPullsUrl(githubRepo));
 			}
 		}));
+
 	context.subscriptions.push(
 		vscode.commands.registerCommand('issues.openIssuesWebsite', async () => {
 			const githubRepo = await chooseRepoToOpen();

resources/icons/issue_closed.svg

@@ -33,7 +33,7 @@ export interface CommentEvent {
 	htmlUrl: string;
 	body: string;
 	bodyHTML?: string;
-	user: IAccount;
+	user?: IAccount;
 	event: EventType.Commented;
 	canEdit?: boolean;
 	canDelete?: boolean;

src/commands.ts

@@ -2087,9 +2087,9 @@ export class FolderRepositoryManager extends Disposable {
 	}
 
 	async getPullRequestRepositoryAccessAndMergeMethods(
-		pullRequest: PullRequestModel,
+		issue: IssueModel,
 	): Promise<RepoAccessAndMergeMethods> {
-		const mergeOptions = await pullRequest.githubRepository.getRepoAccessAndMergeMethods();
+		const mergeOptions = await issue.githubRepository.getRepoAccessAndMergeMethods();
 		return mergeOptions;
 	}
 

src/common/timelineEvent.ts

@@ -22,6 +22,7 @@ import {
 	GetBranchResponse,
 	GetChecksResponse,
 	isCheckRun,
+	IssueResponse,
 	IssuesSearchResponse,
 	ListBranchesResponse,
 	MaxIssueResponse,
@@ -1003,7 +1004,7 @@ export class GitHubRepository extends Disposable {
 			Logger.debug(`Fetch issue ${id} - enter`, this.id);
 			const { query, remote, schema } = await this.ensure();
 
-			const { data } = await query<PullRequestResponse>({
+			const { data } = await query<IssueResponse>({
 				query: withComments ? schema.IssueWithComments : schema.Issue,
 				variables: {
 					owner: remote.owner,
@@ -1018,7 +1019,7 @@ export class GitHubRepository extends Disposable {
 			}
 			Logger.debug(`Fetch issue ${id} - done`, this.id);
 
-			return new IssueModel(this, remote, parseGraphQLIssue(data.repository.pullRequest, this));
+			return new IssueModel(this, remote, parseGraphQLIssue(data.repository.issue, this));
 		} catch (e) {
 			Logger.error(`Unable to fetch issue: ${e}`, this.id);
 			return;

src/github/folderRepositoryManager.ts

@@ -450,9 +450,9 @@ export interface DeleteReactionResponse {
 	};
 }
 
-export interface UpdatePullRequestResponse {
-	updatePullRequest: {
-		pullRequest: {
+export interface UpdateIssueResponse {
+	updateIssue: {
+		issue: {
 			body: string;
 			bodyHTML: string;
 			title: string;
@@ -522,12 +522,12 @@ export interface SuggestedReviewerResponse {
 export type MergeMethod = 'MERGE' | 'REBASE' | 'SQUASH';
 export type MergeQueueState = 'AWAITING_CHECKS' | 'LOCKED' | 'MERGEABLE' | 'QUEUED' | 'UNMERGEABLE';
 
-export interface PullRequest {
+export interface Issue {
 	id: string;
 	databaseId: number;
 	number: number;
 	url: string;
-	state: 'OPEN' | 'CLOSED' | 'MERGED';
+	state: 'OPEN' | 'CLOSED' | 'MERGED'; // TODO: don't allow merged in an issue
 	body: string;
 	bodyHTML: string;
 	title: string;
@@ -536,48 +536,19 @@ export interface PullRequest {
 		nodes: Account[];
 	};
 	author: Account;
-	commits: {
-		nodes: {
-			commit: {
-				message: string;
-			};
-		}[];
-	};
 	comments: {
 		nodes?: AbbreviatedIssueComment[];
 		totalCount: number;
 	};
 	createdAt: string;
 	updatedAt: string;
-	headRef?: Ref;
-	headRefName: string;
-	headRefOid: string;
-	headRepository?: RefRepository;
-	baseRef?: Ref;
-	baseRefName: string;
-	baseRefOid: string;
-	baseRepository: BaseRefRepository;
 	labels: {
 		nodes: {
 			name: string;
 			color: string;
 		}[];
 	};
-	merged: boolean;
-	mergeable: 'MERGEABLE' | 'CONFLICTING' | 'UNKNOWN';
-	mergeQueueEntry?: MergeQueueEntry | null;
-	mergeStateStatus: 'BEHIND' | 'BLOCKED' | 'CLEAN' | 'DIRTY' | 'HAS_HOOKS' | 'UNKNOWN' | 'UNSTABLE';
-	reviewThreads: {
-		totalCount: number;
-	}
-	autoMergeRequest?: {
-		mergeMethod: MergeMethod;
-	};
-	viewerCanEnableAutoMerge: boolean;
-	viewerCanDisableAutoMerge: boolean;
 	viewerCanUpdate: boolean;
-	isDraft?: boolean;
-	suggestedReviewers: SuggestedReviewerResponse[];
 	projectItems?: {
 		nodes: {
 			project: {
@@ -606,6 +577,39 @@ export interface PullRequest {
 	}
 }
 
+
+export interface PullRequest extends Issue {
+	commits: {
+		nodes: {
+			commit: {
+				message: string;
+			};
+		}[];
+	};
+	headRef?: Ref;
+	headRefName: string;
+	headRefOid: string;
+	headRepository?: RefRepository;
+	baseRef?: Ref;
+	baseRefName: string;
+	baseRefOid: string;
+	baseRepository: BaseRefRepository;
+	merged: boolean;
+	mergeable: 'MERGEABLE' | 'CONFLICTING' | 'UNKNOWN';
+	mergeQueueEntry?: MergeQueueEntry | null;
+	mergeStateStatus: 'BEHIND' | 'BLOCKED' | 'CLEAN' | 'DIRTY' | 'HAS_HOOKS' | 'UNKNOWN' | 'UNSTABLE';
+	reviewThreads: {
+		totalCount: number;
+	}
+	autoMergeRequest?: {
+		mergeMethod: MergeMethod;
+	};
+	viewerCanEnableAutoMerge: boolean;
+	viewerCanDisableAutoMerge: boolean;
+	isDraft?: boolean;
+	suggestedReviewers: SuggestedReviewerResponse[];
+}
+
 export enum DefaultCommitTitle {
 	prTitle = 'PR_TITLE',
 	commitOrPrTitle = 'COMMIT_OR_PR_TITLE',
@@ -626,6 +630,13 @@ export interface PullRequestResponse {
 	rateLimit: RateLimit;
 }
 
+export interface IssueResponse {
+	repository: {
+		issue: PullRequest;
+	} | null;
+	rateLimit: RateLimit;
+}
+
 export interface PullRequestMergabilityResponse {
 	repository: {
 		pullRequest: {

src/github/githubRepository.ts

@@ -287,7 +287,7 @@ export interface IPullRequestsPagingOptions {
 	fetchOnePagePerRepo?: boolean;
 }
 
-export interface IPullRequestEditData {
+export interface IIssueEditData {
 	body?: string;
 	title?: string;
 }