Generates create GitLab PR URLs and retrieves repoId for cross-forks

(#4142, #4143)

Author: sergeibbb

src/git/remotes/gitlab.ts

@@ -6,6 +6,9 @@ import type {
 	MaybeEnrichedAutolink,
 } from '../../autolinks/models/autolinks';
 import { GlyphChars } from '../../constants';
+import type { Container } from '../../container';
+import { HostingIntegration } from '../../plus/integrations/integration';
+import { remoteProviderIdToIntegrationId } from '../../plus/integrations/integrationService';
 import type { GitLabRepositoryDescriptor } from '../../plus/integrations/providers/gitlab';
 import type { Brand, Unbrand } from '../../system/brand';
 import { fromNow } from '../../system/date';
@@ -30,7 +33,14 @@ function isGitLabDotCom(domain: string): boolean {
 }
 
 export class GitLabRemote extends RemoteProvider<GitLabRepositoryDescriptor> {
-	constructor(domain: string, path: string, protocol?: string, name?: string, custom: boolean = false) {
+	constructor(
+		private readonly container: Container,
+		domain: string,
+		path: string,
+		protocol?: string,
+		name?: string,
+		custom: boolean = false,
+	) {
 		super(domain, path, protocol, name, custom);
 	}
 
@@ -372,8 +382,51 @@ export class GitLabRemote extends RemoteProvider<GitLabRepositoryDescriptor> {
 		return this.encodeUrl(`${this.baseUrl}/-/commit/${sha}`);
 	}
 
-	protected override getUrlForComparison(base: string, compare: string, notation: '..' | '...'): string {
-		return this.encodeUrl(`${this.baseUrl}/-/compare/${base}${notation}${compare}`);
+	protected override getUrlForComparison(base: string, head: string, notation: '..' | '...'): string {
+		return this.encodeUrl(`${this.baseUrl}/-/compare/${base}${notation}${head}`);
+	}
+
+	override async isReadyForForCrossForkPullRequestUrls(): Promise<boolean> {
+		const integrationId = remoteProviderIdToIntegrationId(this.id);
+		const integration = integrationId && (await this.container.integrations.get(integrationId));
+		return integration?.maybeConnected ?? integration?.isConnected() ?? false;
+	}
+
+	protected override async getUrlForCreatePullRequest(
+		base: { branch?: string; remote: { path: string; url: string } },
+		head: { branch: string; remote: { path: string; url: string } },
+		options?: { title?: string; description?: string },
+	): Promise<string | undefined> {
+		const query = new URLSearchParams({
+			utf8: '✓',
+			'merge_request[source_branch]': head.branch,
+			'merge_request[target_branch]': base.branch ?? '',
+		});
+		if (base.remote.url !== head.remote.url) {
+			const targetDesc = {
+				owner: base.remote.path.split('/')[0],
+				name: base.remote.path.split('/')[1],
+			};
+			const integrationId = remoteProviderIdToIntegrationId(this.id);
+			const integration = integrationId && (await this.container.integrations.get(integrationId));
+			let targetRepoId = undefined;
+			if (integration?.isConnected && integration instanceof HostingIntegration) {
+				targetRepoId = (await integration.getRepoInfo?.(targetDesc))?.id;
+			}
+			if (!targetRepoId) {
+				return undefined;
+			}
+			query.set('merge_request[target_project_id]', targetRepoId);
+			// 'merge_request["source_project_id"]': this.path, // ?? seems we don't need it
+		}
+		if (options?.title) {
+			query.set('merge_request[title]', options.title);
+		}
+		if (options?.description) {
+			query.set('merge_request[description]', options.description);
+		}
+
+		return `${this.encodeUrl(`${this.getRepoBaseUrl(head.remote.path)}/-/merge_requests/new`)}?${query.toString()}`;
 	}
 
 	protected getUrlForFile(fileName: string, branch?: string, sha?: string, range?: Range): string {

src/git/remotes/remoteProviders.ts

@@ -37,7 +37,7 @@ const builtInProviders: RemoteProviders = [
 	{
 		custom: false,
 		matcher: 'gitlab.com',
-		creator: (_container: Container, domain: string, path: string) => new GitLabRemote(domain, path),
+		creator: (container: Container, domain: string, path: string) => new GitLabRemote(container, domain, path),
 	},
 	{
 		custom: false,
@@ -52,7 +52,7 @@ const builtInProviders: RemoteProviders = [
 	{
 		custom: false,
 		matcher: /\bgitlab\b/i,
-		creator: (_container: Container, domain: string, path: string) => new GitLabRemote(domain, path),
+		creator: (container: Container, domain: string, path: string) => new GitLabRemote(container, domain, path),
 	},
 	{
 		custom: false,
@@ -77,13 +77,16 @@ const builtInProviders: RemoteProviders = [
 	},
 ];
 
-const cloudRemotesMap: Record<
+const cloudProviderCreatorsMap: Record<
 	CloudSelfHostedIntegrationId,
-	typeof GitHubRemote | typeof GitLabRemote | typeof BitbucketServerRemote
+	(container: Container, domain: string, path: string) => RemoteProvider
 > = {
-	[SelfHostedIntegrationId.CloudGitHubEnterprise]: GitHubRemote,
-	[SelfHostedIntegrationId.CloudGitLabSelfHosted]: GitLabRemote,
-	[SelfHostedIntegrationId.BitbucketServer]: BitbucketServerRemote,
+	[SelfHostedIntegrationId.CloudGitHubEnterprise]: (_container: Container, domain: string, path: string) =>
+		new GitHubRemote(domain, path),
+	[SelfHostedIntegrationId.CloudGitLabSelfHosted]: (container: Container, domain: string, path: string) =>
+		new GitLabRemote(container, domain, path),
+	[SelfHostedIntegrationId.BitbucketServer]: (_container: Container, domain: string, path: string) =>
+		new BitbucketServerRemote(domain, path),
 };
 
 export function loadRemoteProviders(
@@ -118,12 +121,10 @@ export function loadRemoteProviders(
 			const integrationId = ci.integrationId;
 			if (isCloudSelfHostedIntegrationId(integrationId) && ci.domain) {
 				const matcher = ci.domain.toLocaleLowerCase();
-				const providerCreator = (_container: Container, domain: string, path: string): RemoteProvider =>
-					new cloudRemotesMap[integrationId](domain, path);
 				const provider = {
 					custom: false,
 					matcher: matcher,
-					creator: providerCreator,
+					creator: cloudProviderCreatorsMap[integrationId],
 				};
 
 				const indexOfCustomDuplication: number = providers.findIndex(p => p.matcher === matcher);
@@ -169,8 +170,8 @@ function getCustomProviderCreator(cfg: RemotesConfig) {
 			return (_container: Container, domain: string, path: string) =>
 				new GitHubRemote(domain, path, cfg.protocol, cfg.name, true);
 		case 'GitLab':
-			return (_container: Container, domain: string, path: string) =>
-				new GitLabRemote(domain, path, cfg.protocol, cfg.name, true);
+			return (container: Container, domain: string, path: string) =>
+				new GitLabRemote(container, domain, path, cfg.protocol, cfg.name, true);
 		default:
 			return undefined;
 	}

src/plus/integrations/providers/gitlab.ts

@@ -19,6 +19,7 @@ import type { RepositoryDescriptor } from '../integration';
 import { HostingIntegration } from '../integration';
 import { getGitLabPullRequestIdentityFromMaybeUrl } from './gitlab/gitlab.utils';
 import { fromGitLabMergeRequestProvidersApi } from './gitlab/models';
+import type { ProviderRepository } from './models';
 import { ProviderPullRequestReviewState, providersMetadata, toIssueShape } from './models';
 import type { ProvidersApi } from './providersApi';
 
@@ -190,6 +191,13 @@ abstract class GitLabIntegrationBase<
 		);
 	}
 
+	public override async getRepoInfo(repo: { owner: string; name: string }): Promise<ProviderRepository | undefined> {
+		const api = await this.getProvidersApi();
+		return api.getRepo(this.id, repo.owner, repo.name, undefined, {
+			accessToken: this._session?.accessToken,
+		});
+	}
+
 	protected override async getProviderRepositoryMetadata(
 		{ accessToken }: AuthenticationSession,
 		repo: GitLabRepositoryDescriptor,

src/plus/integrations/providers/providersApi.ts

@@ -133,6 +133,7 @@ export class ProvidersApi {
 			[HostingIntegrationId.GitLab]: {
 				...providersMetadata[HostingIntegrationId.GitLab],
 				provider: providerApis.gitlab,
+				getRepoFn: providerApis.gitlab.getRepo.bind(providerApis.gitlab),
 				getCurrentUserFn: providerApis.gitlab.getCurrentUser.bind(providerApis.gitlab) as GetCurrentUserFn,
 				getPullRequestsForReposFn: providerApis.gitlab.getPullRequestsForRepos.bind(
 					providerApis.gitlab,