🪢 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
fix(web): align badge-list cells on one inline start (#18153)
Der Gerät6ed4ef2e5e04
diff --git a/web/src/components/SingleLineOverflowList.tsx b/web/src/components/SingleLineOverflowList.tsxindex 3333efb640..f86404d0da 100644--- a/web/src/components/SingleLineOverflowList.tsx+++ b/web/src/components/SingleLineOverflowList.tsx@@ -9,6 +9,10 @@ import { type ReactNode, useEffect, useRef, useState } from "react";* entries that should not be mounted in the measurement row. Item and overflow* presentation remain entirely caller-defined. `trailingContent` stays pinned* immediately after the overflow control and participates in width measurement.+ *+ * The row gap only ever separates rendered content, so every row starts on the+ * same inline edge whether it holds items, only the overflow control, or+ * nothing at all.*/// Rows of boxed pills read fine at gap-2; rows of mostly-plain text (the@@ -147,26 +151,28 @@ export function SingleLineOverflowList<TItem>({);})}</div>- <div- className={`flex min-w-0 items-center overflow-hidden [&>*]:shrink-0 ${gapClass}`}- >- {visibleItems.map((item) => {- const key = getKey(item);- return (- <span- key={key}- data-overflow-visible-item="true"- data-tight={isTightItem?.(item) ? "true" : undefined}- className={cn(- "flex items-center",- isTightItem?.(item) && "[[data-tight]+&]:-ml-3",- )}- >- {renderItem(item)}- </span>- );- })}- </div>+ {visibleItems.length > 0 ? (+ <div+ className={`flex min-w-0 items-center overflow-hidden [&>*]:shrink-0 ${gapClass}`}+ >+ {visibleItems.map((item) => {+ const key = getKey(item);+ return (+ <span+ key={key}+ data-overflow-visible-item="true"+ data-tight={isTightItem?.(item) ? "true" : undefined}+ className={cn(+ "flex items-center",+ isTightItem?.(item) && "[[data-tight]+&]:-ml-3",+ )}+ >+ {renderItem(item)}+ </span>+ );+ })}+ </div>+ ) : null}{overflowItemCount > 0 ? (<div ref={overflowRef} className="flex shrink-0 items-center">{renderOverflow({ hiddenItems, overflowItemCount })}diff --git a/web/src/components/design-system/table/columns/createBadgeListTableColumn.stories.tsx b/web/src/components/design-system/table/columns/createBadgeListTableColumn.stories.tsxnew file mode 100644index 0000000000..11803782b2--- /dev/null+++ b/web/src/components/design-system/table/columns/createBadgeListTableColumn.stories.tsx@@ -0,0 +1,79 @@+import preview from "../../../../../.storybook/preview";++import {+ DataTable,+ type AsyncTableData,+} from "@/src/components/table/data-table";+import { createBadgeListTableColumn } from "./createBadgeListTableColumn";+import { createTextTableColumn } from "./createTextTableColumn";++type Row = {+ member: string;+ providers: string[];+};++const columns = [+ // Narrow enough that a second chip never fits beside the first, so a row+ // holding more than one item overflows rather than wrapping.+ createBadgeListTableColumn<Row>({+ accessorKey: "providers",+ header: "SSO Provider",+ size: 120,+ }),+ // Absorbs the leftover width so the badge column keeps its size.+ createTextTableColumn<Row>({+ accessorKey: "member",+ header: "Member",+ isFlexWidth: true,+ }),+];++function BadgeListTableColumnStory({ data }: { data: AsyncTableData<Row[]> }) {+ return (+ <DataTable+ tableName="badge-list-column-story"+ columns={columns}+ data={data}+ hidePagination+ cellPadding="comfortable"+ />+ );+}++const meta = preview.meta({+ component: BadgeListTableColumnStory,+ parameters: {+ layout: "fullscreen",+ },+});++/** Every row starts on the same inline edge, whichever state it is in. */+export const Default = meta.story({+ args: {+ data: {+ isLoading: false,+ isError: false,+ data: [+ { member: "[email protected]", providers: [] },+ { member: "[email protected]", providers: ["Okta"] },+ {+ member: "[email protected]",+ providers: ["Okta", "Google", "Auth0"],+ },+ {+ member: "[email protected]",+ providers: ["Microsoft Entra ID", "Google"],+ },+ ],+ },+ },+});++export const Loading = meta.story({+ args: {+ data: {+ isLoading: true,+ isError: false,+ },+ },+});diff --git a/web/src/components/design-system/table/columns/createBadgeListTableColumn.tsx b/web/src/components/design-system/table/columns/createBadgeListTableColumn.tsxindex 78f3453aa2..192f50af18 100644--- a/web/src/components/design-system/table/columns/createBadgeListTableColumn.tsx+++ b/web/src/components/design-system/table/columns/createBadgeListTableColumn.tsx@@ -1,10 +1,13 @@-/* eslint-disable boundaries/dependencies */import { type CellContext, type RowData } from "@tanstack/react-table";import { type LucideIcon } from "lucide-react";-import { SingleLineOverflowList } from "@/src/components/SingleLineOverflowList";import { CustomTooltip } from "@/src/components/design-system/CustomTooltip/CustomTooltip";+// eslint-disable-next-line boundaries/dependencies+import { SingleLineOverflowList } from "@/src/components/SingleLineOverflowList";+import { EmptyValue } from "@/src/components/design-system/table/components/EmptyValue/EmptyValue";+// eslint-disable-next-line boundaries/dependenciesimport { Badge, type BadgeProps } from "@/src/components/ui/badge";+// eslint-disable-next-line boundaries/dependenciesimport { Skeleton } from "@/src/components/ui/skeleton";import { cn } from "@/src/utils/tailwind";import {@@ -34,15 +37,26 @@ type NeutralBadgeVariant = Extract<"default" | "secondary" | "tertiary">;+type BadgeIcon =+ | LucideIcon+ | React.ElementType<{ className?: string; "aria-hidden"?: boolean }>;++/** One chip treatment, shared by the item chips and the overflow chip. */+type Chip = {+ value: string;+ variant: BadgeVariant;+ icon?: BadgeIcon;+ ariaLabel?: string;+ title?: string;+};+type GetBadge<TData extends RowData, TItem, TVariant extends BadgeVariant> = (value: TItem,context: CellContext<TData, TItem[] | null | undefined>,) => {value: string;variant: TVariant;- icon?:- | LucideIcon- | React.ElementType<{ className?: string; "aria-hidden"?: boolean }>;+ icon?: BadgeIcon;ariaLabel?: string;} & ([TItem] extends [string] ? { key?: string } : { key: string });@@ -69,47 +83,49 @@ type BadgeListTableColumnOptions<export function createBadgeListTableColumn<TData extends RowData,TItem = string,->({- getBadge,- nullValue,- range,- ...options-}: BadgeListTableColumnOptions<TData, TItem> & {- nullValue?: string;-}) {+>({ getBadge, range, ...options }: BadgeListTableColumnOptions<TData, TItem>) {return createTableColumn<TData, TItem[]>({...options,loadingCell: <Skeleton className="h-5 w-16 shrink-0 rounded-sm" />,renderCell: (values, context) => {- if (!values?.length) return nullValue ?? null;+ if (!values?.length) return <EmptyValue />;- const badges = values.map((value, index) => ({- key: String(index),- ...(range === "semantic" || range === "decorative"- ? getBadge(value, context)- : (getBadge?.(value, context) ?? {- value: String(value),- variant: "secondary" as const,- icon: undefined,- ariaLabel: undefined,- })),- }));- const renderBadge = (badge: (typeof badges)[number]) => {- const Icon = badge.icon;- return (- <Badge- variant={badge.variant}- className="max-w-fit gap-1 truncate rounded-sm px-1 font-normal"- title={badge.value}- aria-label={badge.ariaLabel}- >- {Icon && <Icon className="size-3 shrink-0" aria-hidden />}- <span className="truncate leading-normal" title={badge.value}>- {badge.value}- </span>- </Badge>- );- };+ const badges = values.map((value, index) => {+ const badge =+ range === "semantic" || range === "decorative"+ ? getBadge(value, context)+ : (getBadge?.(value, context) ?? {+ value: String(value),+ variant: "secondary" as const,+ icon: undefined,+ ariaLabel: undefined,+ });++ // An item label can be clipped by truncation, so it also travels in a+ // native tooltip. The overflow chip never truncates and omits it.+ return { key: String(index), title: badge.value, ...badge };+ });+ // The overflow chip stands in for chips of this same row, so both go+ // through one treatment rather than two Badge configurations.+ const renderBadge = ({+ value,+ variant,+ icon: Icon,+ ariaLabel,+ title,+ }: Chip) => (+ <Badge+ variant={variant}+ className="max-w-fit gap-1 truncate rounded-sm px-1 font-normal"+ title={title}+ aria-label={ariaLabel}+ >+ {Icon && <Icon className="size-3 shrink-0" aria-hidden />}+ <span className="truncate leading-normal" title={title}>+ {value}+ </span>+ </Badge>+ );return (<SingleLineOverflowList@@ -138,7 +154,10 @@ export function createBadgeListTableColumn<className="inline-flex"tabIndex={0}>- <Badge variant="secondary">+{overflowItemCount}</Badge>+ {renderBadge({+ value: `+${overflowItemCount}`,+ variant: "secondary",+ })}</span>)}</CustomTooltip>diff --git a/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsx b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsxindex f0acc47029..a5f29e0543 100644--- a/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsx+++ b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsx@@ -118,7 +118,6 @@ export function MembersSettingsTable({accessorKey: "providers",header: "SSO Provider",enableHiding: true,- nullValue: "-",}),{accessorKey: "orgRole",