diff --git a/src/views/projects/Cob/Revision.svelte b/src/views/projects/Cob/Revision.svelte index 6b70f6391..de1fced09 100644 --- a/src/views/projects/Cob/Revision.svelte +++ b/src/views/projects/Cob/Revision.svelte @@ -4,6 +4,7 @@ DiffResponse, Embed, PatchState, + Revision, Verdict, } from "@httpd-client"; import type { Timeline } from "@app/views/projects/Patch.svelte"; @@ -11,6 +12,7 @@ import * as utils from "@app/lib/utils"; import { HttpdClient } from "@httpd-client"; import { onMount } from "svelte"; + import { parseEmbedIntoMap } from "@app/lib/file"; import CobCommitTeaser from "@app/views/projects/Cob/CobCommitTeaser.svelte"; import CommentComponent from "@app/components/Comment.svelte"; @@ -39,6 +41,7 @@ export let projectId: string; export let revisionBase: string; export let revisionId: string; + export let revisionEdits: Revision["edits"]; export let revisionOid: string; export let revisionTimestamp: number; export let revisionAuthor: { id: string; alias?: string | undefined }; @@ -62,6 +65,7 @@ | undefined; const api = new HttpdClient(baseUrl); + const latestEdit = revisionEdits.pop(); function formatVerdict(verdict?: Verdict | null) { switch (verdict) { @@ -399,9 +403,11 @@ - {#if editRevision && revisionState !== "read"} + {#if editRevision && latestEdit && revisionState !== "read"} {@const editRevision_ = editRevision}
- {#if session && patchState !== "read"} - {@const latestEdit = patch.revisions[0].edits.pop()} + {#if session && patchState !== "read" && latestEdit} (patchState = "read")} + on:close={() => { + patchState = "read"; + void refreshPatch(); + }} on:submit={async ({ detail: { comment, embeds } }) => { patchState = "submit"; if (session) { try { - await editPatch(session.id, patch.title); - await editRevision( - session.id, - patch.id, - comment, - Array.from(embeds.values()), - ); + await Promise.all([ + editPatch(session.id, patch.title), + editRevision( + session.id, + patch.id, + comment, + Array.from(embeds.values()), + ), + ]); } finally { patchState = "read"; } diff --git a/tests/support/heartwood-version b/tests/support/heartwood-version index 30f866e04..88d91e2d0 100644 --- a/tests/support/heartwood-version +++ b/tests/support/heartwood-version @@ -1 +1 @@ -59f506dbb5591d3fe68e638038495730c455d72a +6bc7d297a5e7e3feecec3f61327a9adbdf532f61 \ No newline at end of file