fixup! Retrieves pull request for a branch in Azure DevOps to show in Home

Author: sergeibbb

src/plus/integrations/providers/azure/azure.ts

@@ -14,7 +14,7 @@ import {
 	RequestNotFoundError,
 } from '../../../../errors';
 import type { IssueOrPullRequest } from '../../../../git/models/issueOrPullRequest';
-import { PullRequest } from '../../../../git/models/pullRequest';
+import type { PullRequest } from '../../../../git/models/pullRequest';
 import type { Provider } from '../../../../git/models/remoteProvider';
 import { showIntegrationRequestFailed500WarningMessage } from '../../../../messages';
 import { configuration } from '../../../../system/-webview/configuration';
@@ -33,6 +33,7 @@ import type {
 import {
 	azurePullRequestStatusToState,
 	azureWorkItemsStateCategoryToState,
+	fromAzurePullRequest,
 	getAzurePullRequestWebUrl,
 	isClosedAzurePullRequestStatus,
 	isClosedAzureWorkItemStateCategory,
@@ -101,26 +102,7 @@ export class AzureDevOpsApi implements Disposable {
 			const pr = prResult?.value.find(pr => pr.sourceRefName.endsWith(branch));
 			if (pr == null) return undefined;
 
-			return new PullRequest(
-				provider,
-				{
-					id: pr.createdBy.id,
-					name: pr.createdBy.displayName,
-					avatarUrl: pr.createdBy.imageUrl,
-					url: pr.createdBy.url,
-				},
-				pr.pullRequestId.toString(),
-				pr.pullRequestId.toString(),
-				pr.title,
-				getPullRequestUrl(options.baseUrl, owner, projectName, repoName, pr.pullRequestId),
-				{
-					owner: owner,
-					repo: repo,
-				},
-				azurePullRequestStatusToState(pr.status),
-				new Date(pr.creationDate),
-				new Date(pr.creationDate),
-			);
+			return fromAzurePullRequest(pr, provider);
 		} catch (ex) {
 			Logger.error(ex, scope);
 			return undefined;

src/plus/integrations/providers/azure/models.ts

@@ -1,4 +1,6 @@
 import type { IssueOrPullRequestState } from '../../../../git/models/issueOrPullRequest';
+import { PullRequest } from '../../../../git/models/pullRequest';
+import type { Provider } from '../../../../git/models/remoteProvider';
 
 export type AzureWorkItemStateCategory = 'Proposed' | 'InProgress' | 'Resolved' | 'Completed' | 'Removed';
 
@@ -144,32 +146,6 @@ export interface AzureRepository {
 	isInMaintenance: boolean;
 }
 
-export type AzureProjectState = 'createPending' | 'deleted' | 'deleting' | 'new' | 'unchanged' | 'wellFormed';
-export type AzureProjectVisibility = 'private' | 'public';
-
-export interface AzureProject {
-	id: string;
-	name: string;
-	url: string;
-	state: AzureProjectState;
-	revision: number;
-	visibility: AzureProjectVisibility;
-	lastUpdateTime: string;
-}
-
-export interface AzureRepository {
-	id: string;
-	name: string;
-	url: string;
-	project: AzureProject;
-	size: number;
-	remoteUrl: string;
-	sshUrl: string;
-	webUrl: string;
-	isDisabled: boolean;
-	isInMaintenance: boolean;
-}
-
 export interface AzureGitCommitRef {
 	commitId: string;
 	url: string;
@@ -289,9 +265,18 @@ export interface AzurePullRequestWithLinks extends AzurePullRequest {
 	remoteUrl?: string;
 	workItemRefs?: AzureResourceRef[];
 }
+
+export function getVSTSOwner(url: URL): string {
+	return url.hostname.split('.')[0];
+}
 export function getAzureDevOpsOwner(url: URL): string {
 	return url.pathname.split('/')[1];
 }
+export function getAzureOwner(url: URL): string {
+	const isVSTS = url.hostname.endsWith('visualstudio.com');
+	return isVSTS ? getVSTSOwner(url) : getAzureDevOpsOwner(url);
+}
+
 export function getAzureRepo(pr: AzurePullRequest): string {
 	return `${pr.repository.project.name}/_git/${pr.repository.name}`;
 }
@@ -307,3 +292,27 @@ export function getAzurePullRequestWebUrl(pr: AzurePullRequest): string {
 	const owner = getAzureDevOpsOwner(url);
 	return `${baseUrl}/${owner}/${repoPath}/pullrequest/${pr.pullRequestId}`;
 }
+
+export function fromAzurePullRequest(pr: AzurePullRequest, provider: Provider): PullRequest {
+	const url = new URL(pr.url);
+	return new PullRequest(
+		provider,
+		{
+			id: pr.createdBy.id,
+			name: pr.createdBy.displayName,
+			avatarUrl: pr.createdBy.imageUrl,
+			url: pr.createdBy.url,
+		},
+		pr.pullRequestId.toString(),
+		pr.pullRequestId.toString(),
+		pr.title,
+		getAzurePullRequestWebUrl(pr),
+		{
+			owner: getAzureOwner(url),
+			repo: getAzureRepo(pr),
+		},
+		azurePullRequestStatusToState(pr.status),
+		new Date(pr.creationDate),
+		new Date(pr.creationDate),
+	);
+}