TypeScript
fix(forgejo): dismissed reviews no longer read as requested changes or approvals (#29567)
Alex Southwellc3cfb5e1e3d7
diff --git a/packages/source-control-forgejo/src/server/forgejoPullRequestJson.test.ts b/packages/source-control-forgejo/src/server/forgejoPullRequestJson.test.tsindex 1499fbbb6dd..4a5299ec47a 100644--- a/packages/source-control-forgejo/src/server/forgejoPullRequestJson.test.ts+++ b/packages/source-control-forgejo/src/server/forgejoPullRequestJson.test.ts@@ -1,9 +1,15 @@import { assert, describe, it } from "@effect/vitest";import * as Schema from "effect/Schema";-import { ForgejoComment, forgejoComment } from "./forgejoPullRequestJson.ts";+import {+ ForgejoComment,+ ForgejoReview,+ forgejoComment,+ forgejoReview,+} from "./forgejoPullRequestJson.ts";const decodeForgejoComment = Schema.decodeSync(ForgejoComment);+const decodeForgejoReview = Schema.decodeSync(ForgejoReview);describe("forgejoComment", () => {const createdAt = "2026-10-10T19:52:40Z";@@ -34,3 +40,24 @@ describe("forgejoComment", () => {assert.strictEqual(mapped.editedAt, "2026-10-10T20:04:50.000Z");});});++describe("forgejoReview", () => {+ it.each([+ ["REQUEST_CHANGES", false, "CHANGES_REQUESTED"],+ ["REQUEST_CHANGES", true, "DISMISSED"],+ ["APPROVED", true, "DISMISSED"],+ ])("reads %s with dismissed %s as %s", (state, dismissed, reviewState) => {+ const mapped = forgejoReview(+ decodeForgejoReview({+ id: 8,+ body: "",+ user: { login: "maria" },+ state,+ dismissed,+ submitted_at: "2026-10-10T19:52:40Z",+ comments_count: 0,+ }),+ );+ assert.strictEqual(mapped.reviewState, reviewState);+ });+});diff --git a/packages/source-control-forgejo/src/server/forgejoPullRequestJson.ts b/packages/source-control-forgejo/src/server/forgejoPullRequestJson.tsindex 2d9c381eb14..7a7daeac64f 100644--- a/packages/source-control-forgejo/src/server/forgejoPullRequestJson.ts+++ b/packages/source-control-forgejo/src/server/forgejoPullRequestJson.ts@@ -77,6 +77,7 @@ export const ForgejoReview = Schema.Struct({body: Schema.String,user: Schema.NullOr(ForgejoUser),state: Schema.String,+ dismissed: Schema.optional(Schema.Boolean),submitted_at: Schema.String,html_url: Schema.optional(Schema.String),comments_count: Schema.Int,@@ -173,11 +174,13 @@ export function forgejoReview(review: typeof ForgejoReview.Type): PullRequestComurl: review.html_url || null,path: null,reviewState:- review.state === "REQUEST_CHANGES"- ? "CHANGES_REQUESTED"- : review.state === "COMMENT"- ? "COMMENTED"- : review.state,+ review.dismissed === true+ ? "DISMISSED"+ : review.state === "REQUEST_CHANGES"+ ? "CHANGES_REQUESTED"+ : review.state === "COMMENT"+ ? "COMMENTED"+ : review.state,};}