Skip to content

Commit caf2206

Browse files
committed
Makes UI to request Auzure autolinks properly
(#3977, #3996)
1 parent 21a6359 commit caf2206

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

src/autolinks/autolinks.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import type { ConfigurationChangeEvent } from 'vscode';
22
import { Disposable } from 'vscode';
33
import { GlyphChars } from '../constants';
4-
import type { IntegrationId } from '../constants.integrations';
54
import { IssueIntegrationId } from '../constants.integrations';
65
import type { Container } from '../container';
76
import type { GitRemote } from '../git/models/remote';
87
import { getIssueOrPullRequestHtmlIcon, getIssueOrPullRequestMarkdownIcon } from '../git/utils/-webview/icons';
98
import type { HostingIntegration, IssueIntegration } from '../plus/integrations/integration';
9+
import { remoteProviderIdToIntegrationId } from '../plus/integrations/integrationService';
1010
import { configuration } from '../system/-webview/configuration';
1111
import { fromNow } from '../system/date';
1212
import { debug } from '../system/decorators/log';
@@ -214,9 +214,9 @@ export class Autolinks implements Disposable {
214214

215215
const enrichedAutolinks = new Map<string, EnrichedAutolink>();
216216
for (const [id, link] of messageOrAutolinks) {
217-
let linkIntegration = link.provider
218-
? await this.container.integrations.get(link.provider.id as IntegrationId)
219-
: undefined;
217+
const integrationId = link.provider ? remoteProviderIdToIntegrationId(link.provider.id) : undefined;
218+
let linkIntegration =
219+
integrationId != null ? await this.container.integrations.get(integrationId) : undefined;
220220
if (linkIntegration != null) {
221221
const connected = linkIntegration.maybeConnected ?? (await linkIntegration.isConnected());
222222
if (!connected || !(await linkIntegration.access())) {
@@ -226,7 +226,7 @@ export class Autolinks implements Disposable {
226226
const issueOrPullRequestPromise =
227227
remote?.provider != null &&
228228
integration != null &&
229-
link.provider?.id === integration.id &&
229+
integrationId === integration.id &&
230230
link.provider?.domain === integration.domain
231231
? integration.getIssueOrPullRequest(
232232
link.descriptor ?? remote.provider.repoDesc,

src/plus/integrations/integrationService.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,13 +1029,8 @@ export class IntegrationService implements Disposable {
10291029
}
10301030
}
10311031

1032-
export function remoteProviderIdToIntegrationId(
1033-
remoteProviderId: RemoteProviderId,
1034-
): SupportedCloudIntegrationIds | undefined {
1032+
export function remoteProviderIdToIntegrationId(remoteProviderId: unknown): SupportedCloudIntegrationIds | undefined {
10351033
switch (remoteProviderId) {
1036-
// TODO: Uncomment when we support these integrations
1037-
// case 'bitbucket':
1038-
// return HostingIntegrationId.Bitbucket;
10391034
case 'azure-devops':
10401035
return HostingIntegrationId.AzureDevOps;
10411036
case 'github':

0 commit comments

Comments
 (0)