Team reviewers might not have a slug (#6447)

Fixes #6090
microsoft · Nov 4, 2024 · 420a836 · 420a836
1 parent 3f59afb
commit 420a836
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/github/interface.ts b/src/github/interface.ts
@@ -68,7 +68,7 @@ export interface ITeam {
 	name?: string;
 	avatarUrl?: string;
 	url: string;
-	slug: string;
+	slug?: string;
 	org: string;
 	id: string;
 }
@@ -84,7 +84,7 @@ export function reviewerId(reviewer: ITeam | IAccount): string {
 }
 
 export function reviewerLabel(reviewer: ITeam | IAccount | IActor | any): string {
-	return isTeam(reviewer) ? (reviewer.name ?? reviewer.slug) : (reviewer.specialDisplayName ?? reviewer.login);
+	return isTeam(reviewer) ? (reviewer.name ?? reviewer.slug ?? reviewer.id) : (reviewer.specialDisplayName ?? reviewer.login);
 }
 
 export function isTeam(reviewer: ITeam | IAccount | IActor | any): reviewer is ITeam {

diff --git a/src/github/utils.ts b/src/github/utils.ts
@@ -616,9 +616,9 @@ export function parseGraphQLReviewers(data: GraphQL.GetReviewRequestsResponse, r
 				name: reviewer.requestedReviewer.name,
 				url: reviewer.requestedReviewer.url,
 				avatarUrl: getAvatarWithEnterpriseFallback(reviewer.requestedReviewer.avatarUrl, undefined, remote.isEnterprise),
-				id: reviewer.requestedReviewer.id!,
+				id: reviewer.requestedReviewer.id,
 				org: remote.owner,
-				slug: reviewer.requestedReviewer.slug!
+				slug: reviewer.requestedReviewer.slug
 			};
 			reviewers.push(team);
 		}
@@ -929,8 +929,8 @@ export function loginComparator(a: IAccount, b: IAccount) {
  * Used for case insensitive sort by team name
  */
 export function teamComparator(a: ITeam, b: ITeam) {
-	const aKey = a.name ?? a.slug;
-	const bKey = b.name ?? b.slug;
+	const aKey = a.name ?? a.slug ?? a.id;
+	const bKey = b.name ?? b.slug ?? b.id;
 	// sensitivity: 'accent' allows case insensitive comparison
 	return aKey.localeCompare(bKey, 'en', { sensitivity: 'accent' });
 }