From c76c8e7ab8edf85e42193cff379c420ad81fae83 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Mon, 15 Jan 2024 09:41:19 +0100 Subject: [PATCH] Change actions to who what when --- src/components/Comment.svelte | 8 +++--- src/views/projects/Cob/CobCommitTeaser.svelte | 10 ++++--- src/views/projects/Cob/CobHeader.svelte | 11 -------- src/views/projects/Cob/Revision.svelte | 26 ++++++++++--------- .../projects/Commit/CommitAuthorship.svelte | 13 +++++++--- src/views/projects/Issue.svelte | 12 +++++---- src/views/projects/Issue/IssueTeaser.svelte | 7 +++-- src/views/projects/Patch.svelte | 12 +++++---- src/views/projects/Patch/PatchTeaser.svelte | 13 +++++++--- tests/e2e/project/commit.spec.ts | 2 +- tests/e2e/project/commits.spec.ts | 4 +-- 11 files changed, 67 insertions(+), 51 deletions(-) diff --git a/src/components/Comment.svelte b/src/components/Comment.svelte index 7f5a03b24..42f1394b7 100644 --- a/src/components/Comment.svelte +++ b/src/components/Comment.svelte @@ -123,7 +123,10 @@ - {caption} + {caption} + {#if lastEdit} {/if} - diff --git a/src/views/projects/Cob/CobCommitTeaser.svelte b/src/views/projects/Cob/CobCommitTeaser.svelte index 679d126b9..db75d2fd5 100644 --- a/src/views/projects/Cob/CobCommitTeaser.svelte +++ b/src/views/projects/Cob/CobCommitTeaser.svelte @@ -39,7 +39,6 @@ align-items: flex-start; gap: 1rem; margin-left: auto; - color: var(--color-foreground-dim); } .summary:hover { text-decoration: underline; @@ -53,7 +52,6 @@
- {formatCommit(commit.id)}
- + + + {formatCommit(commit.id)} + +
- import * as utils from "@app/lib/utils"; - - export let id: string | undefined = undefined; - - - {#if header.author.email === header.committer.email}
committed - {formatTimestamp(header.committer.time)} + + + {formatTimestamp(header.committer.time)} + {:else}
avatar @@ -53,6 +57,9 @@ {header.committer.name}
committed - {formatTimestamp(header.committer.time)} + + + {formatTimestamp(header.committer.time)} + {/if} diff --git a/src/views/projects/Issue.svelte b/src/views/projects/Issue.svelte index 547aabb3f..9733b5a7c 100644 --- a/src/views/projects/Issue.svelte +++ b/src/views/projects/Issue.svelte @@ -468,7 +468,7 @@
- + {#if issueState !== "read"}
- opened by - {utils.formatTimestamp(issue.discussion[0].timestamp)} + + opened + {utils.formatObjectId(issue.id)} + + {utils.formatTimestamp(issue.discussion[0].timestamp)} + {#if lastDescriptionEdit}
- {formatObjectId(issue.id)} - opened {formatTimestamp(issue.discussion[0].timestamp)} by + opened + {formatObjectId(issue.id)} + + {formatTimestamp(issue.discussion[0].timestamp)} +
diff --git a/src/views/projects/Patch.svelte b/src/views/projects/Patch.svelte index c6f7e8bb1..d88423b34 100644 --- a/src/views/projects/Patch.svelte +++ b/src/views/projects/Patch.svelte @@ -646,7 +646,7 @@
- + {#if patchState !== "read"}
- opened by - {utils.formatTimestamp(patch.revisions[0].timestamp)} + + opened + {utils.formatObjectId(patch.id)} + + {utils.formatTimestamp(patch.revisions[0].timestamp)} +
diff --git a/src/views/projects/Patch/PatchTeaser.svelte b/src/views/projects/Patch/PatchTeaser.svelte index 6a42d3101..51a13eb9f 100644 --- a/src/views/projects/Patch/PatchTeaser.svelte +++ b/src/views/projects/Patch/PatchTeaser.svelte @@ -153,10 +153,17 @@
- {formatObjectId(patch.id)} - {patch.revisions.length > 1 ? "updated" : "opened"} - {formatTimestamp(latestRevision.timestamp)} by + {patch.revisions.length > 1 ? "updated" : "opened"} + {formatObjectId(patch.id)} + {#if patch.revisions.length > 1} + to + {formatObjectId(patch.revisions[patch.revisions.length - 1].id)} + + {/if} + + {formatTimestamp(latestRevision.timestamp)} +
diff --git a/tests/e2e/project/commit.spec.ts b/tests/e2e/project/commit.spec.ts index 2001e7387..99775d2bc 100644 --- a/tests/e2e/project/commit.spec.ts +++ b/tests/e2e/project/commit.spec.ts @@ -30,7 +30,7 @@ test("relative timestamps", async ({ page }) => { }; }); await page.goto(commitUrl); - await expect(page.getByText("Bob Belcher committed now")).toBeVisible(); + await expect(page.getByText("Bob Belcher committed 28f3710")).toBeVisible(); }); test("modified file", async ({ page }) => { diff --git a/tests/e2e/project/commits.spec.ts b/tests/e2e/project/commits.spec.ts index 82cbb85d3..4141b6ed7 100644 --- a/tests/e2e/project/commits.spec.ts +++ b/tests/e2e/project/commits.spec.ts @@ -117,11 +117,11 @@ test("relative timestamps", async ({ page }) => { await page.getByRole("link", { name: "bob" }).click(); await expect(page.getByTitle("Change peer")).toHaveText("bob"); const latestCommit = page.locator(".teaser").first(); - await expect(latestCommit).toContainText("Bob Belcher committed now"); + await expect(latestCommit).toContainText("Bob Belcher committed 28f3710 now"); await expect(latestCommit).toContainText("28f3710"); const earliestCommit = page.locator(".teaser").last(); await expect(earliestCommit).toContainText( - "Alice Liddell committed last month", + "Alice Liddell committed 36d5bbe last month", ); });