Use org name if available in notification (microsoft#210816)

bhavyaus · web-flow · commit 73a2c100f622 · 2024-04-20T10:58:36.000+02:00
diff --git a/src/vs/workbench/contrib/accountEntitlements/browser/accountsEntitlements.contribution.ts b/src/vs/workbench/contrib/accountEntitlements/browser/accountsEntitlements.contribution.ts
@@ -147,8 +147,8 @@ class EntitlementsContribution extends Disposable implements IWorkbenchContribut
 		}
 		this.telemetryService.publicLog2<{ enabled: boolean }, EntitlementEnablementClassification>('entitlements.enabled', { enabled: true });
 		this.isInitialized = true;
-		const orgs = parsedResult['organization_login_list'] as any[];
-		return [true, orgs ? orgs[orgs.length - 1] : undefined];
+		const orgs: { login: string; name: string }[] = parsedResult['organization_list'] as { login: string; name: string }[];
+		return [true, orgs && orgs.length > 0 ? (orgs[0].name ? orgs[0].name : orgs[0].login) : undefined];
 	}
 
 	private async enableEntitlements(session: AuthenticationSession) {

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,8 @@ class EntitlementsContribution extends Disposable implements IWorkbenchContribut`
`147`	`147`	`}`
`148`	`148`	`this.telemetryService.publicLog2<{ enabled: boolean }, EntitlementEnablementClassification>('entitlements.enabled', { enabled: true });`
`149`	`149`	`this.isInitialized = true;`
`150`		`- const orgs = parsedResult['organization_login_list'] as any[];`
`151`		`- return [true, orgs ? orgs[orgs.length - 1] : undefined];`
	`150`	`+ const orgs: { login: string; name: string }[] = parsedResult['organization_list'] as { login: string; name: string }[];`
	`151`	`+ return [true, orgs && orgs.length > 0 ? (orgs[0].name ? orgs[0].name : orgs[0].login) : undefined];`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`private async enableEntitlements(session: AuthenticationSession) {`