radicle/radicle-explorer
1
0
Fork 0
mirror of https://seed.radicle.dev/rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git synced 2026-11-15 19:30:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compare to revisionBase instead of projectHead

Browse Source 
- Makes diff stat badge clickable and navigates users to previous
  revision or revision base.
    - If base has changed between revisions uses latest patch base
This commit is contained in:
Sebastian Martinez
2024-03-18 15:50:48 +01:00
committed by Rūdolfs Ošiņš
parent 7bb1c74fb2
commit cee200e629
5 changed files with 74 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/DiffStatBadge.svelte
+6
View File
@@ -14,6 +14,12 @@
border-radius: var(--border-radius-round);
overflow: hidden;
}
.badge:hover .positive {
background-color: var(--color-fill-diff-green);
}
.badge:hover .negative {
background-color: var(--color-fill-diff-red);
}
.positive {
display: flex;
padding: 0 6px;
src/views/projects/Cob/Revision.svelte
+44 -53
View File
@@ -40,8 +40,6 @@
export let rawPath: (commit?: string) => string;
export let patchId: string;
export let patchState: PatchState;
export let projectHead: string;
export let projectDefaultBranch: string;
export let projectId: string;
export let revisionBase: string;
export let revisionId: string;
@@ -52,6 +50,7 @@
export let revisionAuthor: { id: string; alias?: string | undefined };
export let revisionDescription: string;
export let timelines: Timeline[];
export let previousRevBase: string | undefined = undefined;
export let previousRevId: string | undefined = undefined;
export let previousRevOid: string | undefined = undefined;
export let first: boolean;
@@ -126,14 +125,15 @@
let loading: boolean = false;
let revisionState: State = "read";
$: fromCommit =
previousRevBase !== revisionBase
? revisionBase
: previousRevBase ?? revisionBase;
onMount(async () => {
try {
loading = true;
response = await api.project.getDiff(
projectId,
revisionBase,
revisionOid,
);
response = await api.project.getDiff(projectId, fromCommit, revisionOid);
} catch (err: any) {
error = err;
} finally {
@@ -292,48 +292,19 @@
<Loading small />
{/if}
{#if response?.diff.stats}
{@const { insertions, deletions } = response.diff.stats}
<DiffStatBadge {insertions} {deletions} />
{/if}
{#if previousRevOid}
<Link
title="Compare {utils.formatObjectId(
previousRevOid,
)}..{utils.formatObjectId(revisionOid)}"
title="Compare {utils.formatCommit(
fromCommit,
)}..{utils.formatCommit(revisionOid)}"
route={{
resource: "project.patch",
project: projectId,
node: baseUrl,
patch: patchId,
view: {
name: "diff",
fromCommit: previousRevOid,
toCommit: revisionOid,
},
view: { name: "diff", fromCommit, toCommit: revisionOid },
}}>
<IconButton>
<IconSmall name="diff" />
</IconButton>
</Link>
{:else}
<Link
title="Compare {utils.formatObjectId(
projectHead,
)}..{utils.formatObjectId(revisionOid)}"
route={{
resource: "project.patch",
project: projectId,
node: baseUrl,
patch: patchId,
view: {
name: "diff",
fromCommit: projectHead,
toCommit: revisionOid,
},
}}>
<IconButton>
<IconSmall name="diff" />
</IconButton>
{@const { insertions, deletions } = response.diff.stats}
<DiffStatBadge {insertions} {deletions} />
</Link>
{/if}
<Popover
@@ -351,12 +322,16 @@
<DropdownList
slot="popover"
items={previousRevOid && previousRevId
? [projectHead, previousRevOid]
: [projectHead]}>
? [revisionBase, previousRevOid]
: [revisionBase]}>
{@const baseMismatch = previousRevBase !== revisionBase}
<Link
let:item
disabled={item !== revisionBase && baseMismatch}
slot="item"
title="{item}..{revisionOid}"
title="Compare {utils.formatCommit(item)}..{utils.formatCommit(
revisionOid,
)}"
route={{
resource: "project.patch",
project: projectId,
@@ -368,20 +343,27 @@
toCommit: revisionOid,
},
}}>
{#if item === projectHead}
{#if item === revisionBase}
<DropdownListItem selected={false}>
<span class="compare-dropdown-item">
Compare to {projectDefaultBranch}:
Compare to base:
<span
style:color="var(--color-fill-secondary)"
style:font-weight="var(--font-weight-bold)"
style:font-family="var(--font-family-monospace)">
{utils.formatObjectId(projectHead)}
{utils.formatObjectId(revisionBase)}
</span>
</span>
</DropdownListItem>
{:else if previousRevId}
<DropdownListItem selected={false}>
<DropdownListItem
selected={false}
disabled={baseMismatch}
title={baseMismatch
? "Previous revision has different base"
: `${utils.formatCommit(item)}..${utils.formatCommit(
revisionOid,
)}`}>
<span class="compare-dropdown-item">
Compare to previous revision: <span
style:color="var(--color-fill-secondary)"
@@ -411,12 +393,21 @@
</NodeId>
{#if patchId === revisionId}
opened this patch
opened this patch on base
<span class="global-oid">
{utils.formatObjectId(revisionBase)}
</span>
{:else}
updated to
<span class="global-oid">
{utils.formatObjectId(revisionId)}
</span>
{#if previousRevBase && previousRevBase !== revisionBase}
with base
<span class="global-oid">
{utils.formatObjectId(revisionBase)}
</span>
{/if}
{/if}
<span title={utils.absoluteTimestamp(revisionTimestamp)}>
{utils.formatTimestamp(revisionTimestamp)}
@@ -464,7 +455,7 @@
{:else if revisionDescription && !first}
<div class="revision-description txt-small">
<Markdown
rawPath={rawPath(projectHead)}
rawPath={rawPath(revisionBase)}
content={revisionDescription} />
</div>
{/if}
@@ -528,7 +519,7 @@
<Thread
enableAttachments
thread={element.inner}
rawPath={rawPath(projectHead)}
rawPath={rawPath(revisionBase)}
canEditComment={canEdit}
{editComment}
{createReply}
@@ -570,7 +561,7 @@
class:positive-review={review.verdict === "accept"}
class:negative-review={review.verdict === "reject"}>
<CommentComponent
rawPath={rawPath(projectHead)}
rawPath={rawPath(revisionBase)}
authorId={author}
authorAlias={review.author.alias}
timestamp={review.timestamp}
src/views/projects/Patch.svelte
+1 -2
View File
@@ -975,8 +975,6 @@
{rawPath}
projectId={project.id}
{timelines}
projectDefaultBranch={project.defaultBranch}
projectHead={project.head}
{...revision}
first={index === 0}
canEdit={partial(
@@ -1003,6 +1001,7 @@
patchState={patch.state}
initiallyExpanded={index === patch.revisions.length - 1}
previousRevId={previousRevision?.id}
previousRevBase={previousRevision?.base}
previousRevOid={previousRevision?.oid}>
{#if index === patch.revisions.length - 1}
{#if $experimental && session && view.name === "activity"}
src/views/projects/Patch/PatchTeaser.svelte
+20 -3
View File
@@ -7,6 +7,7 @@
absoluteTimestamp,
formatObjectId,
formatTimestamp,
formatCommit,
} from "@app/lib/utils";
import Badge from "@app/components/Badge.svelte";
@@ -182,9 +183,25 @@
{#await diffPromise}
<Loading small />
{:then { diff }}
<DiffStatBadge
insertions={diff.stats.insertions}
deletions={diff.stats.deletions} />
<Link
title="Compare {formatCommit(latestRevision.base)}..{formatCommit(
latestRevision.oid,
)}"
route={{
resource: "project.patch",
project: projectId,
node: baseUrl,
patch: patch.id,
view: {
name: "diff",
fromCommit: latestRevision.base,
toCommit: latestRevision.oid,
},
}}>
<DiffStatBadge
insertions={diff.stats.insertions}
deletions={diff.stats.deletions} />
</Link>
{/await}
</div>
</div>
tests/e2e/project/patch.spec.ts
+3 -18
View File
@@ -69,7 +69,7 @@ test("navigate through revision diffs", async ({ page }) => {
.first()
.click();
await secondRevision
.getByRole("link", { name: "Compare to main: 38c225e" })
.getByRole("link", { name: "Compare to base: 38c225e" })
.click();
await expect(
page.getByRole("button", { name: "Compare 38c225..9e4fea" }),
@@ -95,25 +95,10 @@ test("navigate through revision diffs", async ({ page }) => {
/patches\/[a-f0-9]{40}\?diff=88b7fd90389c1a629f91ed7bf838d4b947426622\.\.9e4feab1b2123dfa5f22bd0e4656060ec9296638$/,
);
await page.goBack();
await secondRevision
.getByRole("link", { name: "Compare 88b7fd9..9e4feab" })
.getByRole("button")
.click();
await expect(
page.getByRole("link", { name: "Compare 88b7fd..9e4fea" }),
).toBeVisible();
await page.goBack();
}
// First revision
// First revision and DiffStatBadge shortcut.
{
await firstRevision
.getByRole("button", { name: "toggle-context-menu" })
.first()
.click();
await firstRevision
.getByRole("link", { name: "Compare to main: 38c225e" })
.click();
await firstRevision.getByTitle("Compare 38c225e..88b7fd9").click();
await expect(
page.getByRole("button", { name: "Compare 38c225..88b7fd" }),
).toBeVisible();