Enriches Azure autolinks on commits: issues and pull requests #3996

sergeibbb · 2025-01-30T10:41:25Z

Description

#3977

Issues and PRs on a commit

An open issue

A closed issue

An open PR

A closed PR

Checklist

I have followed the guidelines in the Contributing document
My changes follow the coding style of this project
My changes build without any errors or warnings
My changes have been formatted and linted
My changes include any required corresponding changes to the documentation (including CHANGELOG.md and README.md)
My changes have been rebased and squashed to the minimal number (typically 1) of relevant commits
My changes have a descriptive commit message with a short title, including a Fixes $XXX - or Closes #XXX - prefix to auto-close the issue that your PR addresses

sergeibbb · 2025-01-30T10:44:18Z

@axosoft-ramint

Enriched autolinks work. I'm switching to Home. Do you think we can merge what's done without the rest of #3977?
Here are my current changes #3996

What I'm not sure about is whether it's OK that keep saved issue-status -> category data in the API class or there is a better place for it. Move it to the integration?

(#3977, #3996)

sergeibbb · 2025-01-30T10:53:39Z

src/autolinks/autolinks.ts

-			let linkIntegration = link.provider
-				? await this.container.integrations.get(link.provider.id as IntegrationId)
-				: undefined;
+			const integrationId = link.provider ? remoteProviderIdToIntegrationId(link.provider.id) : undefined;


@sergeibbb !
Here with this new ID converting function we'll need to make sure that other types of enriched autolinks are not broken. What do we have? Jira, GitHub Cloud and Ent, GitLab Cloud and Ent. Anything else to check?

In some cases like in Jira, we pass the entire integration in as a provider reference, so remoteProviderIdToIntegrationId will fail here. I think in the short term here, we can first try treating link.provider.id as an integration id and try to get the integration from that, and put that in a try/catch so if it fails, then we can try the solution here (try treating it as a remote provider id and convert first before getting the integration).

But in the long term, we need to distinguish, on pull requests, issues, and autolinks, the difference between a remote provider reference and an integration reference. They should be treated separately and put into different properties. If we cannot accomplish that here, we should treat it as a follow-up task.

My short term idea would be something like:

Suggested change

const integrationId = link.provider ? remoteProviderIdToIntegrationId(link.provider.id) : undefined;

const integrationId: IntegrationId | undefined = link.provider instanceof Integration ? link.provider.id : isRemoteProviderReference(link.provider) ? remoteProviderIdToIntegrationId(link.provider.id) : undefined;

let linkIntegration = integrationId != null ? await this.container.integrations.get(integrationId) : undefined;

But in long term, we should make sure we never put an Integration into provider property, reserve that for remote providers, and instead have a separate integration property or something that is an integration reference.

(#3977, #3996)

axosoft-ramint

Will likely break autolinks for several integrations including Jira, but not really your fault here - we just did a very poor job putting both integrations and remote providers into the same provider property just because they both match the very loose providerreference interface.

We should improve on that. I offer a short-term idea and long-term suggestion below, up to you which you think you can get to for this release.

axosoft-ramint · 2025-01-30T23:11:30Z

src/autolinks/autolinks.ts

-			let linkIntegration = link.provider
-				? await this.container.integrations.get(link.provider.id as IntegrationId)
-				: undefined;
+			const integrationId = link.provider ? remoteProviderIdToIntegrationId(link.provider.id) : undefined;


In some cases like in Jira, we pass the entire integration in as a provider reference, so remoteProviderIdToIntegrationId will fail here. I think in the short term here, we can first try treating link.provider.id as an integration id and try to get the integration from that, and put that in a try/catch so if it fails, then we can try the solution here (try treating it as a remote provider id and convert first before getting the integration).

But in the long term, we need to distinguish, on pull requests, issues, and autolinks, the difference between a remote provider reference and an integration reference. They should be treated separately and put into different properties. If we cannot accomplish that here, we should treat it as a follow-up task.

axosoft-ramint · 2025-01-30T23:13:58Z

src/plus/integrations/integrationService.ts

@@ -1029,13 +1029,8 @@ export class IntegrationService implements Disposable {
 	}
 }

-export function remoteProviderIdToIntegrationId(


We should avoid setting the input typing to unknown here. I know we messed up by treating integrations as remote provider references in several places, but it would be better to work toward addressing that directly rather than loosening the typing here.

axosoft-ramint · 2025-01-30T23:20:54Z

src/autolinks/autolinks.ts

-			let linkIntegration = link.provider
-				? await this.container.integrations.get(link.provider.id as IntegrationId)
-				: undefined;
+			const integrationId = link.provider ? remoteProviderIdToIntegrationId(link.provider.id) : undefined;


My short term idea would be something like:

Suggested change

const integrationId = link.provider ? remoteProviderIdToIntegrationId(link.provider.id) : undefined;

const integrationId: IntegrationId | undefined = link.provider instanceof Integration ? link.provider.id : isRemoteProviderReference(link.provider) ? remoteProviderIdToIntegrationId(link.provider.id) : undefined;

let linkIntegration = integrationId != null ? await this.container.integrations.get(integrationId) : undefined;

But in long term, we should make sure we never put an Integration into provider property, reserve that for remote providers, and instead have a separate integration property or something that is an integration reference.

axosoft-ramint · 2025-01-30T23:24:57Z

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

+}
+
+export interface AzurePullRequest {
+	repository: unknown;


This needs a type. See https://learn.microsoft.com/en-us/rest/api/azure/devops/git/pull-requests/get-pull-request?view=azure-devops-rest-7.1#gitpullrequest for all pull request properties and subtypes.

axosoft-ramint · 2025-01-30T23:31:47Z

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

+		commitId: string;
+		url: string;
+	};
+	reviewers: unknown[];


Please add and define the appropriate subtypes

axosoft-ramint · 2025-01-30T23:33:13Z

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

+	return `${baseUrl}/${owner}/${projectName}/_git/${repoName}/pullrequest/${pullRequestId}`;
+}
+
+export interface AzurePullRequest {


Missing properties here:
autoCompleteSetBy
closedBy
commits
completionOptions
completionQueueTime
forkSource
hasMultipleMergeBases
labels
lastMergeCommit
mergeFailureMessage
mergeFailureType
mergeOptions
mergeStatus
workItemRefs

You can find their descriptions and types here: https://learn.microsoft.com/en-us/rest/api/azure/devops/git/pull-requests/get-pull-request?view=azure-devops-rest-7.1#gitpullrequest

Haven't checked but please make sure we have as complete as possible information on Azure issue (work item) typings as well.

sergeibbb linked an issue Jan 30, 2025 that may be closed by this pull request

Azure DevOps Integration Support - Add Home PR/Issue Support #3977

Open

sergeibbb changed the title ~~3977 azure autolinks~~ Enriches Azure autolinks on commits issues and pull requests Jan 30, 2025

Makes UI to request Auzure autolinks properly

caf2206

(#3977, #3996)

sergeibbb added a commit that referenced this pull request Jan 30, 2025

Retrieves an issue from Azure

fc33aa3

(#3977, #3996)

sergeibbb added a commit that referenced this pull request Jan 30, 2025

Retrieves and caches state-map for the current Azure project.

348cdb8

(#3977, #3996)

sergeibbb force-pushed the 3977-azure-autolinks branch from a7e6cea to 81408f8 Compare January 30, 2025 10:45

sergeibbb added a commit that referenced this pull request Jan 30, 2025

Retrieves a pull request from Azure

81408f8

(#3977, #3996)

sergeibbb commented Jan 30, 2025

View reviewed changes

sergeibbb added 2 commits January 30, 2025 12:06

Retrieves an issue from Azure

66107c1

(#3977, #3996)

Retrieves and caches state-map for the current Azure project.

ead992a

(#3977, #3996)

sergeibbb added a commit that referenced this pull request Jan 30, 2025

Retrieves a pull request from Azure

55fa0fa

(#3977, #3996)

sergeibbb force-pushed the 3977-azure-autolinks branch from 81408f8 to 55fa0fa Compare January 30, 2025 11:06

sergeibbb mentioned this pull request Jan 30, 2025

Azure DevOps Integration Support - Add Home PR/Issue Support #3977

Open

sergeibbb changed the title ~~Enriches Azure autolinks on commits issues and pull requests~~ Enriches Azure autolinks on commits: issues and pull requests Jan 30, 2025

Retrieves a pull request from Azure

7e383a0

(#3977, #3996)

sergeibbb force-pushed the 3977-azure-autolinks branch from 55fa0fa to 7e383a0 Compare January 30, 2025 16:57

sergeibbb mentioned this pull request Jan 30, 2025

Retrieves pull request for a branch in Azure DevOps to show in Home #3999

Open

7 tasks

axosoft-ramint requested changes Jan 30, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enriches Azure autolinks on commits: issues and pull requests #3996

Enriches Azure autolinks on commits: issues and pull requests #3996

sergeibbb commented Jan 30, 2025 •

edited

Loading

sergeibbb commented Jan 30, 2025 •

edited

Loading

sergeibbb Jan 30, 2025 •

edited

Loading

axosoft-ramint Jan 30, 2025

axosoft-ramint Jan 30, 2025

axosoft-ramint left a comment

axosoft-ramint Jan 30, 2025

axosoft-ramint Jan 30, 2025

axosoft-ramint Jan 30, 2025

axosoft-ramint Jan 30, 2025

axosoft-ramint Jan 30, 2025

axosoft-ramint Jan 30, 2025

axosoft-ramint Jan 30, 2025

	const integrationId = link.provider ? remoteProviderIdToIntegrationId(link.provider.id) : undefined;
	const integrationId: IntegrationId \| undefined = link.provider instanceof Integration ? link.provider.id : isRemoteProviderReference(link.provider) ? remoteProviderIdToIntegrationId(link.provider.id) : undefined;
	let linkIntegration = integrationId != null ? await this.container.integrations.get(integrationId) : undefined;

Enriches Azure autolinks on commits: issues and pull requests #3996

Are you sure you want to change the base?

Enriches Azure autolinks on commits: issues and pull requests #3996

Conversation

sergeibbb commented Jan 30, 2025 • edited Loading

Description

Issues and PRs on a commit

Checklist

sergeibbb commented Jan 30, 2025 • edited Loading

sergeibbb Jan 30, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

axosoft-ramint left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sergeibbb commented Jan 30, 2025 •

edited

Loading

sergeibbb commented Jan 30, 2025 •

edited

Loading

sergeibbb Jan 30, 2025 •

edited

Loading