🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.
TypeScript analyticsautogenevaluationlangchainlarge-language-modelsllama-indexllmllm-evaluationllm-observabilityllmopsmonitoringobservabilityopen-sourceopenaiplaygroundprompt-engineeringprompt-managementself-hostedycombinator
feat(web): show view owner name or email on avatar hover (#18032)
Nimarc5164baa188d
diff --git a/packages/shared/src/server/services/TableViewService/TableViewService.ts b/packages/shared/src/server/services/TableViewService/TableViewService.tsindex 550727922f..029782a8b4 100644--- a/packages/shared/src/server/services/TableViewService/TableViewService.ts+++ b/packages/shared/src/server/services/TableViewService/TableViewService.ts@@ -216,6 +216,7 @@ export class TableViewService {select: {image: true,name: true,+ email: true,},},filters: true,diff --git a/packages/shared/src/server/services/TableViewService/types.ts b/packages/shared/src/server/services/TableViewService/types.tsindex e9382117c5..bc5b424c8f 100644--- a/packages/shared/src/server/services/TableViewService/types.ts+++ b/packages/shared/src/server/services/TableViewService/types.ts@@ -53,6 +53,7 @@ export const TableViewPresetsNamesCreatorListSchema = z.array(.object({image: z.string().nullish(),name: z.string().nullish(),+ email: z.string().nullish(),}).nullish(),filters: singleFilterList,diff --git a/web/src/__tests__/server/table-view-presets-trpc.servertest.ts b/web/src/__tests__/server/table-view-presets-trpc.servertest.tsindex 5221f64a48..8df25551ca 100644--- a/web/src/__tests__/server/table-view-presets-trpc.servertest.ts+++ b/web/src/__tests__/server/table-view-presets-trpc.servertest.ts@@ -9,7 +9,7 @@ import { createOrgProjectAndApiKey } from "@langfuse/shared/src/server";import type { Session } from "next-auth";import { randomUUID } from "node:crypto";-const prepare = async () => {+const prepare = async (projectRole: "ADMIN" | "VIEWER" = "ADMIN") => {const { project, org } = await createOrgProjectAndApiKey();const userId = `table-view-user-${randomUUID()}`;const session: Session = {@@ -31,7 +31,7 @@ const prepare = async () => {projects: [{id: project.id,- role: "ADMIN",+ role: projectRole,retentionDays: 30,deletedAt: null,hasTraces: false,@@ -63,7 +63,11 @@ describe("table view presets tRPC", () => {it("creates separate saved views for evaluator and rule tables", async () => {const { caller, projectId, userId } = await prepare();await prisma.user.create({- data: { id: userId, email: `${userId}@example.com` },+ data: {+ id: userId,+ name: "Table View Test User",+ email: `${userId}@example.com`,+ },});const [evaluatorView, ruleView] = await Promise.all([caller.TableViewPresets.create({@@ -111,6 +115,11 @@ describe("table view presets tRPC", () => {id: evaluatorView.view.id,tableName: TableViewPresetTableName.Evaluators,searchQuery: "quality",+ createdByUser: {+ image: null,+ name: "Table View Test User",+ email: `${userId}@example.com`,+ },}),]);await expect(@@ -128,6 +137,50 @@ describe("table view presets tRPC", () => {await prisma.user.delete({ where: { id: userId } });});+ it("omits creator emails when the caller cannot read project members", async () => {+ const { caller, projectId, userId } = await prepare("VIEWER");+ await prisma.user.create({+ data: {+ id: userId,+ name: "Table View Test User",+ email: `${userId}@example.com`,+ },+ });+ const preset = await prisma.tableViewPreset.create({+ data: {+ projectId,+ name: `viewer-view-${randomUUID()}`,+ tableName: TableViewPresetTableName.Evaluators,+ createdBy: userId,+ updatedBy: userId,+ filters: [],+ columnOrder: [],+ columnVisibility: {},+ searchQuery: null,+ orderBy: null as unknown as Prisma.NullableJsonNullValueInput,+ },+ });++ await expect(+ caller.TableViewPresets.getByTableName({+ projectId,+ tableName: TableViewPresetTableName.Evaluators,+ }),+ ).resolves.toEqual([+ expect.objectContaining({+ id: preset.id,+ createdByUser: {+ image: null,+ name: "Table View Test User",+ email: null,+ },+ }),+ ]);++ await prisma.tableViewPreset.deleteMany({ where: { projectId } });+ await prisma.user.delete({ where: { id: userId } });+ });+it("deletes an already-deleted preset idempotently", async () => {const { caller, projectId } = await prepare();const preset = await prisma.tableViewPreset.create({diff --git a/web/src/components/design-system/Avatar/Avatar.stories.tsx b/web/src/components/design-system/Avatar/Avatar.stories.tsxindex cb6a29c799..24326b6192 100644--- a/web/src/components/design-system/Avatar/Avatar.stories.tsx+++ b/web/src/components/design-system/Avatar/Avatar.stories.tsx@@ -1,4 +1,5 @@import React from "react";+import { expect, userEvent, waitFor, within } from "storybook/test";import preview from "../../../../.storybook/preview";import { Avatar } from "./Avatar";@@ -35,6 +36,13 @@ export const Fallback = meta.story({},});+export const WithEmail = meta.story({+ args: {+ displayName: "Ada Lovelace",+ email: "[email protected]",+ },+});+export const VariantMatrix = meta.story({parameters: {controls: {@@ -70,3 +78,27 @@ export const VariantMatrix = meta.story({</div>),});++export const TestHoverNameAndEmail = meta.story({+ name: "(Test) Hover shows name and email",+ args: {+ displayName: "Ada Lovelace",+ email: "[email protected]",+ },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ const avatar = canvas.getByRole("img", {+ name: "Ada Lovelace, [email protected]",+ });++ await userEvent.hover(avatar);+ await waitFor(+ () =>+ expect(body.getByRole("tooltip")).toHaveTextContent(+ "Ada Lovelace [email protected]",+ ),+ { timeout: 2000 },+ );+ },+});diff --git a/web/src/components/design-system/Avatar/Avatar.tsx b/web/src/components/design-system/Avatar/Avatar.tsxindex 141c78041e..3948857212 100644--- a/web/src/components/design-system/Avatar/Avatar.tsx+++ b/web/src/components/design-system/Avatar/Avatar.tsx@@ -4,6 +4,8 @@ import * as React from "react";import * as AvatarPrimitive from "@radix-ui/react-avatar";import { cva, type VariantProps } from "class-variance-authority";+import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip";+const avatarVariants = cva("relative flex shrink-0 overflow-hidden", {variants: {size: {@@ -25,38 +27,69 @@ const avatarVariants = cva("relative flex shrink-0 overflow-hidden", {type AvatarProps = {"aria-hidden"?: boolean | "true" | "false";displayName: string;+ /**+ * Second hover line when it differs from `displayName`. Pass the address+ * here and keep `displayName` as the name so initials stay the person's.+ * When only an email is known, pass that email as `displayName`.+ */+ email?: string;src?: string;} & VariantProps<typeof avatarVariants>;+function avatarHoverLabel(displayName: string, email?: string) {+ const name = displayName.trim();+ const mail = email?.trim() || null;+ if (name && mail && name.toLowerCase() !== mail.toLowerCase()) {+ return `${name}\n${mail}`;+ }+ return name || mail || "User";+}+const Avatar = React.forwardRef<React.ComponentRef<typeof AvatarPrimitive.Root>,AvatarProps->(({ src, displayName, size, shape, ...props }, ref) => {- const normalizedDisplayName = displayName.trim() || "User";+>(({ src, displayName, email, size, shape, ...props }, ref) => {+ const hoverLabel = avatarHoverLabel(displayName, email);+ const accessibleName = hoverLabel.split("\n").join(", ");+ const normalizedDisplayName = displayName.trim() || email?.trim() || "User";const initials = normalizedDisplayName.split(/\s+/).slice(0, 2).map((word) => word.charAt(0)).join("").toUpperCase();+ const hidden =+ props["aria-hidden"] === true || props["aria-hidden"] === "true";return (- <AvatarPrimitive.Root- ref={ref}- className={avatarVariants({ size, shape })}- {...props}- >- {src ? (- <AvatarPrimitive.Image- src={src}- alt={normalizedDisplayName}- className="aspect-square h-full w-full"- />- ) : null}- <AvatarPrimitive.Fallback className="bg-muted flex h-full w-full items-center justify-center rounded-[inherit]">- {initials}- </AvatarPrimitive.Fallback>- </AvatarPrimitive.Root>+ <Tooltip label={hoverLabel}>+ {({ getTriggerProps }) => (+ <span+ {...getTriggerProps()}+ className="inline-flex shrink-0"+ aria-hidden={hidden ? true : undefined}+ aria-label={hidden ? undefined : accessibleName}+ role={hidden ? undefined : "img"}+ >+ <AvatarPrimitive.Root+ ref={ref}+ className={avatarVariants({ size, shape })}+ {...props}+ >+ {src ? (+ <AvatarPrimitive.Image+ src={src}+ alt=""+ className="aspect-square h-full w-full"+ />+ ) : null}+ <AvatarPrimitive.Fallback className="bg-muted flex h-full w-full items-center justify-center rounded-[inherit]">+ {initials}+ </AvatarPrimitive.Fallback>+ </AvatarPrimitive.Root>+ </span>+ )}+ </Tooltip>);});diff --git a/web/src/components/design-system/table/components/UserTableCell/UserTableCell.tsx b/web/src/components/design-system/table/components/UserTableCell/UserTableCell.tsxindex 5dfc78f9fc..5c9e15f929 100644--- a/web/src/components/design-system/table/components/UserTableCell/UserTableCell.tsx+++ b/web/src/components/design-system/table/components/UserTableCell/UserTableCell.tsx@@ -53,8 +53,13 @@ export function UserTableCell({}return (- <div className="flex min-w-0 items-center space-x-2" title={email ?? label}>- <Avatar size={avatarSize} src={image ?? undefined} displayName={label} />+ <div className="flex min-w-0 items-center space-x-2">+ <Avatar+ size={avatarSize}+ src={image ?? undefined}+ displayName={label}+ email={email ?? undefined}+ /><span className="truncate" title={email ?? label}>{label}</span>diff --git a/web/src/components/nav/AppSidebar/AppSidebar.tsx b/web/src/components/nav/AppSidebar/AppSidebar.tsxindex b0b4197972..2aa936b36f 100644--- a/web/src/components/nav/AppSidebar/AppSidebar.tsx+++ b/web/src/components/nav/AppSidebar/AppSidebar.tsx@@ -485,6 +485,7 @@ function NavUser({shape="rounded"src={user.avatar}displayName={user.name}+ email={user.email}/><div className="grid flex-1 text-left text-sm leading-tight"><span className="truncate font-bold" title={user.name}>@@ -509,6 +510,7 @@ function NavUser({shape="rounded"src={user.avatar}displayName={user.name}+ email={user.email}/><div className="grid flex-1 text-left text-sm leading-tight"><span className="truncate font-bold" title={user.name}>diff --git a/web/src/components/nav/topbar-account.tsx b/web/src/components/nav/topbar-account.tsxindex 07c8e4311e..859178ee1c 100644--- a/web/src/components/nav/topbar-account.tsx+++ b/web/src/components/nav/topbar-account.tsx@@ -47,6 +47,7 @@ export const TopbarAccount = ({size="lg"src={user.image ?? undefined}displayName={name || email || "User"}+ email={email || undefined}/></DropdownMenuTrigger><DropdownMenuContent align="end" sideOffset={4} className="min-w-56">diff --git a/web/src/components/table/table-view-presets/components/data-table-view-presets-drawer.tsx b/web/src/components/table/table-view-presets/components/data-table-view-presets-drawer.tsxindex 957cd5402b..5cce585e06 100644--- a/web/src/components/table/table-view-presets/components/data-table-view-presets-drawer.tsx+++ b/web/src/components/table/table-view-presets/components/data-table-view-presets-drawer.tsx@@ -938,7 +938,12 @@ function TableViewPresetsDrawerContentBody({<Avatarsize="sm"src={view.createdByUser?.image ?? undefined}- displayName={view.createdByUser?.name ?? "User"}+ displayName={+ view.createdByUser?.name?.trim() ||+ view.createdByUser?.email?.trim() ||+ "User"+ }+ email={view.createdByUser?.email ?? undefined}/></div>)}diff --git a/web/src/features/comments/components/MentionAutocomplete.tsx b/web/src/features/comments/components/MentionAutocomplete.tsxindex 592dfeaebb..3ba93e0c15 100644--- a/web/src/features/comments/components/MentionAutocomplete.tsx+++ b/web/src/features/comments/components/MentionAutocomplete.tsx@@ -92,6 +92,7 @@ export function MentionAutocomplete({size="sm"aria-hidden="true"displayName={displayName}+ email={user.email ?? undefined}/><div className="text-foreground flex-1 overflow-hidden"><div className="truncate font-bold" title={userLabel}>diff --git a/web/src/server/api/routers/tableViewPresets.ts b/web/src/server/api/routers/tableViewPresets.tsindex 0144fb3ec5..1f0fc82999 100644--- a/web/src/server/api/routers/tableViewPresets.ts+++ b/web/src/server/api/routers/tableViewPresets.ts@@ -4,7 +4,7 @@ import {createTRPCRouter,protectedProjectProcedure,} from "@/src/server/api/trpc";-import { throwIfNoProjectAccess } from "@/src/features/rbac";+import { hasProjectAccess, throwIfNoProjectAccess } from "@/src/features/rbac";import {TableViewService,CreateTableViewPresetsInput,@@ -151,10 +151,30 @@ export const TableViewPresetsRouter = createTRPCRouter({scope: "TableViewPresets:read",});- return await TableViewService.getTableViewPresetsByTableName(+ const presets = await TableViewService.getTableViewPresetsByTableName(input.tableName,input.projectId,);++ // Creator email follows projectMembers:read, the same scope as the members list.+ if (+ hasProjectAccess({+ session: ctx.session,+ projectId: input.projectId,+ scope: "projectMembers:read",+ })+ ) {+ return presets;+ }++ return presets.map((preset) =>+ preset.createdByUser+ ? {+ ...preset,+ createdByUser: { ...preset.createdByUser, email: null },+ }+ : preset,+ );}),getById: protectedProjectProcedure