@gitkraken/core-gitlens 0.5.116 → 0.6.0

package/src/plus/integrations/providers/azureDevOps.ts

@@ -76,6 +76,17 @@ function getAzureRepositoryIdentity(repo: Pick<AzureRepositoryDescriptor, 'owner
 	};
 }
 
+function getAzureRepositoryApiBaseUrl(baseUrl: string, repo: Pick<AzureRepositoryDescriptor, 'virtualDirectory'>) {
+	if (repo.virtualDirectory == null) return baseUrl;
+
+	const segments = repo.virtualDirectory.split('/');
+	if (segments.some(segment => !segment || segment === '.' || segment === '..')) {
+		throw new Error(`Invalid Azure virtual directory '${repo.virtualDirectory}'.`);
+	}
+
+	return `${baseUrl.replace(/\/+$/, '')}/${segments.map(encodeURIComponent).join('/')}`;
+}
+
 /**
  * Matches an org/project descriptor against a caller-supplied name, mirroring the facade's own
  * key/id/name comparison so `listIssuesPage({ org, project })` narrows on the same identifiers a consumer
@@ -502,7 +513,7 @@ export abstract class AzureDevOpsIntegrationBase<
 			repo.owner,
 			repo.name,
 			rev,
-			this.apiBaseUrl,
+			getAzureRepositoryApiBaseUrl(this.apiBaseUrl, repo),
 			options,
 		);
 	}
@@ -528,7 +539,7 @@ export abstract class AzureDevOpsIntegrationBase<
 			toTokenWithInfo(this.id, session),
 			repo.owner,
 			repo.name,
-			{ baseUrl: this.apiBaseUrl },
+			{ baseUrl: getAzureRepositoryApiBaseUrl(this.apiBaseUrl, repo) },
 			cancellation,
 		);
 	}
@@ -546,7 +557,7 @@ export abstract class AzureDevOpsIntegrationBase<
 			repo.name,
 			id,
 			{
-				baseUrl: this.apiBaseUrl,
+				baseUrl: getAzureRepositoryApiBaseUrl(this.apiBaseUrl, repo),
 				type: type,
 			},
 		);
@@ -596,7 +607,7 @@ export abstract class AzureDevOpsIntegrationBase<
 			repo.name,
 			branch,
 			{
-				baseUrl: this.apiBaseUrl,
+				baseUrl: getAzureRepositoryApiBaseUrl(this.apiBaseUrl, repo),
 			},
 		);
 	}
@@ -612,7 +623,7 @@ export abstract class AzureDevOpsIntegrationBase<
 			repo.owner,
 			repo.name,
 			rev,
-			this.apiBaseUrl,
+			getAzureRepositoryApiBaseUrl(this.apiBaseUrl, repo),
 		);
 	}
 
@@ -620,6 +631,7 @@ export abstract class AzureDevOpsIntegrationBase<
 		owner: string;
 		name: string;
 		project?: string;
+		virtualDirectory?: string;
 		connectionId?: string;
 	}): Promise<ProviderRepository | undefined> {
 		const identity = getAzureRepositoryIdentity(repo);
@@ -631,13 +643,10 @@ export abstract class AzureDevOpsIntegrationBase<
 		if (session == null) return undefined;
 
 		const { tokenWithInfo, options } = this.getApiOptions(session);
-		return api.getRepo(
-			tokenWithInfo,
-			identity.resourceName,
-			identity.repositoryName,
-			identity.projectName,
-			options,
-		);
+		return api.getRepo(tokenWithInfo, identity.resourceName, identity.repositoryName, identity.projectName, {
+			...options,
+			baseUrl: getAzureRepositoryApiBaseUrl(this.apiBaseUrl, repo),
+		});
 	}
 
 	protected override async getProviderRepositoryMetadata(
@@ -650,7 +659,7 @@ export abstract class AzureDevOpsIntegrationBase<
 			toTokenWithInfo(this.id, session),
 			repo.owner,
 			repo.name,
-			{ baseUrl: this.apiBaseUrl },
+			{ baseUrl: getAzureRepositoryApiBaseUrl(this.apiBaseUrl, repo) },
 			cancellation,
 		);
 	}

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

@@ -47,7 +47,7 @@ import { EntityIdentifierUtils } from '@gitkraken/provider-apis/entity-identifie
 import { GitProviderUtils } from '@gitkraken/provider-apis/provider-utils';
 import { githubSearchResultLimit } from '../../git-github/api/config.js';
 import type { Account as UserAccount } from '../../../git/models/author.js';
-import type { IssueProject, IssueShape, IssueStateFilter } from '../../../git/models/issue.js';
+import type { IssueProject, IssueProviderState, IssueShape, IssueStateFilter } from '../../../git/models/issue.js';
 import { Issue, RepositoryAccessLevel } from '../../../git/models/issue.js';
 import type {
 	PullRequestRef,
@@ -1229,6 +1229,20 @@ function toIssueIdentifier(value: string | number): string {
 	return String(value);
 }
 
+function toIssueProviderState(
+	state: ProviderIssue['state'],
+	reliableStateCategory = true,
+): IssueProviderState | undefined {
+	return state == null
+		? undefined
+		: {
+				id: state.id,
+				name: state.name,
+				color: state.color ?? undefined,
+				category: reliableStateCategory ? state.category : undefined,
+			};
+}
+
 export function toIssueShape(
 	issue: ProviderIssue,
 	provider: ProviderReference,
@@ -1242,10 +1256,9 @@ export function toIssueShape(
 
 	// Jira SDK results derive this category from a localized display name and default unknown names to DONE.
 	// Only the direct point read opts in because it maps Jira's stable status-category key itself.
-	const closed =
-		issue.closedDate != null ||
-		(issue.state?.category === 'DONE' &&
-			(provider.id !== IssuesCloudHostIntegrationId.Jira || options?.reliableStateCategory === true));
+	const reliableStateCategory =
+		provider.id !== IssuesCloudHostIntegrationId.Jira || options?.reliableStateCategory === true;
+	const closed = issue.closedDate != null || (issue.state?.category === 'DONE' && reliableStateCategory);
 
 	return {
 		type: 'issue',
@@ -1267,6 +1280,7 @@ export function toIssueShape(
 		closedDate: issue.closedDate ?? undefined,
 		closed: closed,
 		state: closed ? 'closed' : 'opened',
+		providerState: toIssueProviderState(issue.state, reliableStateCategory),
 		author: {
 			id: issue.author?.id ?? '',
 			// An absent name stays absent, matching {@link fromProviderAccount}; see `IssueMember.name`.
@@ -1302,6 +1316,7 @@ export function toIssueShape(
 		commentsCount: issue.commentCount ?? undefined,
 		thumbsUpCount: issue.upvoteCount ?? undefined,
 		body: issue.description ?? undefined,
+		bodyFormat: provider.id === IssuesCloudHostIntegrationId.Jira ? 'jira-wiki' : undefined,
 		issueType: issue.type ?? undefined,
 	};
 }
@@ -1741,6 +1756,8 @@ export function fromProviderIssue(
 				: undefined,
 		identifier,
 		issue.type ?? undefined,
+		toIssueProviderState(issue.state, integration.id !== IssuesCloudHostIntegrationId.Jira),
+		integration.id === IssuesCloudHostIntegrationId.Jira ? 'jira-wiki' : undefined,
 	);
 }
 

package/src/plus/integrations/reads/resolveRepository.ts

@@ -96,6 +96,8 @@ export async function resolveRepository(
 	const name = provider.repoName;
 	if (owner == null || name == null) return result('invalid-remote-url');
 
+	const providerRepo = provider.repoDesc;
+
 	// On a self-managed host, resolve only against a TRUSTED host: the pinned connection's configured
 	// domain, the explicit `domain`, or — when neither was supplied — a configured host matching the
 	// remote's. That last case keeps `remoteUrl` (repository-supplied) out of the trusted path: it selects
@@ -164,6 +166,7 @@ export async function resolveRepository(
 
 	try {
 		const repo = await integration.getRepoInfo({
+			...providerRepo,
 			owner: owner,
 			name: name,
 			project: project,