From bd4e14107e8f65fcf545adbd0867920310ac47b4 Mon Sep 17 00:00:00 2001 From: Daniel Rose Date: Wed, 12 Jun 2019 13:31:32 +0200 Subject: [PATCH] fix: Fix error due to Typescript 3.5.1 encodeURIComponent() does not handle undefined. To be precise, it actually does and returns undefined, but normally that is an error, so the Typescript definition wants sensible input values, i.e. string | number | boolean. --- src/services/MergeRequests.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/services/MergeRequests.ts b/src/services/MergeRequests.ts index f6fa3d20..d574f1a4 100644 --- a/src/services/MergeRequests.ts +++ b/src/services/MergeRequests.ts @@ -87,11 +87,12 @@ class MergeRequests extends BaseService { projectId: ProjectId, { mergerequestIId, ...options }: { mergerequestIId?: MergeRequestId } & BaseRequestOptions, ) { - const [pId, mIId] = [projectId, mergerequestIId].map(encodeURIComponent); + const pId = encodeURIComponent(projectId); let url; if (mergerequestIId) { + const mIId = encodeURIComponent(mergerequestIId); url = `projects/${pId}/merge_requests/${mIId}/approvals`; } else { url = `projects/${pId}/approvals`; @@ -106,11 +107,12 @@ class MergeRequests extends BaseService { approverGroupIds: GroupId[], { mergerequestIId, ...options }: { mergerequestIId?: MergeRequestId } & BaseRequestOptions, ) { - const [pId, mIId] = [projectId, mergerequestIId].map(encodeURIComponent); + const pId = encodeURIComponent(projectId); let url; if (mergerequestIId) { + const mIId = encodeURIComponent(mergerequestIId); url = `projects/${pId}/merge_requests/${mIId}/approvers`; } else { url = `projects/${pId}/approvers`; @@ -179,11 +181,12 @@ class MergeRequests extends BaseService { projectId: ProjectId, { mergerequestIId, ...options }: { mergerequestIId?: MergeRequestId } & BaseRequestOptions, ) { - const [pId, mIId] = [projectId, mergerequestIId].map(encodeURIComponent); + const pId = encodeURIComponent(projectId); let url; if (mergerequestIId) { + const mIId = encodeURIComponent(mergerequestIId); url = `projects/${pId}/merge_requests/${mIId}/approvals`; } else { url = `projects/${pId}/approvals`;