Adds id to remote providers

gitkraken · Jan 19, 2021 · 0c84102 · 0c84102
1 parent fd7c156
commit 0c84102
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 3 deletions.
diff --git a/src/git/formatters/commitFormatter.ts b/src/git/formatters/commitFormatter.ts
@@ -307,7 +307,7 @@ export class CommitFormatter extends Formatter<GitCommit, CommitFormatOptions> {
 				commands += `[$(git-pull-request) PR #${pr.id}](${getMarkdownActionCommand('openPullRequest', {
 					pullRequest: {
 						id: pr.id,
-						provider: { name: pr.provider.name, domain: pr.provider.domain },
+						provider: { id: pr.provider.id, name: pr.provider.name, domain: pr.provider.domain },
 						repoPath: this._item.repoPath,
 						url: pr.url,
 					},
@@ -473,7 +473,7 @@ export class CommitFormatter extends Formatter<GitCommit, CommitFormatOptions> {
 				text = `[PR #${pr.id}](${getMarkdownActionCommand('openPullRequest', {
 					pullRequest: {
 						id: pr.id,
-						provider: { name: pr.provider.name, domain: pr.provider.domain },
+						provider: { id: pr.provider.id, name: pr.provider.name, domain: pr.provider.domain },
 						repoPath: this._item.repoPath,
 						url: pr.url,
 					},

diff --git a/src/git/models/remoteProvider.ts b/src/git/models/remoteProvider.ts
@@ -1,6 +1,7 @@
 'use strict';
 
 export interface RemoteProviderReference {
+	readonly id: string;
 	readonly name: string;
 	readonly domain: string;
 }
diff --git a/src/git/remotes/azure-devops.ts b/src/git/remotes/azure-devops.ts
@@ -62,6 +62,10 @@ export class AzureDevOpsRemote extends RemoteProvider {
 		return 'vsts';
 	}
 
+	get id() {
+		return 'azure-devops';
+	}
+
 	get name() {
 		return 'Azure DevOps';
 	}

diff --git a/src/git/remotes/bitbucket-server.ts b/src/git/remotes/bitbucket-server.ts
@@ -44,6 +44,10 @@ export class BitbucketServerRemote extends RemoteProvider {
 		return 'bitbucket';
 	}
 
+	get id() {
+		return 'bitbucket-server';
+	}
+
 	get name() {
 		return this.formatName('Bitbucket Server');
 	}

diff --git a/src/git/remotes/bitbucket.ts b/src/git/remotes/bitbucket.ts
@@ -37,6 +37,10 @@ export class BitbucketRemote extends RemoteProvider {
 		return 'bitbucket';
 	}
 
+	get id() {
+		return 'bitbucket';
+	}
+
 	get name() {
 		return this.formatName('Bitbucket');
 	}

diff --git a/src/git/remotes/github.ts b/src/git/remotes/github.ts
@@ -57,6 +57,10 @@ export class GitHubRemote extends RichRemoteProvider {
 		return 'github';
 	}
 
+	get id() {
+		return 'github';
+	}
+
 	get name() {
 		return this.formatName('GitHub');
 	}

diff --git a/src/git/remotes/gitlab.ts b/src/git/remotes/gitlab.ts
@@ -32,6 +32,10 @@ export class GitLabRemote extends RemoteProvider {
 		return 'gitlab';
 	}
 
+	get id() {
+		return 'gitlab';
+	}
+
 	get name() {
 		return this.formatName('GitLab');
 	}

diff --git a/src/git/remotes/provider.ts b/src/git/remotes/provider.ts
@@ -121,6 +121,7 @@ export abstract class RemoteProvider implements RemoteProviderReference {
 		return 'remote';
 	}
 
+	abstract get id(): string;
 	abstract get name(): string;
 
 	async copy(resource: RemoteResource): Promise<void> {

diff --git a/src/webviews/webviewBase.ts b/src/webviews/webviewBase.ts
@@ -223,7 +223,7 @@ export abstract class WebviewBase implements Disposable {
 							let pr: PullRequest | undefined;
 							if (includePullRequest) {
 								pr = new PullRequest(
-									{ name: 'GitHub', domain: 'github.com' },
+									{ id: 'github', name: 'GitHub', domain: 'github.com' },
 									{
 										name: 'Eric Amodio',
 										avatarUrl: 'https://avatars1.githubusercontent.com/u/641685?s=32&v=4',