Adds support for merging Azure DevOps PRs

Author: axosoft-ramint

src/plus/integrations/providers/azureDevOps.ts

@@ -1,4 +1,5 @@
 import type { AuthenticationSession, CancellationToken } from 'vscode';
+import { window } from 'vscode';
 import { HostingIntegrationId } from '../../../constants.integrations';
 import type { Account } from '../../../git/models/author';
 import type { DefaultBranch } from '../../../git/models/defaultBranch';
@@ -194,13 +195,31 @@ export class AzureDevOpsIntegration extends HostingIntegration<
 	}
 
 	protected override async mergeProviderPullRequest(
-		_session: AuthenticationSession,
-		_pr: PullRequest,
-		_options?: {
+		{ accessToken }: AuthenticationSession,
+		pr: PullRequest,
+		options?: {
 			mergeMethod?: PullRequestMergeMethod;
 		},
 	): Promise<boolean> {
-		return Promise.resolve(false);
+		const api = await this.getProvidersApi();
+		if (pr.refs == null || pr.project == null) return false;
+
+		try {
+			const merged = await api.mergePullRequest(this.id, pr, {
+				...options,
+				accessToken: accessToken,
+			});
+			return merged;
+		} catch (ex) {
+			void this.showMergeErrorMessage(ex);
+			return false;
+		}
+	}
+
+	private async showMergeErrorMessage(ex: Error) {
+		await window.showErrorMessage(
+			`${ex.message}. Check branch policies, and ensure you have the necessary permissions to merge the pull request.`,
+		);
 	}
 
 	protected override async getProviderAccountForCommit(

src/plus/integrations/providers/models.ts

@@ -5,6 +5,7 @@ import type {
 	AzureDevOps,
 	AzureOrganization,
 	AzureProject,
+	AzureSetPullRequestInput,
 	Bitbucket,
 	EnterpriseOptions,
 	GetRepoInput,
@@ -264,6 +265,21 @@ export type MergePullRequestFn =
 				mergeStrategy?: GitMergeStrategy.Squash;
 			},
 			options?: EnterpriseOptions,
+	  ) => Promise<void>)
+	| ((
+			input: {
+				pullRequest: {
+					headRef: {
+						oid: string;
+					};
+				} & AzureSetPullRequestInput;
+				mergeStrategy?:
+					| GitMergeStrategy.MergeCommit
+					| GitMergeStrategy.Rebase
+					| GitMergeStrategy.RebaseThenMergeCommit
+					| GitMergeStrategy.Squash;
+			},
+			options?: EnterpriseOptions,
 	  ) => Promise<void>);
 
 export type GetIssueFn = (

src/plus/integrations/providers/providersApi.ts

@@ -233,6 +233,7 @@ export class ProvidersApi {
 				getReposForAzureProjectFn: providerApis.azureDevOps.getReposForAzureProject.bind(
 					providerApis.azureDevOps,
 				) as GetReposForAzureProjectFn,
+				mergePullRequestFn: providerApis.azureDevOps.mergePullRequest.bind(providerApis.azureDevOps),
 			},
 			[IssueIntegrationId.Jira]: {
 				...providersMetadata[IssueIntegrationId.Jira],
@@ -729,6 +730,10 @@ export class ProvidersApi {
 		const headRef = pr.refs?.head;
 		if (headRef == null) return false;
 
+		if (provider.id === HostingIntegrationId.AzureDevOps && pr.project == null) {
+			return false;
+		}
+
 		try {
 			await provider.mergePullRequestFn?.(
 				{
@@ -739,6 +744,7 @@ export class ProvidersApi {
 						repository: {
 							id: pr.repository.repo,
 							name: pr.repository.repo,
+							project: pr.project?.name ?? '',
 							owner: {
 								login: pr.repository.owner,
 							},

src/plus/launchpad/launchpadProvider.ts

@@ -46,11 +46,7 @@ import type { ConnectionStateChangeEvent } from '../integrations/integrationServ
 import { isMaybeGitHubPullRequestUrl } from '../integrations/providers/github/github.utils';
 import { isMaybeGitLabPullRequestUrl } from '../integrations/providers/gitlab/gitlab.utils';
 import type { EnrichablePullRequest, ProviderActionablePullRequest } from '../integrations/providers/models';
-import {
-	fromProviderPullRequest,
-	getActionablePullRequests,
-	toProviderPullRequestWithUniqueId,
-} from '../integrations/providers/models';
+import { getActionablePullRequests, toProviderPullRequestWithUniqueId } from '../integrations/providers/models';
 import {
 	convertIntegrationIdToEnrichProvider,
 	convertRemoteProviderIdToEnrichProvider,
@@ -406,7 +402,7 @@ export class LaunchpadProvider implements Disposable {
 
 	@log<LaunchpadProvider['merge']>({ args: { 0: i => `${i.id} (${i.provider.name} ${i.type})` } })
 	async merge(item: LaunchpadItem): Promise<void> {
-		if (item.graphQLId == null || item.headRef?.oid == null) return;
+		if (item.headRef?.oid == null) return;
 		const integrationId = item.provider.id;
 		if (!isSupportedLaunchpadIntegrationId(integrationId)) return;
 		const confirm = await window.showQuickPick(['Merge', 'Cancel'], {
@@ -418,8 +414,7 @@ export class LaunchpadProvider implements Disposable {
 		const integration = await this.container.integrations.get(integrationId);
 		if (integration == null) return;
 
-		const pr: PullRequest = fromProviderPullRequest(item, integration);
-		await integration.mergePullRequest(pr);
+		await integration.mergePullRequest(item.underlyingPullRequest);
 		this.refresh();
 	}