Adds GitHub Enterprise support to Start Work

Author: axosoft-ramint

src/plus/integrations/integrationService.ts

@@ -643,12 +643,16 @@ export class IntegrationService implements Disposable {
 		args: { 0: integrationIds => (integrationIds?.length ? integrationIds.join(',') : '<undefined>'), 1: false },
 	})
 	async getMyIssues(
-		integrationIds?: (SupportedHostingIntegrationIds | SupportedIssueIntegrationIds)[],
+		integrationIds?: (
+			| SupportedHostingIntegrationIds
+			| SupportedIssueIntegrationIds
+			| SupportedSelfHostedIntegrationIds
+		)[],
 		options?: { openRepositoriesOnly?: boolean; cancellation?: CancellationToken },
 	): Promise<SearchedIssue[] | undefined> {
 		const integrations: Map<Integration, ResourceDescriptor[] | undefined> = new Map();
 		const hostingIntegrationIds = integrationIds?.filter(
-			id => id in HostingIntegrationId,
+			id => id in HostingIntegrationId || id in SelfHostedIntegrationId,
 		) as SupportedHostingIntegrationIds[];
 		const openRemotesByIntegrationId = new Map<IntegrationId, ResourceDescriptor[]>();
 		for (const repository of this.container.git.openRepositories) {
@@ -659,7 +663,7 @@ export class IntegrationService implements Disposable {
 				if (remoteIntegration == null) continue;
 				for (const integrationId of hostingIntegrationIds?.length
 					? hostingIntegrationIds
-					: Object.values(HostingIntegrationId)) {
+					: [...Object.values(HostingIntegrationId), ...Object.values(SelfHostedIntegrationId)]) {
 					if (
 						remoteIntegration.id === integrationId &&
 						remote.provider?.owner != null &&
@@ -681,12 +685,16 @@ export class IntegrationService implements Disposable {
 		}
 		for (const integrationId of integrationIds?.length
 			? integrationIds
-			: [...Object.values(HostingIntegrationId), ...Object.values(IssueIntegrationId)]) {
+			: [
+					...Object.values(HostingIntegrationId),
+					...Object.values(IssueIntegrationId),
+					...Object.values(SelfHostedIntegrationId),
+			  ]) {
 			const integration = await this.get(integrationId);
 			if (
 				integration == null ||
 				(options?.openRepositoriesOnly &&
-					isHostingIntegrationId(integrationId) &&
+					(isHostingIntegrationId(integrationId) || isSelfHostedIntegrationId(integrationId)) &&
 					!openRemotesByIntegrationId.has(integrationId))
 			) {
 				continue;
@@ -695,7 +703,7 @@ export class IntegrationService implements Disposable {
 			integrations.set(
 				integration,
 				options?.openRepositoriesOnly &&
-					isHostingIntegrationId(integrationId) &&
+					(isHostingIntegrationId(integrationId) || isSelfHostedIntegrationId(integrationId)) &&
 					openRemotesByIntegrationId.has(integrationId)
 					? openRemotesByIntegrationId.get(integrationId)
 					: undefined,

src/plus/integrations/providers/models.ts

@@ -915,5 +915,6 @@ export type GitConfigEntityIdentifier = AnyEntityIdentifierInput & {
 		id: string;
 		owner: { key: string; name: string; id: string | undefined; owner: string | undefined };
 		createdDate: string;
+		isCloudEnterprise?: boolean;
 	};
 };

src/plus/integrations/providers/utils.ts

@@ -70,13 +70,15 @@ export function getEntityIdentifierInput(entity: IssueOrPullRequest | LaunchpadI
 }
 
 export function getProviderIdFromEntityIdentifier(
-	entityIdentifier: EntityIdentifier | AnyEntityIdentifierInput,
+	entityIdentifier: EntityIdentifier | AnyEntityIdentifierInput | GitConfigEntityIdentifier,
 ): IntegrationId | undefined {
 	switch (entityIdentifier.provider) {
 		case EntityIdentifierProviderType.Github:
 			return HostingIntegrationId.GitHub;
 		case EntityIdentifierProviderType.GithubEnterprise:
-			return SelfHostedIntegrationId.GitHubEnterprise;
+			return isGitConfigEntityIdentifier(entityIdentifier) && entityIdentifier.metadata.isCloudEnterprise
+				? SelfHostedIntegrationId.CloudGitHubEnterprise
+				: SelfHostedIntegrationId.GitHubEnterprise;
 		case EntityIdentifierProviderType.Gitlab:
 			return HostingIntegrationId.GitLab;
 		case EntityIdentifierProviderType.GitlabSelfHosted:
@@ -127,6 +129,7 @@ export function encodeIssueOrPullRequestForGitConfig(
 			id: entity.id,
 			owner: encodedOwner,
 			createdDate: new Date().toISOString(),
+			isCloudEnterprise: entity.provider.id === SelfHostedIntegrationId.CloudGitHubEnterprise,
 		},
 	};
 }
@@ -194,7 +197,8 @@ export async function getIssueFromGitConfigEntityIdentifier(
 	if (
 		identifier.provider !== EntityIdentifierProviderType.Jira &&
 		identifier.provider !== EntityIdentifierProviderType.Github &&
-		identifier.provider !== EntityIdentifierProviderType.Gitlab
+		identifier.provider !== EntityIdentifierProviderType.Gitlab &&
+		identifier.provider !== EntityIdentifierProviderType.GithubEnterprise
 	) {
 		return undefined;
 	}

src/plus/startWork/startWork.ts

@@ -27,7 +27,7 @@ import { getSteps } from '../../commands/quickWizard.utils';
 import { proBadge } from '../../constants';
 import { GlCommand } from '../../constants.commands';
 import type { IntegrationId } from '../../constants.integrations';
-import { HostingIntegrationId, IssueIntegrationId } from '../../constants.integrations';
+import { HostingIntegrationId, IssueIntegrationId, SelfHostedIntegrationId } from '../../constants.integrations';
 import type { Source, Sources, StartWorkTelemetryContext, TelemetryEvents } from '../../constants.telemetry';
 import type { Container } from '../../container';
 import { addAssociatedIssueToBranch } from '../../git/models/branch.utils';
@@ -91,6 +91,7 @@ export interface StartWorkOverrides {
 
 export const supportedStartWorkIntegrations = [
 	HostingIntegrationId.GitHub,
+	SelfHostedIntegrationId.CloudGitHubEnterprise,
 	HostingIntegrationId.GitLab,
 	IssueIntegrationId.Jira,
 ];
@@ -707,6 +708,7 @@ function buildItemTelemetryData(item: StartWorkItem) {
 function getOpenOnWebQuickInputButton(integrationId: string): QuickInputButton | undefined {
 	switch (integrationId) {
 		case HostingIntegrationId.GitHub:
+		case SelfHostedIntegrationId.CloudGitHubEnterprise:
 			return OpenOnGitHubQuickInputButton;
 		case HostingIntegrationId.GitLab:
 			return OpenOnGitLabQuickInputButton;