Skip to content

Commit 442db26

Browse files
committed
fix(gitlab): preserve unknown approval state when edition is hidden
1 parent 3fa2e54 commit 442db26

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

‎packages/source-control-gitlab/src/server/gitLabMergeRequestJson.test.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -623,11 +623,14 @@ describe("decodeRepositoryBlobsJson", () => {
623623
});
624624

625625
describe("decodeReviewDecisionsJson", () => {
626-
const decisionsOf = (enterprise: boolean, nodes: ReadonlyArray<unknown>) =>
626+
const decisionsOf = (enterprise: boolean | null, nodes: ReadonlyArray<unknown>) =>
627627
expectSuccess(
628628
decodeReviewDecisionsJson(
629629
JSON.stringify({
630-
data: { metadata: { enterprise }, project: { mergeRequests: { nodes } } },
630+
data: {
631+
metadata: enterprise === null ? null : { enterprise },
632+
project: { mergeRequests: { nodes } },
633+
},
631634
}),
632635
),
633636
);
@@ -678,6 +681,9 @@ describe("decodeReviewDecisionsJson", () => {
678681

679682
it("leaves out a merge request it cannot key, and a project the reader cannot see", () => {
680683
expect([...decisionsOf(true, [null, { iid: "x", approved: true }])]).toEqual([]);
684+
expect([
685+
...decisionsOf(null, [{ iid: "7", approved: false, approvedBy: approvedBy() }]),
686+
]).toEqual([]);
681687
expect([
682688
...decisionsOf(true, [
683689
{ iid: "7", approved: null, approvedBy: approvedBy("julius") },

‎packages/source-control-gitlab/src/server/gitLabMergeRequestJson.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ export function decodeReviewDecisionsJson(
10041004
if (!Result.isSuccess(decoded)) {
10051005
return Result.fail(decoded.failure);
10061006
}
1007-
const enterprise = decoded.success.data.metadata?.enterprise === true;
1007+
const enterprise = decoded.success.data.metadata?.enterprise;
10081008
const decisions = new Map<number, PullRequestReviewDecision | null>();
10091009
for (const node of decoded.success.data.project?.mergeRequests?.nodes ?? []) {
10101010
const number = Number(node?.iid);
@@ -1016,6 +1016,7 @@ export function decodeReviewDecisionsJson(
10161016
)
10171017
continue;
10181018
const approvals = node.approvedBy.nodes.length;
1019+
if (node.approved === false && approvals === 0 && enterprise == null) continue;
10191020
decisions.set(
10201021
number,
10211022
node.approved === false && (enterprise || approvals > 0)

0 commit comments

Comments
 (0)