File tree Expand file tree Collapse file tree 4 files changed +10
-2
lines changed Expand file tree Collapse file tree 4 files changed +10
-2
lines changed Original file line number Diff line number Diff line change 1- import { convertRemoteProviderIdToIntegrationId } from '../../../plus/integrations/utils/-webview/integration.utils' ;
1+ import { getIntegrationIdForRemote } from '../../../plus/integrations/utils/-webview/integration.utils' ;
22import { configuration } from '../../../system/-webview/configuration' ;
33import { formatDate , fromNow } from '../../../system/date' ;
44import { map } from '../../../system/iterable' ;
@@ -80,13 +80,16 @@ export async function toRepositoryShapeWithProvider(
8080 icon : remote . provider . icon === 'remote' ? 'cloud' : remote . provider . icon ,
8181 integration : remote . supportsIntegration ( )
8282 ? {
83- id : convertRemoteProviderIdToIntegrationId ( remote . provider . id ) ! ,
83+ id : getIntegrationIdForRemote ( remote . provider ) ! ,
8484 connected : remote . maybeIntegrationConnected ?? false ,
8585 }
8686 : undefined ,
8787 supportedFeatures : remote . provider . supportedFeatures ,
8888 url : await remote . provider . url ( { type : RemoteResourceType . Repo } ) ,
8989 } ;
90+ if ( provider . integration ?. id == null ) {
91+ provider . integration = undefined ;
92+ }
9093 }
9194
9295 return { ...toRepositoryShape ( repo ) , provider : provider } ;
Original file line number Diff line number Diff line change @@ -1596,6 +1596,7 @@ function getOpenOnGitProviderQuickInputButton(integrationId: string): QuickInput
15961596 case GitSelfManagedHostIntegrationId . CloudGitHubEnterprise :
15971597 return OpenOnGitHubQuickInputButton ;
15981598 case GitCloudHostIntegrationId . AzureDevOps :
1599+ case GitSelfManagedHostIntegrationId . AzureDevOpsServer :
15991600 return OpenOnAzureDevOpsQuickInputButton ;
16001601 case GitCloudHostIntegrationId . Bitbucket :
16011602 case GitSelfManagedHostIntegrationId . BitbucketServer :
@@ -1622,6 +1623,8 @@ function getIntegrationTitle(integrationId: string): string {
16221623 return 'GitHub' ;
16231624 case GitCloudHostIntegrationId . AzureDevOps :
16241625 return 'Azure DevOps' ;
1626+ case GitSelfManagedHostIntegrationId . AzureDevOpsServer :
1627+ return 'Azure DevOps Server' ;
16251628 case GitCloudHostIntegrationId . Bitbucket :
16261629 return 'Bitbucket' ;
16271630 case GitSelfManagedHostIntegrationId . BitbucketServer :
Original file line number Diff line number Diff line change @@ -136,6 +136,7 @@ export const supportedLaunchpadIntegrations: (GitCloudHostIntegrationId | CloudG
136136 GitCloudHostIntegrationId . GitLab ,
137137 GitSelfManagedHostIntegrationId . CloudGitLabSelfHosted ,
138138 GitCloudHostIntegrationId . AzureDevOps ,
139+ GitSelfManagedHostIntegrationId . AzureDevOpsServer ,
139140 GitCloudHostIntegrationId . Bitbucket ,
140141 GitSelfManagedHostIntegrationId . BitbucketServer ,
141142] ;
Original file line number Diff line number Diff line change @@ -153,6 +153,7 @@ export function toGraphHostingServiceType(id: string): GraphHostingServiceType |
153153 case 'azureDevops' satisfies Unbrand < GkProviderId > :
154154 case 'azure' :
155155 case GitCloudHostIntegrationId . AzureDevOps :
156+ case GitSelfManagedHostIntegrationId . AzureDevOpsServer :
156157 return 'azureDevops' ;
157158
158159 case 'bitbucket' satisfies RemoteProviderId :
You can’t perform that action at this time.
0 commit comments