artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 15:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

svelte: Show correct byline when commit has author and committer (#62841)

Browse Source 
It was reported that the "byline" isn't correct when a commit has an
author and a committer.

This fixes it.
This commit is contained in:
Felix Kling 2024-05-22 12:53:03 +02:00 committed by GitHub
parent abbe848ff1
commit 88de40c1df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/web-sveltekit/src/lib/Commit.gql
View File

@ -8,6 +8,7 @@ fragment Commit on GitCommit {
date
person {
name
email
...Avatar_Person
}
}

27
client/web-sveltekit/src/lib/Commit.svelte
View File

@ -13,7 +13,7 @@
export let commit: Commit
export let alwaysExpanded: boolean = false
function getCommitter({ committer }: Commit): NonNullable<Commit['committer']>['person'] | null {
function getCommitter({ committer }: Commit): NonNullable<Commit['committer']> | null {
if (!committer) {
return null
}
@ -21,26 +21,27 @@
if (committer.person.name === 'GitHub' && committer.person.email === 'noreply@github.com') {
return null
}
return committer.person
return committer
}
$: commitDate = new Date(commit.committer ? commit.committer.date : commit.author.date)
$: author = commit.author.person
$: committer = getCommitter(commit)
$: authorAvatarTooltip = author.name + (committer ? ' (author)' : '')
$: author = commit.author
$: committer = getCommitter(commit) ?? author
$: committerIsAuthor = committer.person.email === author.person.email
$: commitDate = new Date(committer.date)
$: authorAvatarTooltip = author.person.name + (committer ? ' (author)' : '')
let expanded = alwaysExpanded
</script>
<div class="root">
<div class="avatar">
<Tooltip tooltip={authorAvatarTooltip}>
<Avatar avatar={author} />
<Avatar avatar={author.person} />
</Tooltip>
</div>
{#if committer && committer.name !== author.name}
{#if !committerIsAuthor}
<div class="avatar">
<Tooltip tooltip="{committer.name} (committer)">
<Avatar avatar={committer} />
<Tooltip tooltip="{committer.person.name} (committer)">
<Avatar avatar={committer.person} />
</Tooltip>
</div>
{/if}
@ -53,7 +54,11 @@
</button>
{/if}
</span>
<span>committed by <strong>{author.name}</strong> <Timestamp date={commitDate} /></span>
<span>
{#if !committerIsAuthor}authored by <strong>{author.person.name}</strong> and{/if}
committed by <strong>{committer.person.name}</strong>
<Timestamp date={commitDate} />
</span>
{#if expanded && commit.body}
<pre>{commit.body}</pre>
{/if}