Set gitHostFactory for gitlab self hosted instances

Author: fgLouro

apps/desktop/src/lib/gitHost/gitHostFactory.test.ts

@@ -1,5 +1,6 @@
 import { DefaultGitHostFactory } from './gitHostFactory';
 import { GitHub } from './github/github';
+import { GitLab } from './gitlab/gitlab';
 import { Octokit } from '@octokit/rest';
 import { expect, test, describe } from 'vitest';
 
@@ -17,4 +18,33 @@ describe.concurrent('DefaultgitHostFactory', () => {
 			)
 		).instanceOf(GitHub);
 	});
+
+	test('Create self hosted Gitlab service', async () => {
+		const monitorFactory = new DefaultGitHostFactory(new Octokit());
+		expect(
+			monitorFactory.build(
+				{
+					source: 'domain.com',
+					name: 'test-repo',
+					owner: 'test-owner',
+					resource: 'gitlab.domain.com'
+				},
+				'some-base'
+			)
+		).instanceOf(GitLab);
+	});
+
+	test('Create Gitlab service', async () => {
+		const monitorFactory = new DefaultGitHostFactory(new Octokit());
+		expect(
+			monitorFactory.build(
+				{
+					source: 'gitlab.com',
+					name: 'test-repo',
+					owner: 'test-owner'
+				},
+				'some-base'
+			)
+		).instanceOf(GitLab);
+	});
 });

apps/desktop/src/lib/gitHost/gitHostFactory.ts

@@ -1,7 +1,7 @@
 import { AZURE_DOMAIN, AzureDevOps } from './azure/azure';
 import { BitBucket, BITBUCKET_DOMAIN } from './bitbucket/bitbucket';
 import { GitHub, GITHUB_DOMAIN } from './github/github';
-import { GitLab, GITLAB_DOMAIN } from './gitlab/gitlab';
+import { GitLab, GITLAB_DOMAIN, GITLAB_SUB_DOMAIN } from './gitlab/gitlab';
 import { ProjectMetrics } from '$lib/metrics/projectMetrics';
 import type { Persisted } from '$lib/persisted/persisted';
 import type { RepoInfo } from '$lib/url/gitUrl';
@@ -24,6 +24,7 @@ export class DefaultGitHostFactory implements GitHostFactory {
 		usePullRequestTemplate?: Persisted<boolean>
 	) {
 		const source = repo.source;
+		const resource = repo.resource;
 		const forkStr = fork ? `${fork.owner}:${fork.name}` : undefined;
 
 		if (source.includes(GITHUB_DOMAIN)) {
@@ -36,7 +37,7 @@ export class DefaultGitHostFactory implements GitHostFactory {
 				usePullRequestTemplate
 			});
 		}
-		if (source.includes(GITLAB_DOMAIN)) {
+		if (source.includes(GITLAB_DOMAIN) || resource.includes(GITLAB_SUB_DOMAIN)) {
 			return new GitLab({ repo, baseBranch, forkStr });
 		}
 		if (source.includes(BITBUCKET_DOMAIN)) {

apps/desktop/src/lib/gitHost/gitlab/gitlab.ts

@@ -1,13 +1,14 @@
-import { GitLabBranch } from './gitlabBranch';
 import type { RepoInfo } from '$lib/url/gitUrl';
 import type { GitHost } from '../interface/gitHost';
 import type { DetailedPullRequest, GitHostArguments } from '../interface/types';
+import { GitLabBranch } from './gitlabBranch';
 
 export type PrAction = 'creating_pr';
 export type PrState = { busy: boolean; branchId: string; action?: PrAction };
 export type PrCacheKey = { value: DetailedPullRequest | undefined; fetchedAt: Date };
 
 export const GITLAB_DOMAIN = 'gitlab.com';
+export const GITLAB_SUB_DOMAIN = 'gitlab'; // For self hosted instance of Gitlab
 
 /**
  * PR support is pending OAuth support in the rust code.
@@ -22,7 +23,7 @@ export class GitLab implements GitHost {
 	private forkStr?: string;
 
 	constructor({ repo, baseBranch, forkStr }: GitHostArguments) {
-		this.baseUrl = `https://${GITLAB_DOMAIN}/${repo.owner}/${repo.name}`;
+		this.baseUrl = `https://${repo.resource}/${repo.owner}/${repo.name}`;
 		this.repo = repo;
 		this.baseBranch = baseBranch;
 		this.forkStr = forkStr;

apps/desktop/src/lib/url/gitUrl.ts

@@ -4,20 +4,22 @@ export type RepoInfo = {
 	source: string;
 	name: string;
 	owner: string;
+	resource: string;
 	organization?: string;
 	protocol?: string;
 };
 
 export function parseRemoteUrl(url: string): RepoInfo | undefined {
 	try {
-		const { protocol, source, name, owner, organization } = gitUrlParse(url);
+		const { protocol, source, name, owner, organization, resource } = gitUrlParse(url);
 
 		return {
 			protocol,
 			source,
 			name,
 			owner,
-			organization
+			organization,
+			resource
 		};
 	} catch {
 		return undefined;