@@ -43,6 +43,9 @@ export function getEntityIdentifierInput(entity: Issue | PullRequest | Launchpad
4343 provider = EntityIdentifierProviderType . GitlabSelfHosted ;
4444 domain = entity . provider . domain ;
4545 }
46+ if ( provider === EntityIdentifierProviderType . AzureDevOpsServer ) {
47+ domain = entity . provider . domain ;
48+ }
4649
4750 let projectId = null ;
4851 let resourceId = null ;
@@ -55,7 +58,10 @@ export function getEntityIdentifierInput(entity: Issue | PullRequest | Launchpad
5558
5659 projectId = entity . project . id ;
5760 resourceId = entity . project . resourceId ;
58- } else if ( provider === EntityIdentifierProviderType . Azure ) {
61+ } else if (
62+ provider === EntityIdentifierProviderType . Azure ||
63+ provider === EntityIdentifierProviderType . AzureDevOpsServer
64+ ) {
5965 const project = isLaunchpadItem ( entity ) ? entity . underlyingPullRequest ?. project : entity . project ;
6066 if ( project == null ) {
6167 throw new Error ( 'Azure issues and PRs must have a project to be encoded' ) ;
@@ -75,7 +81,10 @@ export function getEntityIdentifierInput(entity: Issue | PullRequest | Launchpad
7581 }
7682
7783 let entityId = isLaunchpadItem ( entity ) ? entity . graphQLId ! : entity . nodeId ! ;
78- if ( provider === EntityIdentifierProviderType . Azure ) {
84+ if (
85+ provider === EntityIdentifierProviderType . Azure ||
86+ provider === EntityIdentifierProviderType . AzureDevOpsServer
87+ ) {
7988 entityId = isLaunchpadItem ( entity ) ? entity . underlyingPullRequest ?. id : entity . id ;
8089 }
8190
@@ -113,6 +122,8 @@ export function getProviderIdFromEntityIdentifier(
113122 return IssuesCloudHostIntegrationId . Jira ;
114123 case EntityIdentifierProviderType . Azure :
115124 return GitCloudHostIntegrationId . AzureDevOps ;
125+ case EntityIdentifierProviderType . AzureDevOpsServer :
126+ return GitSelfManagedHostIntegrationId . AzureDevOpsServer ;
116127 case EntityIdentifierProviderType . Bitbucket :
117128 return GitCloudHostIntegrationId . Bitbucket ;
118129 case EntityIdentifierProviderType . BitbucketServer :
@@ -139,8 +150,9 @@ function fromStringToEntityIdentifierProviderType(str: string): EntityIdentifier
139150 case 'azure' :
140151 case 'azureDevOps' :
141152 case 'azure-devops' :
142- case GitSelfManagedHostIntegrationId . AzureDevOpsServer :
143153 return EntityIdentifierProviderType . Azure ;
154+ case GitSelfManagedHostIntegrationId . AzureDevOpsServer :
155+ return EntityIdentifierProviderType . AzureDevOpsServer ;
144156 case 'bitbucket' :
145157 return EntityIdentifierProviderType . Bitbucket ;
146158 case 'bitbucket-server' :
@@ -246,6 +258,7 @@ export async function getIssueFromGitConfigEntityIdentifier(
246258 identifier . provider !== EntityIdentifierProviderType . GitlabSelfHosted &&
247259 identifier . provider !== EntityIdentifierProviderType . Bitbucket &&
248260 identifier . provider !== EntityIdentifierProviderType . BitbucketServer &&
261+ identifier . provider !== EntityIdentifierProviderType . AzureDevOpsServer &&
249262 identifier . provider !== EntityIdentifierProviderType . Azure
250263 ) {
251264 return undefined ;
0 commit comments