Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions src/ui/components/ReviewerIdentity/ReviewerIdentity.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/**
* Copyright 2026 GitProxy Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import React from 'react';
import UserIdentity from '../UserIdentity/UserIdentity';

export interface ReviewerRecord {
username?: string;
displayName?: string | null;
email?: string;
reviewerEmail?: string;
}

interface ReviewerIdentityProps {
reviewer?: ReviewerRecord;
className?: string;
nameClassName?: string;
emailClassName?: string;
emptyClassName?: string;
}

export function reviewerDisplayName(reviewer?: ReviewerRecord): string | undefined {
const displayName = reviewer?.displayName?.trim();
if (displayName) return displayName;
const email = reviewerEmail(reviewer);
if (!email?.includes('@')) return undefined;
const local = email.split('@')[0] ?? '';
if (!local) return undefined;
return local
.split(/[._-]+/u)
.filter(Boolean)
.map((part) => part.charAt(0).toUpperCase() + part.slice(1).toLowerCase())
.join(' ');
}

function reviewerEmail(reviewer?: ReviewerRecord): string | undefined {
return reviewer?.email?.trim() || reviewer?.reviewerEmail?.trim() || undefined;
}

const ReviewerIdentity = ({ reviewer, ...classNames }: ReviewerIdentityProps) => {
const username = reviewer?.username?.trim() || undefined;
const name = reviewerDisplayName(reviewer);
const email = reviewerEmail(reviewer);
const title = name && email ? `${name} <${email}>` : email || name || username;

return (
<UserIdentity username={username} name={name} email={email} title={title} {...classNames} />
);
};

export default ReviewerIdentity;
20 changes: 16 additions & 4 deletions src/ui/components/UserIdentity/UserIdentity.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

import React from 'react';
import { Link } from 'react-router';
import { useDisplayNameQuery } from '../../query/useDisplayNameQuery';
import { useUsernameByEmailQuery } from '../../query/useUsernameByEmailQuery';

export interface UserIdentityProps {
/** GitProxy username — when set, renders name/display as a profile link. */
Expand Down Expand Up @@ -46,8 +48,18 @@ const UserIdentity = ({
emailClassName,
emptyClassName,
}: UserIdentityProps): React.ReactElement => {
const displayName = name?.trim() || username?.trim() || '';
const trimmedUsername = username?.trim() || '';
const trimmedName = name?.trim() || '';
const displayEmail = email?.trim() || '';
const { data: resolvedUsername = null } = useUsernameByEmailQuery(
!trimmedUsername && displayEmail ? displayEmail.toLowerCase() : undefined,
);
const { data: resolvedDisplayName = null } = useDisplayNameQuery(
trimmedUsername && !trimmedName ? trimmedUsername : undefined,
);
const profileUsername = trimmedUsername || resolvedUsername;
const displayName =
trimmedName || (trimmedUsername ? resolvedDisplayName || trimmedUsername : '');

if (!displayName && !displayEmail) {
return <span className={emptyClassName}>—</span>;
Expand All @@ -56,12 +68,12 @@ const UserIdentity = ({
return (
<span className={className}>
{displayName ? (
username ? (
profileUsername ? (
<Link
to={`/dashboard/user/${encodeURIComponent(username)}`}
to={`/dashboard/user/${encodeURIComponent(profileUsername)}`}
className={nameClassName}
title={title}
onClick={(e: React.MouseEvent) => e.stopPropagation()}
onClick={(event: React.MouseEvent) => event.stopPropagation()}
>
{displayName}
</Link>
Expand Down
55 changes: 9 additions & 46 deletions src/ui/views/PushRequests/components/PushesTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { GitBranchIcon, GitCommitIcon, TagIcon } from '@primer/octicons-react';
import { Link, Spinner, Text } from '@primer/react';
import { DataTable, createColumnHelper } from '@primer/react/experimental';
import Pagination from '../../../components/Pagination/Pagination';
import ReviewerIdentity from '../../../components/ReviewerIdentity/ReviewerIdentity';
import UserIdentity from '../../../components/UserIdentity/UserIdentity';
import { PushActionView, RepoView } from '../../../types';
import { trimPrefixRefsHeads } from '../../../../db/helper';
Expand Down Expand Up @@ -114,29 +115,6 @@ function primaryAuthorLine(row: PushActionView): { label: string; title: string
return { label: '', title: '' };
}

/** Prefer API `displayName`; otherwise derive a readable label from `email` / `reviewerEmail` local part. */
function reviewerDisplayNameFromReviewer(
reviewer:
| {
displayName?: string | null;
email?: string;
reviewerEmail?: string;
}
| undefined,
): string | undefined {
const dn = reviewer?.displayName?.trim();
if (dn) return dn;
const addr = reviewer?.email?.trim() || reviewer?.reviewerEmail?.trim();
if (!addr?.includes('@')) return undefined;
const local = addr.split('@')[0] ?? '';
if (!local) return undefined;
return local
.split(/[._-]+/u)
.filter(Boolean)
.map((part) => part.charAt(0).toUpperCase() + part.slice(1).toLowerCase())
.join(' ');
}

function primaryAuthorFields(row: PushActionView): { name: string; email: string } {
const tag = row.tagData?.[0];
const tagger = tag?.tagger?.trim() ?? '';
Expand Down Expand Up @@ -355,11 +333,8 @@ const PushesTable = ({
minWidth: 'min(100%, 8rem)',
width: 'auto',
renderCell: (row) => {
const username = row.authorised
? row.attestation?.reviewer?.username?.trim()
: undefined;
const approvedByName = row.attestation?.reviewer?.displayName?.trim() || undefined;
if (!username) {
const reviewer = row.authorised ? row.attestation?.reviewer : undefined;
if (!reviewer?.username?.trim()) {
return (
<Text
as='span'
Expand All @@ -371,9 +346,8 @@ const PushesTable = ({
}
return (
<div className='min-w-0' onClick={(e) => e.stopPropagation()}>
<UserIdentity
username={username}
name={approvedByName}
<ReviewerIdentity
reviewer={reviewer}
className='flex min-w-0 flex-col gap-0.5'
nameClassName={`${authorNameClass} text-left`}
emailClassName={`${mutedMetaClass} break-all text-left`}
Expand All @@ -393,16 +367,8 @@ const PushesTable = ({
minWidth: 'min(100%, 8rem)',
width: 'auto',
renderCell: (row) => {
const reviewer = row.rejection?.reviewer;
const username = row.rejected ? reviewer?.username?.trim() : undefined;
const rejectedByName = reviewerDisplayNameFromReviewer(reviewer);
const reviewerEmail =
reviewer?.email?.trim() || reviewer?.reviewerEmail?.trim() || undefined;
const title =
rejectedByName && reviewerEmail
? `${rejectedByName} <${reviewerEmail}>`
: reviewerEmail || rejectedByName || username || undefined;
if (!username) {
const reviewer = row.rejected ? row.rejection?.reviewer : undefined;
if (!reviewer?.username?.trim()) {
return (
<Text
as='span'
Expand All @@ -414,11 +380,8 @@ const PushesTable = ({
}
return (
<div className='min-w-0' onClick={(e) => e.stopPropagation()}>
<UserIdentity
username={username}
name={rejectedByName}
email={reviewerEmail}
title={title}
<ReviewerIdentity
reviewer={reviewer}
className='flex min-w-0 flex-col gap-0.5'
nameClassName={`${authorNameClass} text-left`}
emailClassName={`${mutedMetaClass} break-all text-left`}
Expand Down
72 changes: 72 additions & 0 deletions test/ui/reviewerIdentity.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
/**
* Copyright 2026 GitProxy Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import React from 'react';
import { renderToStaticMarkup } from 'react-dom/server';
import { MemoryRouter } from 'react-router';
import { describe, expect, it, vi } from 'vitest';
import ReviewerIdentity from '../../src/ui/components/ReviewerIdentity/ReviewerIdentity';

vi.mock('@primer/react', async () => {
const { createElement } = await import('react');
const Text = ({ children, title }: { children?: React.ReactNode; title?: string }) =>
createElement('span', { title }, children);
const Link = ({ children, href }: { children?: React.ReactNode; href?: string }) =>
createElement('a', { href }, children);
return { Text, Link };
});
vi.mock('../../src/ui/query/useDisplayNameQuery', () => ({
useDisplayNameQuery: () => ({ data: null }),
}));
vi.mock('../../src/ui/query/useUsernameByEmailQuery', () => ({
useUsernameByEmailQuery: () => ({ data: null }),
}));

const render = (reviewer?: Parameters<typeof ReviewerIdentity>[0]['reviewer']) =>
renderToStaticMarkup(
<MemoryRouter>
<ReviewerIdentity reviewer={reviewer} />
</MemoryRouter>,
);

describe('ReviewerIdentity', () => {
it('shows display name and email', () => {
const html = render({ username: 'bob', displayName: 'Bob Smith', email: 'bob@example.com' });
expect(html).toContain('Bob Smith');
expect(html).toContain('bob@example.com');
expect(html).toContain('title="Bob Smith &lt;bob@example.com&gt;"');
});

it('reads reviewerEmail as used by approval records', () => {
const html = render({ username: 'bob', displayName: 'Bob Smith', reviewerEmail: 'bob@x.io' });
expect(html).toContain('bob@x.io');
});

it('derives a name from the email when displayName is missing', () => {
const html = render({ username: 'jane', reviewerEmail: 'jane.doe@x.io' });
expect(html).toContain('Jane Doe');
expect(html).toContain('jane.doe@x.io');
});

it('falls back to the username when there is no name or email', () => {
const html = render({ username: 'carol' });
expect(html).toContain('carol');
});

it('renders a dash with no reviewer', () => {
expect(render(undefined)).toContain('—');
});
});
Loading
Loading