Skip to content

Commit 0ce3c6b

Browse files
committed
Fixes API result transformation
(#3788, #3795)
1 parent fc4ff15 commit 0ce3c6b

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/plus/integrations/providers/gitlab/gitlab.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ import { fromGitLabMergeRequest, fromGitLabMergeRequestREST, fromGitLabMergeRequ
4747
const gitlabUserIdPrefix = 'gid://gitlab/User/';
4848
const gitlabMergeRequestIdPrefix = 'gid://gitlab/MergeRequest/';
4949

50-
function buildGitLabUserId(id: string | undefined): string | undefined {
51-
return id?.startsWith(gitlabUserIdPrefix) ? id.substring(gitlabUserIdPrefix.length) : id;
50+
function buildGitLabUserId(id: string | number | undefined): string | undefined {
51+
return typeof id === 'string' && id?.startsWith(gitlabUserIdPrefix)
52+
? id.substring(gitlabUserIdPrefix.length)
53+
: String(id);
5254
}
5355

5456
export class GitLabApi implements Disposable {

src/plus/integrations/providers/gitlab/models.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export interface GitLabMergeRequestFull extends GitLabMergeRequest {
8080
headSha: string;
8181
} | null;
8282
project: GitLabRepositoryStub;
83-
sourceProject: GitLabRepositoryStub;
83+
sourceProject: GitLabRepositoryStub | null;
8484
}
8585

8686
export type GitLabMergeRequestState = 'opened' | 'closed' | 'locked' | 'merged';
@@ -213,6 +213,9 @@ export function fromGitLabMergeRequest(pr: GitLabMergeRequestFull, provider: Pro
213213
}
214214

215215
function fromGitLabMergeRequestRefs(pr: GitLabMergeRequestFull): PullRequestRefs | undefined {
216+
if (pr.sourceProject == null) {
217+
return undefined;
218+
}
216219
return {
217220
base: {
218221
owner: getRepoNamespace(pr.sourceProject.fullPath),

0 commit comments

Comments
 (0)