Fix issue view and other polish from linked issue change

Author: alexr00

src/github/graphql.ts

@@ -770,7 +770,7 @@ export interface PullRequest extends Issue {
 	deletions?: number;
 	closingIssuesReferences?: {
 		nodes: {
-			id: number,
+			databaseId: number,
 			title: string,
 			number: number,
 			state: 'CLOSED' | 'OPEN',

src/github/interface.ts

@@ -250,7 +250,7 @@ export interface PullRequest extends Issue {
 	mergeCommitMeta?: { title: string, description: string };
 	squashCommitMeta?: { title: string, description: string };
 	suggestedReviewers?: ISuggestedReviewer[];
-	closingIssues?: IssueReference[]
+	closingIssues?: IssueReference[];
 	hasComments?: boolean;
 	additions?: number;
 	deletions?: number;

src/github/pullRequestOverview.ts

@@ -27,7 +27,7 @@ import { IssueOverviewPanel, panelKey } from './issueOverview';
 import { isCopilotOnMyBehalf, PullRequestModel } from './pullRequestModel';
 import { PullRequestReviewCommon, ReviewContext } from './pullRequestReviewCommon';
 import { branchPicks, pickEmail, reviewersQuickPick } from './quickPicks';
-import { ISSUE_OR_URL_EXPRESSION, parseIssueExpressionOutput, parseReviewers, processDiffLinks, processPermalinks } from './utils';
+import { getEnterpriseUri, getIssueOrURLExpression, parseIssueExpressionOutput, parseReviewers, processDiffLinks, processPermalinks } from './utils';
 import { CancelCodingAgentReply, ChangeBaseReply, ChangeReviewersReply, DeleteReviewResult, MergeArguments, MergeResult, PullRequest, ReadyForReviewAndMergeContext, ReadyForReviewContext, ReviewCommentContext, ReviewType, UnresolvedIdentity } from './views';
 import { debounce } from '../common/async';
 import { COPILOT_ACCOUNTS, IComment } from '../common/comment';
@@ -461,7 +461,8 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				isCopilotOnMyBehalf: await isCopilotOnMyBehalf(pullRequest, currentUser, coAuthors),
 				generateDescriptionTitle: this.getGenerateDescriptionTitle(),
 				closingIssues: await Promise.all((pullRequest.closingIssues ?? []).map(async issue => {
-					const parsed = parseIssueExpressionOutput(issue.url.match(ISSUE_OR_URL_EXPRESSION));
+					const enterpriseUri = pullRequest.remote.isEnterprise ? getEnterpriseUri() : undefined;
+					const parsed = parseIssueExpressionOutput(issue.url.match(getIssueOrURLExpression(enterpriseUri)));
 					const owner = parsed?.owner ?? pullRequest.remote.owner;
 					const repo = parsed?.name ?? pullRequest.remote.repositoryName;
 					const webviewUri = await toOpenIssueWebviewUri({ owner, repo, issueNumber: issue.number });

src/github/queries.gql

@@ -226,7 +226,7 @@ fragment PullRequestFragment on PullRequest {
 	}
 	closingIssuesReferences(first: 50) {
 		nodes {
-			id
+			databaseId
 			number
 			title
 			state

src/github/queriesExtra.gql

@@ -239,7 +239,7 @@ fragment PullRequestFragment on PullRequest {
 	}
 	closingIssuesReferences(first: 50) {
 		nodes {
-			id
+			databaseId
 			number
 			title
 			state

src/github/queriesLimited.gql

@@ -208,7 +208,7 @@ fragment PullRequestFragment on PullRequest {
 	}
 	closingIssuesReferences(first: 50) {
 		nodes {
-			id
+			databaseId
 			number
 			title
 			state

src/github/utils.ts

@@ -22,6 +22,7 @@ import {
 	IMilestone,
 	IProjectItem,
 	Issue,
+	IssueReference,
 	ISuggestedReviewer,
 	ITeam,
 	MergeMethod,
@@ -60,6 +61,20 @@ import { escapeRegExp, gitHubLabelColor, processDiffLinks as processDiffLinksCor
 export const ISSUE_EXPRESSION = /(([A-Za-z0-9_.\-]+)\/([A-Za-z0-9_.\-]+))?(#|GH-)([1-9][0-9]*)($|\b)/;
 export const ISSUE_OR_URL_EXPRESSION = /(https?:\/\/github\.com\/(([^\s]+)\/([^\s]+))\/([^\s]+\/)?(issues|pull)\/([0-9]+)(#issuecomment\-([0-9]+))?)|(([A-Za-z0-9_.\-]+)\/([A-Za-z0-9_.\-]+))?(#|GH-)([1-9][0-9]*)($|\b)/;
 
+/**
+ * Returns an issue/URL regex matching the appropriate GitHub host. When a
+ * GitHub Enterprise URI is provided, that host is used in addition to
+ * github.com so that issue URLs from the enterprise instance are recognized.
+ * The capture group layout matches `ISSUE_OR_URL_EXPRESSION` for use with
+ * `parseIssueExpressionOutput`.
+ */
+export function getIssueOrURLExpression(enterpriseUri?: vscode.Uri): RegExp {
+	const hostPattern = enterpriseUri
+		? `(?:github\\.com|${escapeRegExp(enterpriseUri.authority)})`
+		: 'github\\.com';
+	return new RegExp(`(https?:\\/\\/${hostPattern}\\/(([^\\s]+)\\/([^\\s]+))\\/([^\\s]+\\/)?(issues|pull)\\/([0-9]+)(#issuecomment\\-([0-9]+))?)|(([A-Za-z0-9_.\\-]+)\\/([A-Za-z0-9_.\\-]+))?(#|GH-)([1-9][0-9]*)($|\\b)`);
+}
+
 export interface CommentReactionHandler {
 	toggleReaction(comment: vscode.Comment, reaction: vscode.CommentReaction): Promise<void>;
 }
@@ -1070,14 +1085,14 @@ function parseSuggestedReviewers(
 }
 
 function parseClosingIssuesReferences(
-	closingIssuesReferences: Array<{ id: number, number: number, title: string, state: string, url: string }> | undefined
-): Array<{ id: number, number: number, title: string, state: GithubItemStateEnum, url: string }> {
+	closingIssuesReferences: Array<{ databaseId: number, number: number, title: string, state: string, url: string }> | undefined
+): IssueReference[] {
 	if (!closingIssuesReferences) {
 		return [];
 	}
 
 	return closingIssuesReferences.map(issue => ({
-		id: issue.id,
+		id: issue.databaseId,
 		number: issue.number,
 		title: issue.title,
 		state: issue.state === 'OPEN' ? GithubItemStateEnum.Open : GithubItemStateEnum.Closed,

src/github/views.ts

@@ -9,6 +9,7 @@ import {
 	ILabel,
 	IMilestone,
 	IProjectItem,
+	IssueReference,
 	MergeMethod,
 	MergeMethodsAvailability,
 	MergeQueueState,
@@ -28,13 +29,6 @@ export enum ReviewType {
 	RequestChanges = 'requestChanges',
 }
 
-export interface IssueReference {
-	number: number;
-	title: string;
-	state: GithubItemStateEnum;
-	url: string;
-}
-
 export interface DisplayLabel extends ILabel {
 	displayName: string;
 }
@@ -119,7 +113,7 @@ export interface PullRequest extends Issue {
 	busy?: boolean;
 	loadingCommit?: string;
 	generateDescriptionTitle?: string;
-	closingIssues: IssueReference[];
+	closingIssues?: IssueReference[];
 }
 
 export interface ProjectItemsReply {

webviews/components/sidebar.tsx

@@ -8,8 +8,8 @@ import { closeIcon, copilotIcon, issuescon, passIcon, settingsIcon } from './ico
 import { Reviewer } from './reviewer';
 import { COPILOT_LOGINS } from '../../src/common/copilot';
 import { gitHubLabelColor } from '../../src/common/utils';
-import { GithubItemStateEnum, IAccount, IMilestone, IProjectItem, isITeam, reviewerId, reviewerLabel, ReviewState } from '../../src/github/interface';
-import { ChangeReviewersReply, IssueReference, PullRequest } from '../../src/github/views';
+import { GithubItemStateEnum, IAccount, IMilestone, IProjectItem, isITeam, IssueReference, reviewerId, reviewerLabel, ReviewState } from '../../src/github/interface';
+import { ChangeReviewersReply, PullRequest } from '../../src/github/views';
 import PullRequestContext from '../common/context';
 import { Label } from '../common/label';
 import { AuthorLink, Avatar } from '../components/user';
@@ -53,7 +53,7 @@ function Section({
 	);
 }
 
-export default function Sidebar({ reviewers, labels, closingIssues, hasWritePermission, isIssue, projectItems: projects, milestone, assignees, canAssignCopilot, canRequestCopilotReview }: PullRequest) {
+export default function Sidebar({ reviewers, labels, closingIssues = [], hasWritePermission, isIssue, projectItems: projects, milestone, assignees, canAssignCopilot, canRequestCopilotReview }: PullRequest) {
 	const {
 		addReviewers,
 		addReviewerCopilot,
@@ -276,7 +276,7 @@ export default function Sidebar({ reviewers, labels, closingIssues, hasWritePerm
 					hasWritePermission={false}
 				>
 					{closingIssues.map(issue => (
-						<IssueItem key={issue.number} issue={issue} />
+						<IssueItem key={issue.url} issue={issue} />
 					))}
 				</Section>
 			)}