From 1471fb17099b62e1e6cf367a7ec3712235ee6321 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Thu, 22 Feb 2024 16:25:31 -0300 Subject: [PATCH] Add edited label to patches --- src/components/Comment.svelte | 7 ++++++- src/lib/utils.ts | 13 +++++++------ src/views/projects/Cob/Revision.svelte | 21 ++++++++++++++++++--- src/views/projects/Issue.svelte | 5 ++++- src/views/projects/Patch.svelte | 21 ++++++++++++++++++--- 5 files changed, 53 insertions(+), 14 deletions(-) diff --git a/src/components/Comment.svelte b/src/components/Comment.svelte index b0d6eebc0..8b01de3e1 100644 --- a/src/components/Comment.svelte +++ b/src/components/Comment.svelte @@ -128,7 +128,12 @@ {#if lastEdit}
•
-
+ {/if} diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 8a8ab704f..0153c5f92 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -1,4 +1,4 @@ -import type { BaseUrl, Comment } from "@httpd-client"; +import type { BaseUrl } from "@httpd-client"; import md5 from "md5"; import bs58 from "bs58"; @@ -85,12 +85,13 @@ export function formatCommit(oid: string): string { return oid.substring(0, 7); } -export function formatEditedCaption(lastEdit: Comment["edits"][0]) { +export function formatEditedCaption( + author: { id: string; alias?: string }, + timestamp: number, +) { return `${ - lastEdit.author.alias - ? lastEdit.author.alias - : formatNodeId(lastEdit.author.id) - } edited ${absoluteTimestamp(lastEdit.timestamp)}`; + author.alias ? author.alias : formatNodeId(author.id) + } edited ${absoluteTimestamp(timestamp)}`; } export function baseUrlToUrl(baseUrl: BaseUrl): URL { diff --git a/src/views/projects/Cob/Revision.svelte b/src/views/projects/Cob/Revision.svelte index c0c01c1ee..25ebe0de7 100644 --- a/src/views/projects/Cob/Revision.svelte +++ b/src/views/projects/Cob/Revision.svelte @@ -78,7 +78,7 @@ let expanded = initiallyExpanded; const api = new HttpdClient(baseUrl); - const latestEdit = revisionEdits.pop(); + const lastEdit = revisionEdits.at(-1); function formatVerdict(verdict?: Verdict | null) { switch (verdict) { @@ -198,6 +198,10 @@ .revision-description { margin-left: 2rem; } + .author-metadata { + color: var(--color-fill-gray); + font-size: var(--font-size-small); + } .compare-dropdown-item { font-weight: var(--font-weight-regular); } @@ -414,6 +418,17 @@ {utils.formatTimestamp(revisionTimestamp)} + {#if lastEdit} + + + {/if}
{#if canEdit(revisionAuthor.id) && editRevision && revisionState === "read"}
- {#if editRevision && latestEdit && revisionState !== "read"} + {#if editRevision && lastEdit && revisionState !== "read"} {@const editRevision_ = editRevision}
+ title={utils.formatEditedCaption( + lastDescriptionEdit.author, + lastDescriptionEdit.timestamp, + )}> edited
{/if} diff --git a/src/views/projects/Patch.svelte b/src/views/projects/Patch.svelte index 4f1812f87..3fe3e4d1c 100644 --- a/src/views/projects/Patch.svelte +++ b/src/views/projects/Patch.svelte @@ -96,7 +96,6 @@ ["Archive patch", { status: "archived" }], ["Convert to draft", { status: "draft" }], ]; - const latestEdit = patch.revisions[0].edits.pop(); async function editPatch(sessionId: string, title: string) { try { @@ -542,6 +541,7 @@ "content", ); $: description = patch.revisions[0].description; + $: lastEdit = patch.revisions[0].edits.at(-1); $: newDescription = description; $: patchReviews = computeReviews(patch); $: selectedItem = patch.state.status === "open" ? items[1] : items[0]; @@ -677,6 +677,10 @@ flex-direction: column; gap: 0.5rem; } + .author-metadata { + color: var(--color-fill-gray); + font-size: var(--font-size-small); + } .review { color: var(--color-fill-gray); display: inline-flex; @@ -764,11 +768,11 @@
- {#if session && patchState !== "read" && latestEdit} + {#if session && patchState !== "read" && lastEdit} patch.title.length > 0} enableAttachments - embeds={parseEmbedIntoMap(latestEdit.embeds)} + embeds={parseEmbedIntoMap(lastEdit.embeds)} rawPath={rawPath(patch.revisions[0].id)} body={newDescription} submitCaption="Save" @@ -836,6 +840,17 @@ {utils.formatTimestamp(patch.revisions[0].timestamp)} + {#if lastEdit} + + + {/if}