Adds Start Work & associated issue support for Azure DevOps

Author: axosoft-ramint

src/plus/integrations/integrationService.ts

@@ -724,12 +724,15 @@ export class IntegrationService implements Disposable {
 			id => id in HostingIntegrationId || id in SelfHostedIntegrationId,
 		) as SupportedHostingIntegrationIds[];
 		const openRemotesByIntegrationId = new Map<IntegrationId, ResourceDescriptor[]>();
+		let hasOpenAzureRepository = false;
 		for (const repository of this.container.git.openRepositories) {
 			const remotes = await repository.git.remotes().getRemotes();
-			if (remotes.length === 0) continue;
 			for (const remote of remotes) {
 				const remoteIntegration = await remote.getIntegration();
 				if (remoteIntegration == null) continue;
+				if (remoteIntegration.id === HostingIntegrationId.AzureDevOps) {
+					hasOpenAzureRepository = true;
+				}
 				for (const integrationId of hostingIntegrationIds?.length
 					? hostingIntegrationIds
 					: [...Object.values(HostingIntegrationId), ...Object.values(SelfHostedIntegrationId)]) {
@@ -760,20 +763,19 @@ export class IntegrationService implements Disposable {
 					...Object.values(SelfHostedIntegrationId),
 			  ]) {
 			const integration = await this.get(integrationId);
-			if (
-				integration == null ||
+			const isInvalidIntegration =
 				(options?.openRepositoriesOnly &&
+					integrationId !== HostingIntegrationId.AzureDevOps &&
 					(isHostingIntegrationId(integrationId) || isSelfHostedIntegrationId(integrationId)) &&
-					!openRemotesByIntegrationId.has(integrationId))
-			) {
+					!openRemotesByIntegrationId.has(integrationId)) ||
+				(integrationId === HostingIntegrationId.AzureDevOps && !hasOpenAzureRepository);
+			if (integration == null || isInvalidIntegration) {
 				continue;
 			}
 
 			integrations.set(
 				integration,
-				options?.openRepositoriesOnly &&
-					(isHostingIntegrationId(integrationId) || isSelfHostedIntegrationId(integrationId)) &&
-					openRemotesByIntegrationId.has(integrationId)
+				options?.openRepositoriesOnly && !isInvalidIntegration
 					? openRemotesByIntegrationId.get(integrationId)
 					: undefined,
 			);

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

@@ -13,6 +13,7 @@ import {
 	RequestClientError,
 	RequestNotFoundError,
 } from '../../../../errors';
+import type { Issue } from '../../../../git/models/issue';
 import type { IssueOrPullRequest } from '../../../../git/models/issueOrPullRequest';
 import type { PullRequest } from '../../../../git/models/pullRequest';
 import type { Provider } from '../../../../git/models/remoteProvider';
@@ -24,6 +25,7 @@ import type { LogScope } from '../../../../system/logger.scope';
 import { getLogScope } from '../../../../system/logger.scope';
 import { maybeStopWatch } from '../../../../system/stopwatch';
 import type {
+	AzureProjectDescriptor,
 	AzurePullRequest,
 	AzurePullRequestWithLinks,
 	AzureWorkItemState,
@@ -34,6 +36,7 @@ import {
 	azurePullRequestStatusToState,
 	azureWorkItemsStateCategoryToState,
 	fromAzurePullRequest,
+	fromAzureWorkItem,
 	getAzurePullRequestWebUrl,
 	isClosedAzurePullRequestStatus,
 	isClosedAzureWorkItemStateCategory,
@@ -145,7 +148,7 @@ export class AzureDevOpsApi implements Disposable {
 					provider,
 					token,
 					owner,
-					repo,
+					projectName,
 					options,
 				);
 
@@ -203,23 +206,71 @@ export class AzureDevOpsApi implements Disposable {
 		}
 	}
 
-	public async getWorkItemStateCategory(
+	@debug<AzureDevOpsApi['getIssue']>({ args: { 0: p => p.name, 1: '<token>' } })
+	public async getIssue(
+		provider: Provider,
+		token: string,
+		project: AzureProjectDescriptor,
+		id: string,
+		options: {
+			baseUrl: string;
+		},
+	): Promise<Issue | undefined> {
+		const scope = getLogScope();
+
+		try {
+			// Try to get the Work item (wit) first with specific fields
+			const issueResult = await this.request<WorkItem>(
+				provider,
+				token,
+				options?.baseUrl,
+				`${project.resourceName}/${project.name}/_apis/wit/workItems/${id}`,
+				{
+					method: 'GET',
+				},
+				scope,
+			);
+
+			if (issueResult != null) {
+				const issueType = issueResult.fields['System.WorkItemType'];
+				const state = issueResult.fields['System.State'];
+				const stateCategory = await this.getWorkItemStateCategory(
+					issueType,
+					state,
+					provider,
+					token,
+					project.resourceName,
+					project.name,
+					options,
+				);
+				return fromAzureWorkItem(issueResult, provider, project, stateCategory);
+			}
+		} catch (ex) {
+			if (ex.original?.status !== 404) {
+				Logger.error(ex, scope);
+				return undefined;
+			}
+		}
+
+		return undefined;
+	}
+
+	async getWorkItemStateCategory(
 		issueType: string,
 		state: string,
 		provider: Provider,
 		token: string,
 		owner: string,
-		repo: string,
+		projectName: string,
 		options: {
 			baseUrl: string;
 		},
 	): Promise<AzureWorkItemStateCategory | undefined> {
-		const [projectName] = repo.split('/');
 		const project = `${owner}/${projectName}`;
 		const category = this._workItemStates.getStateCategory(project, issueType, state);
 		if (category != null) return category;
 
-		const states = await this.retrieveWorkItemTypeStates(issueType, provider, token, owner, repo, options);
+		const states = await this.retrieveWorkItemTypeStates(issueType, provider, token, owner, projectName, options);
 		this._workItemStates.saveTypeStates(project, issueType, states);
 
 		return this._workItemStates.getStateCategory(project, issueType, state);
@@ -230,13 +281,12 @@ export class AzureDevOpsApi implements Disposable {
 		provider: Provider,
 		token: string,
 		owner: string,
-		repo: string,
+		projectName: string,
 		options: {
 			baseUrl: string;
 		},
 	): Promise<AzureWorkItemState[]> {
 		const scope = getLogScope();
-		const [projectName] = repo.split('/');
 
 		try {
 			const issueResult = await this.request<{ value: AzureWorkItemState[]; count: number }>(

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

@@ -1,4 +1,5 @@
-import { RepositoryAccessLevel } from '../../../../git/models/issue';
+import type { IssueMember } from '../../../../git/models/issue';
+import { Issue, RepositoryAccessLevel } from '../../../../git/models/issue';
 import type { IssueOrPullRequestState } from '../../../../git/models/issueOrPullRequest';
 import type { PullRequestMember, PullRequestReviewer } from '../../../../git/models/pullRequest';
 import {
@@ -8,9 +9,43 @@ import {
 	PullRequestReviewState,
 } from '../../../../git/models/pullRequest';
 import type { Provider } from '../../../../git/models/remoteProvider';
+import type { ResourceDescriptor } from '../../integration';
 
 const vstsHostnameRegex = /\.visualstudio\.com$/;
 
+export interface AzureRepositoryDescriptor extends ResourceDescriptor {
+	owner: string;
+	name: string;
+}
+
+export interface AzureOrganizationDescriptor extends ResourceDescriptor {
+	id: string;
+	name: string;
+}
+
+export interface AzureProjectDescriptor extends ResourceDescriptor {
+	id: string;
+	name: string;
+	resourceId: string;
+	resourceName: string;
+}
+
+export interface AzureRemoteRepositoryDescriptor extends ResourceDescriptor {
+	id: string;
+	nodeId?: string;
+	resourceName: string;
+	name: string;
+	projectName?: string;
+	url?: string;
+	cloneUrlHttps?: string;
+	cloneUrlSsh?: string;
+}
+
+export interface AzureProjectInputDescriptor extends ResourceDescriptor {
+	owner: string;
+	name: string;
+}
+
 export type AzureWorkItemStateCategory = 'Proposed' | 'InProgress' | 'Resolved' | 'Completed' | 'Removed';
 
 export function isClosedAzureWorkItemStateCategory(category: AzureWorkItemStateCategory | undefined): boolean {
@@ -91,18 +126,21 @@ export interface WorkItem {
 		workItemUpdates: AzureLink;
 	};
 	fields: {
-		// 'System.AreaPath': string;
-		// 'System.TeamProject': string;
+		//'System.AreaPath': string;
+		'System.TeamProject': string;
 		// 'System.IterationPath': string;
 		'System.WorkItemType': string;
 		'System.State': string;
 		// 'System.Reason': string;
+		'System.AssignedTo': AzureUser;
 		'System.CreatedDate': string;
-		// 'System.CreatedBy': AzureUser;
+		'System.CreatedBy': AzureUser;
 		'System.ChangedDate': string;
-		// 'System.ChangedBy': AzureUser;
-		// 'System.CommentCount': number;
+		'System.ChangedBy': AzureUser;
+		'System.CommentCount': number;
+		'System.Description': string;
 		'System.Title': string;
+		'Microsoft.VSTS.Common.ClosedDate': string;
 		// 'Microsoft.VSTS.Common.StateChangeDate': string;
 		// 'Microsoft.VSTS.Common.Priority': number;
 		// 'Microsoft.VSTS.Common.Severity': string;
@@ -390,6 +428,17 @@ function normalizeAzureBranchName(branchName: string): string {
 	return branchName.startsWith('refs/heads/') ? branchName.replace('refs/heads/', '') : branchName;
 }
 
+function fromAzureUserToMember(user: AzureUser, type: 'issue'): IssueMember;
+function fromAzureUserToMember(user: AzureUser, type: 'pullRequest'): PullRequestMember;
+function fromAzureUserToMember(user: AzureUser, _type: 'issue' | 'pullRequest'): PullRequestMember | IssueMember {
+	return {
+		avatarUrl: user.imageUrl,
+		id: user.id,
+		name: user.displayName,
+		url: user.url,
+	};
+}
+
 export function fromAzurePullRequest(
 	pr: AzurePullRequest,
 	provider: Provider,
@@ -399,12 +448,7 @@ export function fromAzurePullRequest(
 	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,
-		},
+		fromAzureUserToMember(pr.createdBy, 'pullRequest'),
 		pr.pullRequestId.toString(),
 		pr.pullRequestId.toString(),
 		pr.title,
@@ -460,3 +504,33 @@ export function fromAzurePullRequest(
 		},
 	);
 }
+
+export function fromAzureWorkItem(
+	workItem: WorkItem,
+	provider: Provider,
+	project: AzureProjectDescriptor,
+	stateCategory?: AzureWorkItemStateCategory,
+): Issue {
+	return new Issue(
+		provider,
+		workItem.id.toString(),
+		workItem.id.toString(),
+		workItem.fields['System.Title'],
+		workItem._links.html.href,
+		new Date(workItem.fields['System.CreatedDate']),
+		new Date(workItem.fields['System.ChangedDate']),
+		isClosedAzureWorkItemStateCategory(stateCategory),
+		azureWorkItemsStateCategoryToState(stateCategory),
+		fromAzureUserToMember(workItem.fields['System.CreatedBy'], 'issue'),
+		[fromAzureUserToMember(workItem.fields['System.AssignedTo'], 'issue')],
+		undefined,
+		workItem.fields['Microsoft.VSTS.Common.ClosedDate']
+			? new Date(workItem.fields['Microsoft.VSTS.Common.ClosedDate'])
+			: undefined,
+		undefined,
+		workItem.fields['System.CommentCount'],
+		undefined,
+		workItem.fields['System.Description'],
+		project,
+	);
+}