Updates PR and Issue models to support project/org/repo id

Author: axosoft-ramint

src/git/models/issue.ts

@@ -65,13 +65,15 @@ export interface IssueProject {
 	id: string;
 	name: string;
 	resourceId: string;
+	resourceName: string;
 }
 
 export interface IssueRepository {
 	owner: string;
 	repo: string;
 	accessLevel?: RepositoryAccessLevel;
 	url?: string;
+	id?: string;
 }
 
 export interface SearchedIssue {

src/git/models/pullRequest.ts

@@ -2,7 +2,7 @@
 import { Container } from '../../container';
 import { formatDate, fromNow } from '../../system/date';
 import { memoize } from '../../system/decorators/-webview/memoize';
-import type { IssueRepository } from './issue';
+import type { IssueProject, IssueRepository } from './issue';
 import type { IssueOrPullRequest, IssueOrPullRequestState as PullRequestState } from './issueOrPullRequest';
 import type { ProviderReference } from './remoteProvider';
 import type { RepositoryIdentityDescriptor } from './repositoryIdentities';
@@ -24,6 +24,7 @@ export interface PullRequestShape extends IssueOrPullRequest {
 	readonly reviewDecision?: PullRequestReviewDecision;
 	readonly reviewRequests?: PullRequestReviewer[];
 	readonly assignees?: PullRequestMember[];
+	readonly project?: IssueProject;
 }
 
 export class PullRequest implements PullRequestShape {
@@ -55,6 +56,7 @@ export class PullRequest implements PullRequestShape {
 		public readonly latestReviews?: PullRequestReviewer[],
 		public readonly assignees?: PullRequestMember[],
 		public readonly statusCheckRollupState?: PullRequestStatusCheckRollupState,
+		public readonly project?: IssueProject,
 	) {}
 
 	get closed(): boolean {

src/git/utils/issue.utils.ts

@@ -58,6 +58,7 @@ export function serializeIssue(value: IssueShape): IssueShape {
 						id: value.project.id,
 						name: value.project.name,
 						resourceId: value.project.resourceId,
+						resourceName: value.project.resourceName,
 				  },
 		assignees: value.assignees.map(assignee => ({
 			id: assignee.id,

src/git/utils/pullRequest.utils.ts

@@ -137,6 +137,14 @@ export function serializePullRequest(value: PullRequest): PullRequestShape {
 		reviewDecision: value.reviewDecision,
 		reviewRequests: value.reviewRequests,
 		assignees: value.assignees,
+		project: value.project
+			? {
+					id: value.project.id,
+					name: value.project.name,
+					resourceId: value.project.resourceId,
+					resourceName: value.project.resourceName,
+			  }
+			: undefined,
 	};
 	return serialized;
 }

src/plus/integrations/providers/models.ts

@@ -35,7 +35,7 @@ import { GitProviderUtils } from '@gitkraken/provider-apis/provider-utils';
 import type { CloudSelfHostedIntegrationId, IntegrationId } from '../../../constants.integrations';
 import { HostingIntegrationId, IssueIntegrationId, SelfHostedIntegrationId } from '../../../constants.integrations';
 import type { Account as UserAccount } from '../../../git/models/author';
-import type { IssueMember, SearchedIssue } from '../../../git/models/issue';
+import type { IssueMember, IssueProject, SearchedIssue } from '../../../git/models/issue';
 import { RepositoryAccessLevel } from '../../../git/models/issue';
 import type {
 	PullRequestMember,
@@ -622,6 +622,7 @@ export function toSearchedIssue(
 				id: issue.project?.id ?? '',
 				name: issue.project?.name ?? '',
 				resourceId: issue.project?.resourceId ?? '',
+				resourceName: issue.project?.namespace ?? '',
 			},
 			repository:
 				issue.repository?.owner?.login != null
@@ -885,7 +886,11 @@ export function toProviderPullRequest(pr: PullRequest): ProviderPullRequest {
 	};
 }
 
-export function fromProviderPullRequest(pr: ProviderPullRequest, integration: Integration): PullRequest {
+export function fromProviderPullRequest(
+	pr: ProviderPullRequest,
+	integration: Integration,
+	options?: { project?: IssueProject },
+): PullRequest {
 	return new PullRequest(
 		integration,
 		fromProviderAccount(pr.author),
@@ -898,6 +903,7 @@ export function fromProviderPullRequest(pr: ProviderPullRequest, integration: In
 			repo: pr.repository.name,
 			// This has to be here until we can take this information from ProviderPullRequest:
 			accessLevel: RepositoryAccessLevel.Write,
+			id: pr.repository.id,
 		},
 		fromProviderPullRequestState(pr.state),
 		pr.createdDate,
@@ -941,6 +947,7 @@ export function fromProviderPullRequest(pr: ProviderPullRequest, integration: In
 		pr.headCommit?.buildStatuses?.[0]?.state
 			? fromProviderBuildStatusState[pr.headCommit.buildStatuses[0].state]
 			: undefined,
+		options?.project,
 	);
 }