Implements getting issues for Azure DevOps Server

(#4478, #4516)

Author: sergeibbb

src/plus/integrations/providers/azureDevOps.ts

@@ -8,7 +8,7 @@ import type { Issue, IssueShape } from '../../../git/models/issue';
 import type { IssueOrPullRequest, IssueOrPullRequestType } from '../../../git/models/issueOrPullRequest';
 import type { PullRequest, PullRequestMergeMethod, PullRequestState } from '../../../git/models/pullRequest';
 import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata';
-import { getSettledValue } from '../../../system/promise';
+import { flatSettled } from '../../../system/promise';
 import { base64 } from '../../../system/string';
 import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthenticationProvider';
 import type { IntegrationAuthenticationService } from '../authentication/integrationAuthenticationService';
@@ -119,16 +119,13 @@ export abstract class AzureDevOpsIntegrationBase<
 
 		if (resourcesWithoutProjects.length > 0) {
 			const api = await this.getProvidersApi();
-			const azureProjects = (
-				await Promise.allSettled(
-					resourcesWithoutProjects.map(resource =>
-						api.getAzureProjectsForResource(resource.name, this.id, this.getApiOptions(accessToken)),
-					),
-				)
-			)
-				.map(r => getSettledValue(r)?.values)
-				.flat()
-				.filter(p => p != null);
+			const azureProjects = await flatSettled(
+				resourcesWithoutProjects.map(
+					async resource =>
+						(await api.getAzureProjectsForResource(resource.name, this.id, this.getApiOptions(accessToken)))
+							.values,
+				),
+			);
 
 			for (const resource of resourcesWithoutProjects) {
 				const projects = azureProjects?.filter(p => p.namespace === resource.name);
@@ -412,32 +409,28 @@ export abstract class AzureDevOpsIntegrationBase<
 		const projects = await this.getProviderProjectsForResources(session, orgs);
 		if (projects == null || projects.length === 0) return undefined;
 
-		const assignedIssues = (
-			await Promise.all(
-				projects.map(async p => {
-					const issuesResponse = (
-						await api.getIssuesForAzureProject(this.id, p.resourceName, p.name, {
-							...this.getApiOptions(session.accessToken),
-							assigneeLogins: [user.username!],
-						})
-					).values;
-					return issuesResponse.map(i => fromProviderIssue(i, this as any, { project: p }));
-				}),
-			)
-		).flat();
-		const authoredIssues = (
-			await Promise.all(
-				projects.map(async p => {
-					const issuesResponse = (
-						await api.getIssuesForAzureProject(this.id, p.resourceName, p.name, {
-							...this.getApiOptions(session.accessToken),
-							authorLogin: user.username!,
-						})
-					).values;
-					return issuesResponse.map(i => fromProviderIssue(i, this as any, { project: p }));
-				}),
-			)
-		).flat();
+		const assignedIssues = await flatSettled(
+			projects.map(async p => {
+				const issuesResponse = (
+					await api.getIssuesForAzureProject(this.id, p.resourceName, p.name, {
+						...this.getApiOptions(session.accessToken),
+						assigneeLogins: [user.username!],
+					})
+				).values;
+				return issuesResponse.map(i => fromProviderIssue(i, this as any, { project: p }));
+			}),
+		);
+		const authoredIssues = await flatSettled(
+			projects.map(async p => {
+				const issuesResponse = (
+					await api.getIssuesForAzureProject(this.id, p.resourceName, p.name, {
+						...this.getApiOptions(session.accessToken),
+						authorLogin: user.username!,
+					})
+				).values;
+				return issuesResponse.map(i => fromProviderIssue(i, this as any, { project: p }));
+			}),
+		);
 		// TODO: Add mentioned issues
 		const issuesById = new Map<string, IssueShape>();
 

src/plus/integrations/providers/bitbucket.ts

@@ -8,7 +8,7 @@ import type { IssueOrPullRequest, IssueOrPullRequestType } from '../../../git/mo
 import type { PullRequest, PullRequestMergeMethod, PullRequestState } from '../../../git/models/pullRequest';
 import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata';
 import { uniqueBy } from '../../../system/iterable';
-import { getSettledValue } from '../../../system/promise';
+import { flatSettled, nonnullSettled } from '../../../system/promise';
 import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthenticationProvider';
 import type { ProviderAuthenticationSession } from '../authentication/models';
 import { GitHostIntegration } from '../models/gitHostIntegration';
@@ -351,15 +351,3 @@ const bitbucketCloudDomainRegex = /^bitbucket\.org$/i;
 export function isBitbucketCloudDomain(domain: string | undefined): boolean {
 	return domain != null && bitbucketCloudDomainRegex.test(domain);
 }
-
-type MaybePromiseArr<T> = (Promise<T | undefined> | T | undefined)[];
-
-async function nonnullSettled<T>(arr: MaybePromiseArr<T>): Promise<T[]> {
-	const all = await Promise.allSettled(arr);
-	return all.map(r => getSettledValue(r)).filter(v => v != null);
-}
-
-async function flatSettled<T>(arr: MaybePromiseArr<(T | undefined)[]>): Promise<T[]> {
-	const all = await nonnullSettled(arr);
-	return all.flat().filter(v => v != null);
-}

src/plus/integrations/providers/providersApi.ts

@@ -1035,7 +1035,7 @@ export class ProvidersApi {
 		providerId: GitCloudHostIntegrationId.AzureDevOps | GitSelfManagedHostIntegrationId.AzureDevOpsServer,
 		namespace: string,
 		project: string,
-		options?: GetIssuesOptions & { accessToken?: string; isPAT?: boolean },
+		options?: GetIssuesOptions & { accessToken?: string; isPAT?: boolean; baseUrl?: string },
 	): Promise<PagedResult<ProviderIssue>> {
 		const { provider, token } = await this.ensureProviderTokenAndFunction(
 			providerId,
@@ -1050,6 +1050,7 @@ export class ProvidersApi {
 			token,
 			options?.cursor,
 			options?.isPAT,
+			options?.baseUrl,
 		);
 	}
 

src/system/promise.ts

@@ -197,6 +197,18 @@ export function getDeferredPromiseIfPending<T>(deferred: Deferred<T> | undefined
 	return deferred?.pending ? deferred.promise : undefined;
 }
 
+export type MaybePromiseArr<T> = (Promise<T | undefined> | T | undefined)[];
+
+export async function nonnullSettled<T>(arr: MaybePromiseArr<T>): Promise<T[]> {
+	const all = await Promise.allSettled(arr);
+	return all.map(r => getSettledValue(r)).filter(v => v != null);
+}
+
+export async function flatSettled<T>(arr: MaybePromiseArr<(T | undefined)[]>): Promise<T[]> {
+	const all = await nonnullSettled(arr);
+	return all.flat().filter(v => v != null);
+}
+
 export function getSettledValue<T>(promise: PromiseSettledResult<T> | undefined): T | undefined;
 export function getSettledValue<T>(
 	promise: PromiseSettledResult<T> | undefined,