gitkraken · sergeibbb · Feb 26, 2025 · Feb 25, 2025
diff --git a/src/git/models/issue.ts b/src/git/models/issue.ts
@@ -76,11 +76,6 @@ export interface IssueRepository {
 	id?: string;
 }
 
-export interface SearchedIssue {
-	issue: IssueShape;
-	reasons: string[];
-}
-
 export type IssueRepositoryIdentityDescriptor = RequireSomeWithProps<
 	RequireSome<RepositoryIdentityDescriptor<string>, 'provider'>,
 	'provider',

diff --git a/src/git/models/pullRequest.ts b/src/git/models/pullRequest.ts
@@ -185,8 +185,3 @@ export type PullRequestRepositoryIdentityDescriptor = RequireSomeWithProps<
 	'id' | 'domain' | 'repoDomain' | 'repoName'
 > &
 	RequireSomeWithProps<RequireSome<RepositoryIdentityDescriptor<string>, 'remote'>, 'remote', 'domain'>;
-
-export interface SearchedPullRequest {
-	pullRequest: PullRequest;
-	reasons: string[];
-}
diff --git a/src/plus/integrations/integration.ts b/src/plus/integrations/integration.ts
@@ -14,14 +14,9 @@ import { AuthenticationError, CancellationError, RequestClientError } from '../.
 import type { PagedResult } from '../../git/gitProvider';
 import type { Account, UnidentifiedAuthor } from '../../git/models/author';
 import type { DefaultBranch } from '../../git/models/defaultBranch';
-import type { Issue, SearchedIssue } from '../../git/models/issue';
+import type { Issue, IssueShape } from '../../git/models/issue';
 import type { IssueOrPullRequest } from '../../git/models/issueOrPullRequest';
-import type {
-	PullRequest,
-	PullRequestMergeMethod,
-	PullRequestState,
-	SearchedPullRequest,
-} from '../../git/models/pullRequest';
+import type { PullRequest, PullRequestMergeMethod, PullRequestState } from '../../git/models/pullRequest';
 import type { RepositoryMetadata } from '../../git/models/repositoryMetadata';
 import type { PullRequestUrlIdentity } from '../../git/utils/pullRequest.utils';
 import { showIntegrationDisconnectedTooManyFailedRequestsWarningMessage } from '../../messages';
@@ -418,16 +413,16 @@ export abstract class IntegrationBase<
 	async searchMyIssues(
 		resource?: ResourceDescriptor,
 		cancellation?: CancellationToken,
-	): Promise<SearchedIssue[] | undefined>;
+	): Promise<IssueShape[] | undefined>;
 	async searchMyIssues(
 		resources?: ResourceDescriptor[],
 		cancellation?: CancellationToken,
-	): Promise<SearchedIssue[] | undefined>;
+	): Promise<IssueShape[] | undefined>;
 	@debug()
 	async searchMyIssues(
 		resources?: ResourceDescriptor | ResourceDescriptor[],
 		cancellation?: CancellationToken,
-	): Promise<SearchedIssue[] | undefined> {
+	): Promise<IssueShape[] | undefined> {
 		const scope = getLogScope();
 		const connected = this.maybeConnected ?? (await this.isConnected());
 		if (!connected) return undefined;
@@ -441,15 +436,15 @@ export abstract class IntegrationBase<
 			this.resetRequestExceptionCount();
 			return issues;
 		} catch (ex) {
-			return this.handleProviderException<SearchedIssue[] | undefined>(ex, scope, undefined);
+			return this.handleProviderException<IssueShape[] | undefined>(ex, scope, undefined);
 		}
 	}
 
 	protected abstract searchProviderMyIssues(
 		session: ProviderAuthenticationSession,
 		resources?: ResourceDescriptor[],
 		cancellation?: CancellationToken,
-	): Promise<SearchedIssue[] | undefined>;
+	): Promise<IssueShape[] | undefined>;
 
 	@debug()
 	async getIssueOrPullRequest(
@@ -660,7 +655,7 @@ export abstract class IssueIntegration<
 	async getIssuesForProject(
 		project: T,
 		options?: { user?: string; filters?: IssueFilter[] },
-	): Promise<SearchedIssue[] | undefined> {
+	): Promise<IssueShape[] | undefined> {
 		const connected = this.maybeConnected ?? (await this.isConnected());
 		if (!connected) return undefined;
 
@@ -669,15 +664,15 @@ export abstract class IssueIntegration<
 			this.resetRequestExceptionCount();
 			return issues;
 		} catch (ex) {
-			return this.handleProviderException<SearchedIssue[] | undefined>(ex, undefined, undefined);
+			return this.handleProviderException<IssueShape[] | undefined>(ex, undefined, undefined);
 		}
 	}
 
 	protected abstract getProviderIssuesForProject(
 		session: ProviderAuthenticationSession,
 		project: T,
 		options?: { user?: string; filters?: IssueFilter[] },
-	): Promise<SearchedIssue[] | undefined>;
+	): Promise<IssueShape[] | undefined>;
 }
 
 export abstract class HostingIntegration<
@@ -1293,18 +1288,18 @@ export abstract class HostingIntegration<
 		repo?: T,
 		cancellation?: CancellationToken,
 		silent?: boolean,
-	): Promise<IntegrationResult<SearchedPullRequest[] | undefined>>;
+	): Promise<IntegrationResult<PullRequest[] | undefined>>;
 	async searchMyPullRequests(
 		repos?: T[],
 		cancellation?: CancellationToken,
 		silent?: boolean,
-	): Promise<IntegrationResult<SearchedPullRequest[] | undefined>>;
+	): Promise<IntegrationResult<PullRequest[] | undefined>>;
 	@debug()
 	async searchMyPullRequests(
 		repos?: T | T[],
 		cancellation?: CancellationToken,
 		silent?: boolean,
-	): Promise<IntegrationResult<SearchedPullRequest[] | undefined>> {
+	): Promise<IntegrationResult<PullRequest[] | undefined>> {
 		const scope = getLogScope();
 		const connected = this.maybeConnected ?? (await this.isConnected());
 		if (!connected) return undefined;
@@ -1329,7 +1324,7 @@ export abstract class HostingIntegration<
 		repos?: T[],
 		cancellation?: CancellationToken,
 		silent?: boolean,
-	): Promise<SearchedPullRequest[] | undefined>;
+	): Promise<PullRequest[] | undefined>;
 
 	async searchPullRequests(
 		searchQuery: string,

diff --git a/src/plus/integrations/integrationService.ts b/src/plus/integrations/integrationService.ts
@@ -11,8 +11,8 @@ import type { Source } from '../../constants.telemetry';
 import { sourceToContext } from '../../constants.telemetry';
 import type { Container } from '../../container';
 import type { Account } from '../../git/models/author';
-import type { SearchedIssue } from '../../git/models/issue';
-import type { SearchedPullRequest } from '../../git/models/pullRequest';
+import type { IssueShape } from '../../git/models/issue';
+import type { PullRequest } from '../../git/models/pullRequest';
 import type { GitRemote } from '../../git/models/remote';
 import type { RemoteProvider, RemoteProviderId } from '../../git/remotes/remoteProvider';
 import { configuration } from '../../system/-webview/configuration';
@@ -726,7 +726,7 @@ export class IntegrationService implements Disposable {
 			| SupportedSelfHostedIntegrationIds
 		)[],
 		options?: { openRepositoriesOnly?: boolean; cancellation?: CancellationToken },
-	): Promise<SearchedIssue[] | undefined> {
+	): Promise<IssueShape[] | undefined> {
 		const integrations: Map<Integration, ResourceDescriptor[] | undefined> = new Map();
 		const hostingIntegrationIds = integrationIds?.filter(
 			id => id in HostingIntegrationId || id in SelfHostedIntegrationId,
@@ -796,8 +796,8 @@ export class IntegrationService implements Disposable {
 	private async getMyIssuesCore(
 		integrations: Map<Integration, ResourceDescriptor[] | undefined>,
 		cancellation?: CancellationToken,
-	): Promise<SearchedIssue[] | undefined> {
-		const promises: Promise<SearchedIssue[] | undefined>[] = [];
+	): Promise<IssueShape[] | undefined> {
+		const promises: Promise<IssueShape[] | undefined>[] = [];
 		for (const [integration, repos] of integrations) {
 			if (integration == null) continue;
 
@@ -808,12 +808,12 @@ export class IntegrationService implements Disposable {
 		return [...flatten(filterMap(results, r => (r.status === 'fulfilled' ? r.value : undefined)))];
 	}
 
-	async getMyIssuesForRemotes(remote: GitRemote): Promise<SearchedIssue[] | undefined>;
-	async getMyIssuesForRemotes(remotes: GitRemote[]): Promise<SearchedIssue[] | undefined>;
+	async getMyIssuesForRemotes(remote: GitRemote): Promise<IssueShape[] | undefined>;
+	async getMyIssuesForRemotes(remotes: GitRemote[]): Promise<IssueShape[] | undefined>;
 	@debug<IntegrationService['getMyIssuesForRemotes']>({
 		args: { 0: (r: GitRemote | GitRemote[]) => (Array.isArray(r) ? r.map(rp => rp.name) : r.name) },
 	})
-	async getMyIssuesForRemotes(remoteOrRemotes: GitRemote | GitRemote[]): Promise<SearchedIssue[] | undefined> {
+	async getMyIssuesForRemotes(remoteOrRemotes: GitRemote | GitRemote[]): Promise<IssueShape[] | undefined> {
 		if (!Array.isArray(remoteOrRemotes)) {
 			remoteOrRemotes = [remoteOrRemotes];
 		}
@@ -874,7 +874,7 @@ export class IntegrationService implements Disposable {
 		integrationIds?: (HostingIntegrationId | CloudSelfHostedIntegrationId)[],
 		cancellation?: CancellationToken,
 		silent?: boolean,
-	): Promise<IntegrationResult<SearchedPullRequest[] | undefined>> {
+	): Promise<IntegrationResult<PullRequest[] | undefined>> {
 		const integrations: Map<HostingIntegration, ResourceDescriptor[] | undefined> = new Map();
 		for (const integrationId of integrationIds?.length ? integrationIds : Object.values(HostingIntegrationId)) {
 			let integration;
@@ -894,10 +894,10 @@ export class IntegrationService implements Disposable {
 		integrations: Map<HostingIntegration, ResourceDescriptor[] | undefined>,
 		cancellation?: CancellationToken,
 		silent?: boolean,
-	): Promise<IntegrationResult<SearchedPullRequest[] | undefined>> {
+	): Promise<IntegrationResult<PullRequest[] | undefined>> {
 		const start = Date.now();
 
-		const promises: Promise<IntegrationResult<SearchedPullRequest[] | undefined>>[] = [];
+		const promises: Promise<IntegrationResult<PullRequest[] | undefined>>[] = [];
 		for (const [integration, repos] of integrations) {
 			if (integration == null) continue;
 
@@ -932,16 +932,14 @@ export class IntegrationService implements Disposable {
 		};
 	}
 
-	async getMyPullRequestsForRemotes(remote: GitRemote): Promise<IntegrationResult<SearchedPullRequest[] | undefined>>;
-	async getMyPullRequestsForRemotes(
-		remotes: GitRemote[],
-	): Promise<IntegrationResult<SearchedPullRequest[] | undefined>>;
+	async getMyPullRequestsForRemotes(remote: GitRemote): Promise<IntegrationResult<PullRequest[] | undefined>>;
+	async getMyPullRequestsForRemotes(remotes: GitRemote[]): Promise<IntegrationResult<PullRequest[] | undefined>>;
 	@debug<IntegrationService['getMyPullRequestsForRemotes']>({
 		args: { 0: (r: GitRemote | GitRemote[]) => (Array.isArray(r) ? r.map(rp => rp.name) : r.name) },
 	})
 	async getMyPullRequestsForRemotes(
 		remoteOrRemotes: GitRemote | GitRemote[],
-	): Promise<IntegrationResult<SearchedPullRequest[] | undefined>> {
+	): Promise<IntegrationResult<PullRequest[] | undefined>> {
 		if (!Array.isArray(remoteOrRemotes)) {
 			remoteOrRemotes = [remoteOrRemotes];
 		}

diff --git a/src/plus/integrations/providers/azureDevOps.ts b/src/plus/integrations/providers/azureDevOps.ts
@@ -3,14 +3,9 @@ import { window } from 'vscode';
 import { HostingIntegrationId } from '../../../constants.integrations';
 import type { Account } from '../../../git/models/author';
 import type { DefaultBranch } from '../../../git/models/defaultBranch';
-import type { Issue, SearchedIssue } from '../../../git/models/issue';
+import type { Issue, IssueShape } from '../../../git/models/issue';
 import type { IssueOrPullRequest } from '../../../git/models/issueOrPullRequest';
-import type {
-	PullRequest,
-	PullRequestMergeMethod,
-	PullRequestState,
-	SearchedPullRequest,
-} from '../../../git/models/pullRequest';
+import type { PullRequest, PullRequestMergeMethod, PullRequestState } from '../../../git/models/pullRequest';
 import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata';
 import { getSettledValue } from '../../../system/promise';
 import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthenticationProvider';
@@ -316,7 +311,7 @@ export class AzureDevOpsIntegration extends HostingIntegration<
 	protected override async searchProviderMyPullRequests(
 		session: AuthenticationSession,
 		repos?: AzureRepositoryDescriptor[],
-	): Promise<SearchedPullRequest[] | undefined> {
+	): Promise<PullRequest[] | undefined> {
 		const api = await this.getProvidersApi();
 		if (repos != null) {
 			// TODO: implement repos version
@@ -351,17 +346,15 @@ export class AzureDevOpsIntegration extends HostingIntegration<
 				authorLogin: user.username,
 			})
 		)?.map(pr => this.fromAzureProviderPullRequest(pr, repoDescriptors, projects));
-		const prsById = new Map<string, SearchedPullRequest>();
+		const prsById = new Map<string, PullRequest>();
 		for (const pr of authoredPrs ?? []) {
-			prsById.set(pr.id, { pullRequest: pr, reasons: ['authored'] });
+			prsById.set(pr.id, pr);
 		}
 
 		for (const pr of assignedPrs ?? []) {
 			const existing = prsById.get(pr.id);
-			if (existing != null) {
-				existing.reasons.push('assigned');
-			} else {
-				prsById.set(pr.id, { pullRequest: pr, reasons: ['assigned'] });
+			if (existing == null) {
+				prsById.set(pr.id, pr);
 			}
 		}
 
@@ -371,7 +364,7 @@ export class AzureDevOpsIntegration extends HostingIntegration<
 	protected override async searchProviderMyIssues(
 		session: AuthenticationSession,
 		_repos?: AzureRepositoryDescriptor[],
-	): Promise<SearchedIssue[] | undefined> {
+	): Promise<IssueShape[] | undefined> {
 		const api = await this.getProvidersApi();
 
 		const user = await this.getProviderCurrentAccount(session);
@@ -410,18 +403,16 @@ export class AzureDevOpsIntegration extends HostingIntegration<
 			)
 		).flat();
 		// TODO: Add mentioned issues
-		const issuesById = new Map<string, SearchedIssue>();
+		const issuesById = new Map<string, IssueShape>();
 
 		for (const issue of authoredIssues ?? []) {
-			issuesById.set(issue.id, { issue: issue, reasons: ['authored'] });
+			issuesById.set(issue.id, issue);
 		}
 
 		for (const issue of assignedIssues ?? []) {
 			const existing = issuesById.get(issue.id);
-			if (existing != null) {
-				existing.reasons.push('assigned');
-			} else {
-				issuesById.set(issue.id, { issue: issue, reasons: ['assigned'] });
+			if (existing == null) {
+				issuesById.set(issue.id, issue);
 			}
 		}
 

diff --git a/src/plus/integrations/providers/bitbucket.ts b/src/plus/integrations/providers/bitbucket.ts
@@ -2,14 +2,9 @@ import type { AuthenticationSession, CancellationToken } from 'vscode';
 import { HostingIntegrationId } from '../../../constants.integrations';
 import type { Account } from '../../../git/models/author';
 import type { DefaultBranch } from '../../../git/models/defaultBranch';
-import type { Issue, SearchedIssue } from '../../../git/models/issue';
+import type { Issue, IssueShape } from '../../../git/models/issue';
 import type { IssueOrPullRequest } from '../../../git/models/issueOrPullRequest';
-import type {
-	PullRequest,
-	PullRequestMergeMethod,
-	PullRequestState,
-	SearchedPullRequest,
-} from '../../../git/models/pullRequest';
+import type { PullRequest, PullRequestMergeMethod, PullRequestState } from '../../../git/models/pullRequest';
 import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata';
 import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthenticationProvider';
 import type { ResourceDescriptor } from '../integration';
@@ -126,14 +121,14 @@ export class BitbucketIntegration extends HostingIntegration<
 	protected override async searchProviderMyPullRequests(
 		_session: AuthenticationSession,
 		_repos?: BitbucketRepositoryDescriptor[],
-	): Promise<SearchedPullRequest[] | undefined> {
+	): Promise<PullRequest[] | undefined> {
 		return Promise.resolve(undefined);
 	}
 
 	protected override async searchProviderMyIssues(
 		_session: AuthenticationSession,
 		_repos?: BitbucketRepositoryDescriptor[],
-	): Promise<SearchedIssue[] | undefined> {
+	): Promise<IssueShape[] | undefined> {
 		return Promise.resolve(undefined);
 	}
 }

diff --git a/src/plus/integrations/providers/github.ts b/src/plus/integrations/providers/github.ts
@@ -4,14 +4,9 @@ import type { Sources } from '../../../constants.telemetry';
 import type { Container } from '../../../container';
 import type { Account, UnidentifiedAuthor } from '../../../git/models/author';
 import type { DefaultBranch } from '../../../git/models/defaultBranch';
-import type { Issue, SearchedIssue } from '../../../git/models/issue';
+import type { Issue, IssueShape } from '../../../git/models/issue';
 import type { IssueOrPullRequest } from '../../../git/models/issueOrPullRequest';
-import type {
-	PullRequest,
-	PullRequestMergeMethod,
-	PullRequestState,
-	SearchedPullRequest,
-} from '../../../git/models/pullRequest';
+import type { PullRequest, PullRequestMergeMethod, PullRequestState } from '../../../git/models/pullRequest';
 import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata';
 import type { PullRequestUrlIdentity } from '../../../git/utils/pullRequest.utils';
 import { log } from '../../../system/decorators/log';
@@ -190,7 +185,7 @@ abstract class GitHubIntegrationBase<ID extends SupportedIntegrationIds> extends
 		repos?: GitHubRepositoryDescriptor[],
 		cancellation?: CancellationToken,
 		silent?: boolean,
-	): Promise<SearchedPullRequest[] | undefined> {
+	): Promise<PullRequest[] | undefined> {
 		return (await this.container.github)?.searchMyPullRequests(
 			this,
 			accessToken,
@@ -207,7 +202,7 @@ abstract class GitHubIntegrationBase<ID extends SupportedIntegrationIds> extends
 		{ accessToken }: AuthenticationSession,
 		repos?: GitHubRepositoryDescriptor[],
 		cancellation?: CancellationToken,
-	): Promise<SearchedIssue[] | undefined> {
+	): Promise<IssueShape[] | undefined> {
 		return (await this.container.github)?.searchMyIssues(
 			this,
 			accessToken,