Fix avatar display in tree views for GitHub Enterprise (#8421)

* Initial plan

* Fix avatar display in tree views for GitHub Enterprise

- Add enterprise detection in PR tree views
- Use github ThemeIcon placeholder for enterprise instead of fetching avatars
- Update pullRequestNode, issuesView, commitNode, and repositoryChangesNode

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

* Fix type error in commitNode iconPath

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

* Refactor: Extract helper method to reduce code duplication in pullRequestNode

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

* Use avatarUrl check instead of isEnterprise flag

Check for 'githubusercontent.com' in avatar URLs to determine if fetching
should be attempted, rather than relying on the remote's enterprise flag.

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

* Extract avatar URL check into utility function

Add DataUri.isGitHubDotComAvatar() utility to check if an avatar URL
is from GitHub.com. Use this utility in all tree view nodes instead of
inline .includes() checks.

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

* Revert proposed changes

* Fix test

* Fix test

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

src/common/uri.ts

@@ -290,6 +290,16 @@ export namespace DataUri {
 		return asImageDataURI(contents);
 	}
 
+	/**
+	 * Checks if an avatar URL is from GitHub.com (as opposed to GitHub Enterprise).
+	 * GitHub.com avatar URLs contain 'githubusercontent.com', while enterprise avatar URLs do not.
+	 * @param avatarUrl The avatar URL to check
+	 * @returns true if the avatar is from GitHub.com, false otherwise
+	 */
+	export function isGitHubDotComAvatar(avatarUrl: string | undefined): boolean {
+		return avatarUrl?.includes('githubusercontent.com') ?? false;
+	}
+
 	export async function avatarCirclesAsImageDataUris(context: vscode.ExtensionContext, users: (IAccount | ITeam)[], height: number, width: number, localOnly?: boolean): Promise<(vscode.Uri | undefined)[]> {
 		let cacheLogOrder: string[];
 		const cacheLog = cacheLogUri(context);

src/issues/issuesView.ts

@@ -101,10 +101,15 @@ export class IssuesTreeData
 		}
 
 		if (avatarUser) {
-			treeItem.iconPath = (await DataUri.avatarCirclesAsImageDataUris(this.context, [avatarUser], 16, 16))[0] ??
-				(element.isOpen
-					? new vscode.ThemeIcon('issues', new vscode.ThemeColor('issues.open'))
-					: new vscode.ThemeIcon('issue-closed', new vscode.ThemeColor('github.issues.closed')));
+			// For enterprise, use placeholder icon instead of trying to fetch avatar
+			if (!DataUri.isGitHubDotComAvatar(avatarUser.avatarUrl)) {
+				treeItem.iconPath = new vscode.ThemeIcon('github');
+			} else {
+				treeItem.iconPath = (await DataUri.avatarCirclesAsImageDataUris(this.context, [avatarUser], 16, 16))[0] ??
+					(element.isOpen
+						? new vscode.ThemeIcon('issues', new vscode.ThemeColor('issues.open'))
+						: new vscode.ThemeIcon('issue-closed', new vscode.ThemeColor('github.issues.closed')));
+			}
 		} else {
 			// Use GitHub codicon when assignee setting is selected but no assignees exist
 			treeItem.iconPath = new vscode.ThemeIcon('github');

src/test/view/prsTree.test.ts

@@ -186,7 +186,7 @@ describe('GitHub Pull Requests view', function () {
 							p.databaseId(1111);
 							p.number(1111);
 							p.title('zero');
-							p.author(a => a.login('me').avatarUrl('https://avatars.com/me.jpg').url('https://github.com/me'));
+							p.author(a => a.login('me').avatarUrl('https://githubusercontent.com/me.jpg').url('https://githubusercontent.com/me'));
 							p.baseRef!(b => b.repository(br => br.url('https://github.com/aaa/bbb')));
 							p.baseRepository(r => r.url('https://github.com/aaa/bbb'));
 						}),
@@ -203,7 +203,7 @@ describe('GitHub Pull Requests view', function () {
 							p.databaseId(2222);
 							p.number(2222);
 							p.title('one');
-							p.author(a => a.login('you').avatarUrl('https://avatars.com/you.jpg'));
+							p.author(a => a.login('you').avatarUrl('https://githubusercontent.com/you.jpg'));
 							p.baseRef!(b => b.repository(br => br.url('https://github.com/aaa/bbb')));
 							p.baseRepository(r => r.url('https://github.com/aaa/bbb'));
 						}),
@@ -257,7 +257,7 @@ describe('GitHub Pull Requests view', function () {
 			assert.strictEqual(localItem0.description, 'by @me');
 			assert.strictEqual(localItem0.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed);
 			assert.strictEqual(localItem0.contextValue, 'pullrequest:local:nonactive:hasHeadRef');
-			assert.deepStrictEqual(localItem0.iconPath!.toString(), 'https://avatars.com/me.jpg');
+			assert.deepStrictEqual(localItem0.iconPath!.toString(), 'https://githubusercontent.com/me.jpg');
 
 			const label1 = (localItem1.label as vscode.TreeItemLabel2).label;
 			assert.ok(label1 instanceof vscode.MarkdownString);
@@ -266,7 +266,7 @@ describe('GitHub Pull Requests view', function () {
 			assert.strictEqual(localItem1.description, 'by @you');
 			assert.strictEqual(localItem1.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed);
 			assert.strictEqual(localItem1.contextValue, 'pullrequest:local:active:hasHeadRef');
-			assert.deepStrictEqual(localItem1.iconPath!.toString(), 'https://avatars.com/you.jpg');
+			assert.deepStrictEqual(localItem1.iconPath!.toString(), 'https://githubusercontent.com/you.jpg');
 		});
 	});
 });

src/view/treeNodes/commitNode.ts

@@ -20,7 +20,7 @@ import { LabelOnlyNode, TreeNode, TreeNodeParent } from './treeNode';
 export class CommitNode extends TreeNode implements vscode.TreeItem {
 	public sha: string;
 	public collapsibleState: vscode.TreeItemCollapsibleState;
-	public iconPath: vscode.Uri | undefined;
+	public iconPath: vscode.Uri | vscode.ThemeIcon | undefined;
 	public contextValue?: string;
 
 	constructor(
@@ -40,8 +40,13 @@ export class CommitNode extends TreeNode implements vscode.TreeItem {
 
 	async getTreeItem(): Promise<vscode.TreeItem> {
 		if (this.commit.author) {
-			const author: IAccount = { id: this.commit.author.node_id, login: this.commit.author.login, url: this.commit.author.url, avatarUrl: this.commit.author.avatar_url, accountType: this.commit.author.type as AccountType };
-			this.iconPath = (await DataUri.avatarCirclesAsImageDataUris(this.pullRequestManager.context, [author], 16, 16))[0];
+			// For enterprise, use placeholder icon instead of trying to fetch avatar
+			if (!DataUri.isGitHubDotComAvatar(this.commit.author.avatar_url)) {
+				this.iconPath = new vscode.ThemeIcon('github');
+			} else {
+				const author: IAccount = { id: this.commit.author.node_id, login: this.commit.author.login, url: this.commit.author.url, avatarUrl: this.commit.author.avatar_url, accountType: this.commit.author.type as AccountType };
+				this.iconPath = (await DataUri.avatarCirclesAsImageDataUris(this.pullRequestManager.context, [author], 16, 16))[0];
+			}
 		}
 		return this;
 	}

src/view/treeNodes/pullRequestNode.ts

@@ -270,12 +270,20 @@ export class PRNode extends TreeNode implements vscode.CommentingRangeProvider2
 		});
 	}
 
+	private async _getAuthorIcon(): Promise<vscode.Uri | vscode.ThemeIcon> {
+		// For enterprise, use placeholder icon instead of trying to fetch avatar
+		if (!DataUri.isGitHubDotComAvatar(this.pullRequestModel.author.avatarUrl)) {
+			return new vscode.ThemeIcon('github');
+		}
+		return (await DataUri.avatarCirclesAsImageDataUris(this._folderReposManager.context, [this.pullRequestModel.author], 16, 16))[0]
+			?? new vscode.ThemeIcon('github');
+	}
+
 	private async _getIcon(): Promise<vscode.Uri | vscode.ThemeIcon | { light: vscode.Uri; dark: vscode.Uri }> {
 		const copilotWorkingStatus = await this.pullRequestModel.copilotWorkingStatus();
 		const theme = this._folderReposManager.themeWatcher.themeData;
 		if (copilotWorkingStatus === CopilotWorkingStatus.NotCopilotIssue) {
-			return (await DataUri.avatarCirclesAsImageDataUris(this._folderReposManager.context, [this.pullRequestModel.author], 16, 16))[0]
-				?? new vscode.ThemeIcon('github');
+			return this._getAuthorIcon();
 		}
 		switch (copilotWorkingStatus) {
 			case CopilotWorkingStatus.InProgress:
@@ -294,8 +302,7 @@ export class PRNode extends TreeNode implements vscode.CommentingRangeProvider2
 					dark: DataUri.copilotErrorAsImageDataURI(getIconForeground(theme, 'dark'), getListErrorForeground(theme, 'dark'))
 				};
 			default:
-				return (await DataUri.avatarCirclesAsImageDataUris(this._folderReposManager.context, [this.pullRequestModel.author], 16, 16))[0]
-					?? new vscode.ThemeIcon('github');
+				return this._getAuthorIcon();
 		}
 	}
 

src/view/treeNodes/repositoryChangesNode.ts

@@ -111,7 +111,12 @@ export class RepositoryChangesNode extends TreeNode implements vscode.TreeItem {
 
 	override async getTreeItem(): Promise<vscode.TreeItem> {
 		this.setLabel();
-		this.iconPath = (await DataUri.avatarCirclesAsImageDataUris(this._pullRequestManager.context, [this.pullRequestModel.author], 16, 16))[0];
+		// For enterprise, use placeholder icon instead of trying to fetch avatar
+		if (!DataUri.isGitHubDotComAvatar(this.pullRequestModel.author.avatarUrl)) {
+			this.iconPath = new vscode.ThemeIcon('github');
+		} else {
+			this.iconPath = (await DataUri.avatarCirclesAsImageDataUris(this._pullRequestManager.context, [this.pullRequestModel.author], 16, 16))[0];
+		}
 		this.description = undefined;
 		if (this.parent.children?.length && this.parent.children.length > 1) {
 			const allSameOwner = this.parent.children.every(child => {