🪢 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
refactor(web): Make member and invite tables use design-system (#17684)
Ben Bachema4da2e8b9396
diff --git a/web/src/__tests__/organization-settings-pages.clienttest.tsx b/web/src/__tests__/organization-settings-pages.clienttest.tsxindex d57ef3369d..ce6c563708 100644--- a/web/src/__tests__/organization-settings-pages.clienttest.tsx+++ b/web/src/__tests__/organization-settings-pages.clienttest.tsx@@ -16,13 +16,17 @@ vi.mock("@/src/components/layouts/header", () => ({default: () => null,}));-vi.mock("@/src/features/rbac/components/MembershipInvitesPage", () => ({- MembershipInvitesPage: () => null,-}));+vi.mock(+ "@/src/features/rbac/components/MembershipInvitesSettingsTable/ConnectedMembershipInvitesSettingsTable",+ () => ({+ ConnectedMembershipInvitesSettingsTable: () => null,+ }),+);-vi.mock("@/src/features/rbac/components/MembersTable", () => ({- MembersTable: () => null,-}));+vi.mock(+ "@/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable",+ () => ({ ConnectedMembersSettingsTable: () => null }),+);vi.mock("@/src/components/ui/CodeJsonViewer", () => ({JSONView: () => null,diff --git a/web/src/components/ActionButton.tsx b/web/src/components/ActionButton.tsxindex 53a0ec53bf..3e9308a370 100644--- a/web/src/components/ActionButton.tsx+++ b/web/src/components/ActionButton.tsx@@ -11,7 +11,7 @@ import {import Link from "next/link";import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";-type ActionButtonProps = Pick<+export type ActionButtonProps = Pick<ButtonProps,"disabled" | "onClick" | "size" | "title" | "type" | "variant"> & {diff --git a/web/src/components/SettingsTable/SettingsTable.tsx b/web/src/components/SettingsTable/SettingsTable.tsxnew file mode 100644index 0000000000..07d4b24543--- /dev/null+++ b/web/src/components/SettingsTable/SettingsTable.tsx@@ -0,0 +1,130 @@+import { useState } from "react";+import {+ ActionButton,+ type ActionButtonProps,+} from "@/src/components/ActionButton";+import {+ PaginationBar,+ type PaginationBarProps,+} from "@/src/components/design-system/PaginationBar/PaginationBar";+import {+ Table,+ type TableProps,+} from "@/src/components/design-system/table/Table";+import { SearchInput } from "@/src/components/design-system/SearchInput/SearchInput";+import { SettingsTableCard } from "@/src/components/layouts/settings-table-card";+import { DataTableColumnVisibilityFilter } from "@/src/components/table/data-table-column-visibility-filter";+import { type LangfuseColumnDef } from "@/src/components/table/types";+import {+ useColumnOrder,+ useColumnVisibility,+} from "@/src/features/column-visibility";++type SettingsTableToolbarAction = ActionButtonProps extends infer TAction+ ? TAction extends ActionButtonProps+ ? Omit<TAction, "children"> & { id: string; label: string }+ : never+ : never;++export type SettingsTableProps<TData extends object> = Omit<+ TableProps<TData>,+ "columns"+> & {+ columns: LangfuseColumnDef<TData>[];+ columnOrderKey?: string;+ columnVisibilityKey?: string;+ search?: {+ value: string;+ placeholder: string;+ onChange: (value: string) => void;+ };+ toolbarActions?: SettingsTableToolbarAction[];+ pagination: PaginationBarProps;+};++export function SettingsTable<TData extends object>({+ columns,+ columnOrderKey,+ columnVisibilityKey,+ search,+ toolbarActions,+ pagination,+ ...tableProps+}: SettingsTableProps<TData>) {+ const [columnVisibility, setColumnVisibility] = useColumnVisibility(+ columnVisibilityKey ?? `${tableProps.tableName}ColumnVisibility`,+ columns,+ );+ const [columnOrder, setColumnOrder] = useColumnOrder(+ columnOrderKey ?? `${tableProps.tableName}ColumnOrder`,+ columns,+ );+ const [searchDraft, setSearchDraft] = useState(() => ({+ value: search?.value ?? "",+ committedValue: search?.value ?? "",+ }));+ const searchValue =+ search && search.value !== searchDraft.committedValue+ ? search.value+ : searchDraft.value;++ const hasToolbar = Boolean(search || columnVisibilityKey || toolbarActions);++ return (+ <div className="flex min-h-0 flex-col gap-2">+ {hasToolbar && (+ <div className="flex items-center justify-between gap-2">+ {search ? (+ <div className="w-full max-w-sm">+ <SearchInput+ value={searchValue}+ placeholder={search.placeholder}+ onChange={(value) => {+ setSearchDraft({ value, committedValue: search.value });+ if (value === "") search.onChange("");+ }}+ onSubmit={(value) => {+ setSearchDraft({ value, committedValue: value });+ search.onChange(value);+ }}+ />+ </div>+ ) : (+ <div />+ )}++ <div className="flex items-center gap-2">+ {columnVisibilityKey && (+ <DataTableColumnVisibilityFilter+ columns={columns}+ columnVisibility={columnVisibility}+ setColumnVisibility={setColumnVisibility}+ columnOrder={columnOrder}+ setColumnOrder={setColumnOrder}+ tableName={tableProps.tableName}+ isV4+ />+ )}+ {toolbarActions?.map(({ id, label, ...action }) => (+ <ActionButton key={id} {...action}>+ {label}+ </ActionButton>+ ))}+ </div>+ </div>+ )}++ <SettingsTableCard>+ <Table+ columns={columns}+ columnVisibility={columnVisibility}+ onColumnVisibilityChange={setColumnVisibility}+ columnOrder={columnOrder}+ onColumnOrderChange={setColumnOrder}+ {...tableProps}+ />+ <PaginationBar {...pagination} />+ </SettingsTableCard>+ </div>+ );+}diff --git a/web/src/components/design-system/ConfirmationDialogController/ConfirmationDialogController.tsx b/web/src/components/design-system/ConfirmationDialogController/ConfirmationDialogController.tsxindex 7c393eef58..1a0bf41829 100644--- a/web/src/components/design-system/ConfirmationDialogController/ConfirmationDialogController.tsx+++ b/web/src/components/design-system/ConfirmationDialogController/ConfirmationDialogController.tsx@@ -8,13 +8,24 @@ import { DialogController } from "@/src/components/design-system/DialogControlleimport { Input } from "@/src/components/ui/input";import { Label } from "@/src/components/ui/label";-function ConfirmationDialogController({+type ConfirmationDialogValueCallback<TValue, TResult> = [TValue] extends [+ undefined,+]+ ? () => TResult+ : (value: TValue) => TResult;++type ConfirmationDialogContent<TValue> =+ | string+ | ([TValue] extends [undefined] ? never : (value: TValue) => string);++function ConfirmationDialogController<TValue = undefined>({children,confirmationText,confirmLabel,disabled = false,error,loading = false,+ onAfterDismiss,onConfirm,text,title,@@ -22,29 +33,51 @@ function ConfirmationDialogController({}: {children: (control: {isOpen: boolean;- openDialog: () => void;+ openDialog: ConfirmationDialogValueCallback<TValue, void>;}) => React.ReactNode;confirmationText?: string;confirmLabel: string;disabled?: boolean;error?: string;loading?: boolean;- onConfirm: () => void | Promise<void>;- text: string;- title: string;+ onAfterDismiss?: () => void;+ onConfirm: ConfirmationDialogValueCallback<TValue, void | Promise<void>>;+ text: ConfirmationDialogContent<TValue>;+ title: ConfirmationDialogContent<TValue>;variant: "default" | "destructive";}) {const [confirmationInput, setConfirmationInput] = React.useState("");++ const [selectedValue, setSelectedValue] = React.useState<TValue>();+const confirmationInputId = React.useId();const requiresConfirmationInput = Boolean(confirmationText);+ let resolvedTitle = "";+ if (typeof title === "string") {+ resolvedTitle = title;+ } else if (selectedValue !== undefined) {+ resolvedTitle = (title as (value: TValue) => string)(selectedValue);+ }++ let resolvedText = "";+ if (typeof text === "string") {+ resolvedText = text;+ } else if (selectedValue !== undefined) {+ resolvedText = (text as (value: TValue) => string)(selectedValue);+ }+return (<DialogControlleronBeforeClose={() => !loading}- onDismiss={() => setConfirmationInput("")}+ onDismiss={() => {+ setConfirmationInput("");+ setSelectedValue(undefined);+ onAfterDismiss?.();+ }}renderDialog={({ closeDialog }) => (<Dialog- title={title}+ title={resolvedTitle}actions={[{disabled:@@ -55,7 +88,11 @@ function ConfirmationDialogController({loading,onClick: async () => {try {- await onConfirm();+ await (+ onConfirm as (+ value: TValue | undefined,+ ) => void | Promise<void>+ )(selectedValue);} catch {return;}@@ -67,7 +104,7 @@ function ConfirmationDialogController({]}><Dialog.Body>- <p className="text-muted-foreground text-sm">{text}</p>+ <p className="text-muted-foreground text-sm">{resolvedText}</p>{error ? (<div className="rounded border border-red-200 bg-red-50 p-3 text-sm text-red-700"><p className="font-bold">Error:</p>@@ -97,7 +134,15 @@ function ConfirmationDialogController({</Dialog>)}>- {children}+ {(control) =>+ children({+ isOpen: control.isOpen,+ openDialog: ((value?: TValue) => {+ setSelectedValue(() => value);+ control.openDialog();+ }) as ConfirmationDialogValueCallback<TValue, void>,+ })+ }</DialogController>);}diff --git a/web/src/components/design-system/table/Table.tsx b/web/src/components/design-system/table/Table.tsxindex 03ccd85964..046c5f5e7e 100644--- a/web/src/components/design-system/table/Table.tsx+++ b/web/src/components/design-system/table/Table.tsx@@ -2,6 +2,9 @@import { type OrderByState } from "@langfuse/shared";import {type ColumnDef,+ type ColumnOrderState,+ type OnChangeFn,+ type VisibilityState,flexRender,getCoreRowModel,useReactTable,@@ -11,6 +14,7 @@ import { type ComponentProps, useMemo } from "react";import { DropdownMenu } from "@/src/components/design-system/DropdownMenu/DropdownMenu";import { IconButton } from "@/src/components/design-system/IconButton/IconButton";+import DocPopup from "@/src/components/layouts/doc-popup";import { Skeleton } from "@/src/components/ui/skeleton";import { cn } from "@/src/utils/tailwind";@@ -37,6 +41,10 @@ export interface TableProps<TData> {loadingRowCount?: number;noResultsMessage?: React.ReactNode;onRowClick?: (row: TData, event?: React.MouseEvent) => void;+ columnVisibility?: VisibilityState;+ onColumnVisibilityChange?: OnChangeFn<VisibilityState>;+ columnOrder?: ColumnOrderState;+ onColumnOrderChange?: OnChangeFn<ColumnOrderState>;}export function Table<TData extends object>({@@ -49,6 +57,10 @@ export function Table<TData extends object>({loadingRowCount = 8,noResultsMessage = "No results",onRowClick,+ columnVisibility,+ onColumnVisibilityChange,+ columnOrder,+ onColumnOrderChange,}: TableProps<TData>) {const tableColumns = useMemo<ColumnDef<TData>[]>(() => {if (!actions) return columns;@@ -96,6 +108,9 @@ export function Table<TData extends object>({columns: tableColumns,getCoreRowModel: getCoreRowModel(),columnResizeMode: "onChange",+ state: { columnVisibility, columnOrder },+ onColumnVisibilityChange,+ onColumnOrderChange,});const visibleColumns = table.getVisibleLeafColumns();@@ -198,6 +213,12 @@ export function Table<TData extends object>({)}</button>)}+ {column.headerTooltip && (+ <DocPopup+ description={column.headerTooltip.description}+ href={column.headerTooltip.href}+ />+ )}</div>{header.column.getCanResize() && (<buttondiff --git a/web/src/components/design-system/table/columns/createBadgeListTableColumn.tsx b/web/src/components/design-system/table/columns/createBadgeListTableColumn.tsxnew file mode 100644index 0000000000..39a5ebd978--- /dev/null+++ b/web/src/components/design-system/table/columns/createBadgeListTableColumn.tsx@@ -0,0 +1,104 @@+/* eslint-disable boundaries/dependencies */+import { type CellContext, type RowData } from "@tanstack/react-table";+import { type LucideIcon } from "lucide-react";++import { Badge, type BadgeProps } from "@/src/components/ui/badge";+import { Skeleton } from "@/src/components/ui/skeleton";+import { cn } from "@/src/utils/tailwind";+import {+ createTableColumn,+ type TableColumnOptions,+} from "./utils/createTableColumn";++type BadgeVariant = NonNullable<BadgeProps["variant"]>;+type SemanticBadgeVariant = Extract<+ BadgeVariant,+ "destructive" | "error" | "success" | "warning"+>;+type DecorativeBadgeVariant = Extract<+ BadgeVariant,+ | "blue"+ | "violet"+ | "teal"+ | "emerald"+ | "purple"+ | "pink"+ | "orange"+ | "amber"+ | "green"+>;+type NeutralBadgeVariant = Extract<+ BadgeVariant,+ "default" | "secondary" | "tertiary"+>;++type GetBadge<TData extends RowData, TVariant extends BadgeVariant> = (+ value: string,+ context: CellContext<TData, string[] | null | undefined>,+) => {+ value: string;+ variant: TVariant;+ icon?: LucideIcon;+};++type BadgeListTableColumnOptions<TData extends RowData> =+ | (TableColumnOptions<TData, string[]> & {+ range: "decorative";+ getBadge: GetBadge<TData, DecorativeBadgeVariant>;+ })+ | (TableColumnOptions<TData, string[]> & {+ range?: "neutral";+ getBadge?: GetBadge<TData, NeutralBadgeVariant>;+ })+ | (TableColumnOptions<TData, string[]> & {+ range: "semantic";+ getBadge: GetBadge<TData, SemanticBadgeVariant>;+ });++export function createBadgeListTableColumn<TData extends RowData>({+ getBadge,+ nullValue,+ range,+ shouldWrap,+ ...options+}: BadgeListTableColumnOptions<TData> & {+ nullValue?: string;+ shouldWrap: boolean;+}) {+ return createTableColumn<TData, string[]>({+ ...options,+ loadingCell: <Skeleton className="h-5 w-16 shrink-0 rounded-sm" />,+ renderCell: (values, context) => {+ if (!values?.length) return nullValue ?? null;++ return (+ <div className={cn("flex gap-1", shouldWrap && "flex-wrap")}>+ {values.map((value, index) => {+ const badge =+ range === "semantic" || range === "decorative"+ ? getBadge(value, context)+ : (getBadge?.(value, context) ?? {+ value,+ variant: "secondary",+ });+ const Icon = badge.icon;++ return (+ <Badge+ key={`${value}-${index}`}+ variant={badge.variant}+ className="max-w-fit gap-1 truncate rounded-sm px-1 font-normal"+ title={badge.value}+ >+ {Icon && <Icon className="size-3 shrink-0" aria-hidden />}+ <span className="truncate" title={badge.value}>+ {badge.value}+ </span>+ </Badge>+ );+ })}+ </div>+ );+ },+ });+}diff --git a/web/src/components/design-system/table/columns/createTextTableColumn.tsx b/web/src/components/design-system/table/columns/createTextTableColumn.tsxindex aab1ae799f..bdfff2df81 100644--- a/web/src/components/design-system/table/columns/createTextTableColumn.tsx+++ b/web/src/components/design-system/table/columns/createTextTableColumn.tsx@@ -22,8 +22,9 @@ type TextTableColumnOptions<TData extends RowData, TValue> = TableColumnOptions<export function createTextTableColumn<TData extends RowData, TValue = string>({mapValue,+ nullValue,...options-}: TextTableColumnOptions<TData, TValue>) {+}: TextTableColumnOptions<TData, TValue> & { nullValue?: string }) {const loadingCell = <Skeleton className="h-4 w-1/2" />;return createTableColumn<TData, TValue>({@@ -32,7 +33,13 @@ export function createTextTableColumn<TData extends RowData, TValue = string>({renderCell: (value, context) => {const text = mapValue ? mapValue(value, context) : value;- if (text === null || text === undefined) return null;+ if (text === null || text === undefined) {+ return nullValue ? (+ <span className="block w-full truncate" title={nullValue}>+ {nullValue}+ </span>+ ) : null;+ }if (typeof text !== "string") return loadingCell;return (diff --git a/web/src/components/design-system/table/columns/createUserTableColumn.tsx b/web/src/components/design-system/table/columns/createUserTableColumn.tsxindex 7b1ef20141..5f5506c5ce 100644--- a/web/src/components/design-system/table/columns/createUserTableColumn.tsx+++ b/web/src/components/design-system/table/columns/createUserTableColumn.tsx@@ -17,6 +17,10 @@ type UserTableColumnValue = {};type UserTableColumnPresentation = { variant: "avatar" } | { variant: "text" };+type UserTableColumnCell =+ | { type: "loading" }+ | { type: "user"; user: UserTableColumnValue }+ | undefined;export function createUserTableColumn<TData extends RowData,@@ -24,6 +28,7 @@ export function createUserTableColumn<>({getUser,emptyValue,+ nullValue,variant,...options}: TableColumnOptions<TData, TValue> &@@ -33,6 +38,7 @@ export function createUserTableColumn<* the shared empty placeholder.*/emptyValue?: string;+ nullValue?: string;/*** Return undefined when the row has no associated user. Return a user with* an empty object when a user exists but their identity is unknown.@@ -40,16 +46,13 @@ export function createUserTableColumn<getUser?: (value: TValue | null | undefined,context: CellContext<TData, TValue | null | undefined>,- ) =>- | { type: "loading" }- | { type: "user"; user: UserTableColumnValue }- | undefined;+ ) => UserTableColumnCell;}) {const loadingCell =variant === "avatar" ? (- <div className="flex items-center space-x-2">+ <div className="flex w-full min-w-0 items-center space-x-2"><Skeleton className="h-7 w-7 shrink-0 rounded-full" />- <Skeleton className="h-4 w-1/2" />+ <Skeleton className="h-4 max-w-24 min-w-12 flex-1" /></div>) : (<Skeleton className="h-4 w-1/2" />@@ -59,9 +62,23 @@ export function createUserTableColumn<...options,loadingCell,renderCell: (value, context) => {- const cell = getUser- ? getUser(value, context)- : { type: "user" as const, user: value ?? {} };+ if (!getUser && (value === null || value === undefined)) {+ const placeholder = nullValue ?? emptyValue;+ if (!placeholder) return null;+ return (+ <span className="block w-full truncate" title={placeholder}>+ {placeholder}+ </span>+ );+ }++ let cell: UserTableColumnCell;+ if (getUser) {+ cell = getUser(value, context);+ } else if (value !== null && value !== undefined) {+ cell = { type: "user", user: value };+ }+if (!cell) return null;if (cell.type === "loading") return loadingCell;diff --git a/web/src/features/projects/ProjectSettingsPage.tsx b/web/src/features/projects/ProjectSettingsPage.tsxindex 11f4295f5d..182d40c791 100644--- a/web/src/features/projects/ProjectSettingsPage.tsx+++ b/web/src/features/projects/ProjectSettingsPage.tsx@@ -8,8 +8,8 @@ import Link from "next/link";import { LlmApiKeyList } from "@/src/features/public-api/components/LLMApiKeyList";import { PagedSettingsContainer } from "@/src/components/PagedSettingsContainer";import { useQueryProject } from "@/src/features/projects/hooks";-import { MembershipInvitesPage } from "@/src/features/rbac/components/MembershipInvitesPage";-import { MembersTable } from "@/src/features/rbac/components/MembersTable";+import { ConnectedMembershipInvitesSettingsTable } from "@/src/features/rbac/components/MembershipInvitesSettingsTable/ConnectedMembershipInvitesSettingsTable";+import { ConnectedMembersSettingsTable } from "@/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable";import { JSONView } from "@/src/components/ui/CodeJsonViewer";import { PostHogLogo } from "@/src/components/PosthogLogo";import { MixpanelLogo } from "@/src/components/MixpanelLogo";@@ -17,6 +17,7 @@ import { Card } from "@/src/components/ui/card";import { TransferProjectDialogController } from "@/src/features/projects/components/TransferProjectDialogController";import { useHasEntitlement } from "@/src/features/entitlements/hooks";import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";+import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";import { useRouter } from "next/router";import { SettingsDangerZone } from "@/src/components/SettingsDangerZone";import { ActionButton } from "@/src/components/ActionButton";@@ -33,9 +34,11 @@ import { ScoreConfigSettings } from "@/src/features/score-configs/components/Scoimport { env } from "@/src/env.mjs";import { PersonalNotificationSettings } from "@/src/features/notifications/components/PersonalNotificationSettings";import { ProjectNotificationChannels } from "@/src/features/notifications/components/ProjectNotificationChannels";+import useSessionStorage from "@/src/components/useSessionStorage";import { WebCalloutIntegrationCard } from "@/src/features/web-callouts/components/WebCalloutSettingsPage";import { DeveloperToolsSettings } from "@/src/features/developer-tools/components/DeveloperToolsSettings";import { useV4UpgradeUiFlag } from "@/src/features/v4-migration/useV4UpgradeUiEnabled";+import { api } from "@/src/utils/api";type ProjectSettingsPageEntry = {title: string;@@ -246,20 +249,10 @@ const getProjectSettingsPages = ({slug: "members",cmdKKeywords: ["invite", "user"],content: (- <div>- <Header title="Project Members" />- <MembersTable- orgId={organization.id}- project={{ id: project.id, name: project.name }}- showSettingsCard- />- <div>- <MembershipInvitesPage- orgId={organization.id}- projectId={project.id}- />- </div>- </div>+ <ProjectMembersSettings+ orgId={organization.id}+ project={{ id: project.id, name: project.name }}+ />),},{@@ -349,6 +342,64 @@ export default function ProjectSettingsPage() {);}+function ProjectMembersSettings({+ orgId,+ project,+}: {+ orgId: string;+ project: { id: string; name: string };+}) {+ const [invitesPagination, setInvitesPagination] = useSessionStorage(+ `projectInvites_${project.id}_pagination`,+ { pageIndex: 0, pageSize: 10 },+ );++ const hasOrgViewAccess = useHasOrganizationAccess({+ organizationId: orgId,+ scope: "organizationMembers:read",+ });++ const hasProjectViewAccess =+ useHasProjectAccess({+ projectId: project.id,+ scope: "projectMembers:read",+ }) || hasOrgViewAccess;++ const membershipInvites = api.members.allInvitesFromProject.useQuery(+ {+ projectId: project.id,+ page: invitesPagination.pageIndex,+ limit: invitesPagination.pageSize,+ },+ { enabled: hasProjectViewAccess },+ );++ return (+ <div className="flex flex-col gap-6">+ <div>+ <Header title="Project Members" />+ <ConnectedMembersSettingsTable orgId={orgId} project={project} />+ </div>+ {hasProjectViewAccess && (+ <div+ className={+ membershipInvites.data?.totalCount === 0 ? "hidden" : undefined+ }+ >+ <Header title="Membership Invites" />+ <ConnectedMembershipInvitesSettingsTable+ orgId={orgId}+ projectId={project.id}+ query={membershipInvites}+ paginationState={invitesPagination}+ setPaginationState={setInvitesPagination}+ />+ </div>+ )}+ </div>+ );+}+const Integrations = (props: { projectId: string }) => {const hasAccess = useHasProjectAccess({projectId: props.projectId,diff --git a/web/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable.tsx b/web/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable.tsxnew file mode 100644index 0000000000..f34d0f5495--- /dev/null+++ b/web/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable.tsx@@ -0,0 +1,326 @@+import { useEffect, useMemo, useState } from "react";+import { PlusIcon } from "lucide-react";+import { useSession } from "next-auth/react";+import { StringParam, useQueryParam, withDefault } from "use-query-params";++import { Alert } from "@/src/components/design-system/Alert/Alert";+import { type AsyncTableData } from "@/src/components/design-system/table/Table";+import useSessionStorage from "@/src/components/useSessionStorage";+import { env } from "@/src/env.mjs";+import { useHasEntitlement } from "@/src/features/entitlements";+import { showSuccessToast } from "@/src/features/notifications";+import { CreateProjectMemberDialogController } from "@/src/features/rbac/components/CreateProjectMemberDialogController";+import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";+import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";+import { api } from "@/src/utils/api";+import { safeExtract } from "@/src/utils/map-utils";+import type { RouterOutput } from "@/src/utils/types";+import {+ MembersSettingsTable,+ type MembersSettingsTableRow,+} from "./MembersSettingsTable";++export function ConnectedMembersSettingsTable({+ orgId,+ project,+}: {+ orgId: string;+ project?: { id: string; name: string };+}) {+ const session = useSession();++ const utils = api.useUtils();++ const hasOrgViewAccess = useHasOrganizationAccess({+ organizationId: orgId,+ scope: "organizationMembers:read",+ });++ const hasProjectViewAccess =+ useHasProjectAccess({+ projectId: project?.id,+ scope: "projectMembers:read",+ }) || hasOrgViewAccess;++ const hasOrgCudAccess = useHasOrganizationAccess({+ organizationId: orgId,+ scope: "organizationMembers:CUD",+ });++ const hasProjectCudAccess = useHasProjectAccess({+ projectId: project?.id,+ scope: "projectMembers:CUD",+ });++ const projectRolesEntitlement = useHasEntitlement("rbac-project-roles");+ const [updatingOrgRoleMembershipIds, setUpdatingOrgRoleMembershipIds] =+ useState<Set<string>>(() => new Set());+ const [+ updatingProjectRoleMembershipIds,+ setUpdatingProjectRoleMembershipIds,+ ] = useState<Set<string>>(() => new Set());++ const [searchQuery, setSearchQuery] = useQueryParam(+ "search",+ withDefault(StringParam, null),+ );++ const [paginationState, setPaginationState] = useSessionStorage(+ project+ ? `projectMembers_${project.id}_pagination`+ : `orgMembers_${orgId}_pagination`,+ { pageIndex: 0, pageSize: 10 },+ );++ useEffect(() => {+ setPaginationState((previous) => ({+ pageIndex: 0,+ pageSize: previous.pageSize,+ }));+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [searchQuery]);++ const membersViaOrg = api.members.allFromOrg.useQuery(+ {+ orgId,+ searchQuery: searchQuery ?? undefined,+ page: paginationState.pageIndex,+ limit: paginationState.pageSize,+ },+ { enabled: !project && hasOrgViewAccess },+ );++ const membersViaProject = api.members.allFromProject.useQuery(+ {+ projectId: project?.id ?? "NOT ENABLED",+ searchQuery: searchQuery ?? undefined,+ page: paginationState.pageIndex,+ limit: paginationState.pageSize,+ },+ { enabled: Boolean(project) && hasProjectViewAccess },+ );+ const members = project ? membersViaProject : membersViaOrg;++ const deleteMember = api.members.deleteMembership.useMutation({+ onSuccess: (data) => {+ if (data.userId === session.data?.user?.id) session.update();+ utils.members.invalidate();+ },+ });++ const updateOrgRole = api.members.updateOrgMembership.useMutation({+ onSuccess: (data) => {+ utils.members.invalidate();+ if (data.userId === session.data?.user?.id) session.update();+ showSuccessToast({+ title: "Saved",+ description: "Organization role updated successfully",+ duration: 2000,+ });+ },+ });++ const updateProjectRole = api.members.updateProjectRole.useMutation({+ onSuccess: (data) => {+ utils.members.invalidate();+ if (data.userId === session.data?.user?.id) session.update();+ showSuccessToast({+ title: "Saved",+ description: "Project role updated successfully",+ duration: 2000,+ });+ },+ });++ const tableData = useMemo<AsyncTableData<MembersSettingsTableRow[]>>(() => {+ if (members.isPending) return { status: "loading" };+ if (members.isError)+ return { status: "error", error: members.error.message };++ if (project) {+ return {+ status: "success",+ data: safeExtract(membersViaProject.data, "memberships", []).map(+ (membership) => convertToTableRow(membership, null, null),+ ),+ };+ }++ return {+ status: "success",+ data: safeExtract(membersViaOrg.data, "memberships", []).map(+ (membership) =>+ convertToTableRow(+ membership,+ membership.featurePreviews,+ membership.featurePreviewManagement,+ ),+ ),+ };+ }, [+ members.error,+ members.isError,+ members.isPending,+ membersViaOrg.data,+ membersViaProject.data,+ project,+ ]);++ if (project ? !hasProjectViewAccess : !hasOrgViewAccess) {+ return (+ <Alert>+ <Alert.Title>Access Denied</Alert.Title>+ <Alert.Description>+ You do not have permission to view members of this organization.+ </Alert.Description>+ </Alert>+ );+ }++ return (+ <CreateProjectMemberDialogController orgId={orgId} project={project}>+ {({+ hasAccess,+ hasOnlySingleProjectAccess,+ isSubmitting,+ usageLimit,+ openDialog,+ }) => (+ <MembersSettingsTable+ orgId={orgId}+ project={project}+ currentUserId={session.data?.user?.id}+ hasOrgCudAccess={hasOrgCudAccess}+ hasProjectCudAccess={hasProjectCudAccess}+ projectRolesEntitlement={projectRolesEntitlement}+ showFeaturePreviews={+ !project && hasOrgCudAccess && orgId !== env.NEXT_PUBLIC_DEMO_ORG_ID+ }+ updatingOrgRoleMembershipIds={updatingOrgRoleMembershipIds}+ updatingProjectRoleMembershipIds={updatingProjectRoleMembershipIds}+ onDelete={(member) => {+ const isCurrentUser = member.meta.userId === session.data?.user?.id;+ if (+ !confirm(+ isCurrentUser+ ? "Are you sure you want to leave the organization?"+ : "Are you sure you want to remove this member from the organization?",+ )+ ) {+ return;+ }+ deleteMember.mutate({+ orgId,+ orgMembershipId: member.meta.orgMembershipId,+ });+ }}+ onUpdateOrgRole={(member, role) => {+ if (+ member.meta.userId === session.data?.user?.id &&+ !confirm(+ "Are you sure that you want to change your own organization role?",+ )+ ) {+ return;+ }+ const membershipId = member.meta.orgMembershipId;+ setUpdatingOrgRoleMembershipIds((current) =>+ new Set(current).add(membershipId),+ );+ updateOrgRole.mutate(+ { orgId, orgMembershipId: membershipId, role },+ {+ onSettled: () =>+ setUpdatingOrgRoleMembershipIds((current) => {+ const next = new Set(current);+ next.delete(membershipId);+ return next;+ }),+ },+ );+ }}+ onUpdateProjectRole={(member, projectRole) => {+ if (!project) return;+ if (+ member.meta.userId === session.data?.user?.id &&+ !confirm(+ "Are you sure that you want to change your own project role?",+ )+ ) {+ return;+ }+ const membershipId = member.meta.orgMembershipId;+ setUpdatingProjectRoleMembershipIds((current) =>+ new Set(current).add(membershipId),+ );+ updateProjectRole.mutate(+ {+ orgId,+ orgMembershipId: membershipId,+ projectId: project.id,+ userId: member.meta.userId,+ projectRole,+ },+ {+ onSettled: () =>+ setUpdatingProjectRoleMembershipIds((current) => {+ const next = new Set(current);+ next.delete(membershipId);+ return next;+ }),+ },+ );+ }}+ data={tableData}+ loadingRowCount={paginationState.pageSize}+ search={{+ value: searchQuery ?? "",+ onChange: (value) => setSearchQuery(value || null),+ }}+ toolbarActions={[+ {+ id: "add-member",+ label: hasOnlySingleProjectAccess+ ? "Add project member"+ : "Add new member",+ variant: "secondary",+ loading: isSubmitting,+ hasAccess,+ usageLimit,+ icon: <PlusIcon className="size-4" aria-hidden="true" />,+ onClick: openDialog,+ },+ ]}+ pagination={{+ totalCount: members.data?.totalCount ?? null,+ onChange: setPaginationState,+ state: paginationState,+ }}+ />+ )}+ </CreateProjectMemberDialogController>+ );+}++function convertToTableRow(+ membership:+ | RouterOutput["members"]["allFromOrg"]["memberships"][number]+ | RouterOutput["members"]["allFromProject"]["memberships"][number],+ featurePreviews: MembersSettingsTableRow["featurePreviews"],+ featurePreviewManagement: MembersSettingsTableRow["featurePreviewManagement"],+): MembersSettingsTableRow {+ return {+ meta: { userId: membership.userId, orgMembershipId: membership.id },+ email: membership.user.email,+ user: { image: membership.user.image, name: membership.user.name },+ providers:+ membership.user.accounts?.map(+ (account: { provider: string }) => account.provider,+ ) ?? [],+ createdAt: membership.createdAt,+ orgRole: membership.role,+ projectRole: membership.projectRole,+ featurePreviews,+ featurePreviewManagement,+ };+}diff --git a/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.stories.tsx b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.stories.tsxnew file mode 100644index 0000000000..cd3a198d5c--- /dev/null+++ b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.stories.tsx@@ -0,0 +1,110 @@+import { fn } from "storybook/test";++import preview from "../../../../../.storybook/preview";+import { MembersSettingsTable } from "./MembersSettingsTable";++const meta = preview.meta({ component: MembersSettingsTable });++export const Default = meta.story({+ args: {+ orgId: "org-1",+ hasOrgCudAccess: true,+ hasProjectCudAccess: false,+ projectRolesEntitlement: true,+ showFeaturePreviews: false,+ updatingOrgRoleMembershipIds: new Set(),+ updatingProjectRoleMembershipIds: new Set(),+ onDelete: fn(),+ onUpdateOrgRole: fn(),+ onUpdateProjectRole: fn(),+ search: { value: "", onChange: fn() },+ toolbarActions: [+ { id: "add-member", label: "Add new member", onClick: fn() },+ ],+ pagination: {+ totalCount: 5,+ state: { pageIndex: 0, pageSize: 10 },+ onChange: fn(),+ },+ data: {+ status: "success",+ data: [+ {+ user: { name: "Ada Lovelace", image: null },+ email: "[email protected]",+ providers: ["google"],+ createdAt: new Date("2026-09-01"),+ orgRole: "ADMIN",+ featurePreviews: null,+ featurePreviewManagement: null,+ meta: { userId: "user-1", orgMembershipId: "membership-1" },+ },+ {+ user: { name: "Grace Hopper", image: null },+ email: "[email protected]",+ providers: ["github"],+ createdAt: new Date("2026-08-14"),+ orgRole: "MEMBER",+ featurePreviews: null,+ featurePreviewManagement: null,+ meta: { userId: "user-2", orgMembershipId: "membership-2" },+ },+ {+ user: { name: "Katherine Johnson", image: null },+ email: "[email protected]",+ providers: [],+ createdAt: new Date("2026-07-03"),+ orgRole: "VIEWER",+ featurePreviews: null,+ featurePreviewManagement: null,+ meta: { userId: "user-3", orgMembershipId: "membership-3" },+ },+ {+ user: { name: "Margaret Hamilton", image: null },+ email: "[email protected]",+ providers: ["google", "github"],+ createdAt: new Date("2026-06-21"),+ orgRole: "ADMIN",+ featurePreviews: null,+ featurePreviewManagement: null,+ meta: { userId: "user-4", orgMembershipId: "membership-4" },+ },+ {+ user: { name: "Dorothy Vaughan", image: null },+ email: "[email protected]",+ providers: ["email"],+ createdAt: new Date("2026-05-09"),+ orgRole: "MEMBER",+ featurePreviews: null,+ featurePreviewManagement: null,+ meta: { userId: "user-5", orgMembershipId: "membership-5" },+ },+ ],+ },+ },+});++export const Loading = meta.story({+ args: {+ orgId: "org-1",+ hasOrgCudAccess: true,+ hasProjectCudAccess: false,+ projectRolesEntitlement: true,+ showFeaturePreviews: false,+ updatingOrgRoleMembershipIds: new Set(),+ updatingProjectRoleMembershipIds: new Set(),+ onDelete: fn(),+ onUpdateOrgRole: fn(),+ onUpdateProjectRole: fn(),+ search: { value: "", onChange: fn() },+ toolbarActions: [+ { id: "add-member", label: "Add new member", onClick: fn() },+ ],+ pagination: {+ totalCount: null,+ state: { pageIndex: 0, pageSize: 10 },+ onChange: fn(),+ },+ data: { status: "loading" },+ },+});diff --git a/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsx b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsxnew file mode 100644index 0000000000..d174cf65d9--- /dev/null+++ b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsx@@ -0,0 +1,325 @@+import { useCallback, useMemo } from "react";+import { Trash } from "lucide-react";+import { type Role } from "@langfuse/shared";++import { type TableProps } from "@/src/components/design-system/table/Table";+import { type PaginationBarProps } from "@/src/components/design-system/PaginationBar/PaginationBar";+import {+ SettingsTable,+ type SettingsTableProps,+} from "@/src/components/SettingsTable/SettingsTable";+import { createDateTableColumn } from "@/src/components/design-system/table/columns/createDateTableColumn";+import { createBadgeListTableColumn } from "@/src/components/design-system/table/columns/createBadgeListTableColumn";+import { createTextTableColumn } from "@/src/components/design-system/table/columns/createTextTableColumn";+import { createUserTableColumn } from "@/src/components/design-system/table/columns/createUserTableColumn";+import { type LangfuseColumnDef } from "@/src/components/table/types";+import { RoleSelectItem } from "@/src/features/rbac/components/RoleSelectItem";+import { orderedRoles } from "@/src/features/rbac/constants/orderedRoles";+import type { FeaturePreviewFlag } from "@/src/features/feature-flags/available-flags";+import { UserFeaturePreviewsControl } from "@/src/features/feature-flags/components/UserFeaturePreviewsPopover";+import type { RouterOutput } from "@/src/utils/types";+import {+ Select,+ SelectContent,+ SelectTrigger,+ SelectValue,+} from "@/src/components/ui/select";+import {+ HoverCard,+ HoverCardContent,+ HoverCardPortal,+ HoverCardTrigger,+} from "@/src/components/ui/hover-card";+import Link from "next/link";+import { Popover, PopoverTrigger } from "@/src/components/ui/popover";+import { Button } from "@/src/components/ui/button";++export type MembersSettingsTableRow = {+ user: { image: string | null; name: string | null };+ email: string | null;+ providers: string[];+ createdAt: Date;+ orgRole: Role;+ projectRole?: Role;+ featurePreviews: Record<FeaturePreviewFlag, boolean> | null;+ featurePreviewManagement:+ | RouterOutput["members"]["allFromOrg"]["memberships"][number]["featurePreviewManagement"]+ | null;+ meta: { userId: string; orgMembershipId: string };+};++type MembersSettingsTableProps = Pick<+ TableProps<MembersSettingsTableRow>,+ "data" | "loadingRowCount"+> & {+ orgId: string;+ project?: { id: string; name: string };+ currentUserId?: string;+ hasOrgCudAccess: boolean;+ hasProjectCudAccess: boolean;+ projectRolesEntitlement: boolean;+ showFeaturePreviews: boolean;+ updatingOrgRoleMembershipIds: ReadonlySet<string>;+ updatingProjectRoleMembershipIds: ReadonlySet<string>;+ onDelete: (member: MembersSettingsTableRow) => void;+ onUpdateOrgRole: (member: MembersSettingsTableRow, role: Role) => void;+ onUpdateProjectRole: (member: MembersSettingsTableRow, role: Role) => void;+ search: {+ value: string;+ onChange: (value: string) => void;+ };+ toolbarActions: SettingsTableProps<MembersSettingsTableRow>["toolbarActions"];+ pagination: PaginationBarProps;+};++export function MembersSettingsTable({+ orgId,+ project,+ currentUserId,+ hasOrgCudAccess,+ hasProjectCudAccess,+ projectRolesEntitlement,+ showFeaturePreviews,+ updatingOrgRoleMembershipIds,+ updatingProjectRoleMembershipIds,+ onDelete,+ onUpdateOrgRole,+ onUpdateProjectRole,+ search,+ toolbarActions,+ pagination,+ ...tableProps+}: MembersSettingsTableProps) {+ const columns = useMemo<LangfuseColumnDef<MembersSettingsTableRow>[]>(+ () => [+ createUserTableColumn<MembersSettingsTableRow>({+ accessorKey: "user",+ header: "Name",+ variant: "avatar",+ }),+ createTextTableColumn<MembersSettingsTableRow>({+ accessorKey: "email",+ header: "Email",+ nullValue: "-",+ }),+ createBadgeListTableColumn<MembersSettingsTableRow>({+ accessorKey: "providers",+ header: "SSO Provider",+ enableHiding: true,+ nullValue: "-",+ shouldWrap: true,+ }),+ {+ accessorKey: "orgRole",+ header: "Organization Role",+ headerTooltip: {+ description:+ "The organization role is the default role for this user across the organization and its projects.",+ href: "https://langfuse.com/docs/administration/rbac",+ },+ size: 160,+ cell: ({ row }) => {+ const select = (+ <RoleSelect+ value={row.original.orgRole}+ disabled={+ !hasOrgCudAccess ||+ Boolean(project) ||+ updatingOrgRoleMembershipIds.has(+ row.original.meta.orgMembershipId,+ )+ }+ onChange={(role) => onUpdateOrgRole(row.original, role)}+ />+ );++ if (!project || !hasOrgCudAccess) return select;++ return (+ <HoverCard openDelay={0} closeDelay={0}>+ <HoverCardTrigger asChild>{select}</HoverCardTrigger>+ <HoverCardPortal>+ <HoverCardContent align="center" side="right">+ <p className="text-xs">+ The organization-level role can be edited in the{" "}+ <Link+ href={`/organization/${orgId}/settings/members`}+ className="underline"+ >+ organization settings+ </Link>+ .+ </p>+ </HoverCardContent>+ </HoverCardPortal>+ </HoverCard>+ );+ },+ },+ ...(project+ ? ([+ {+ accessorKey: "projectRole",+ header: "Project Role",+ headerTooltip: {+ description:+ "The project role applies to this project and overrides the default organization role.",+ href: "https://langfuse.com/docs/administration/rbac",+ },+ size: 160,+ cell: ({ row }) => {+ if (!projectRolesEntitlement) return "N/A on plan";+ return (+ <RoleSelect+ value={row.original.projectRole ?? "NONE"}+ isProjectRole+ disabled={+ (!hasOrgCudAccess && !hasProjectCudAccess) ||+ updatingProjectRoleMembershipIds.has(+ row.original.meta.orgMembershipId,+ )+ }+ onChange={(role) => onUpdateProjectRole(row.original, role)}+ />+ );+ },+ },+ ] satisfies LangfuseColumnDef<MembersSettingsTableRow>[])+ : []),+ ...(showFeaturePreviews+ ? ([+ {+ accessorKey: "featurePreviews",+ header: "Feature Previews",+ enableHiding: true,+ size: 140,+ cell: ({ row }) => {+ const { featurePreviews, featurePreviewManagement, meta } =+ row.original;+ if (!featurePreviews || !featurePreviewManagement) return null;+ return (+ <Popover>+ <UserFeaturePreviewsControl+ orgId={orgId}+ userId={meta.userId}+ featurePreviews={featurePreviews}+ management={featurePreviewManagement}+ >+ {({ enabledCount, totalCount, content }) => (+ <>+ <PopoverTrigger asChild>+ <Button variant="outline" size="sm">+ {enabledCount}/{totalCount} enabled+ </Button>+ </PopoverTrigger>+ {content}+ </>+ )}+ </UserFeaturePreviewsControl>+ </Popover>+ );+ },+ },+ ] satisfies LangfuseColumnDef<MembersSettingsTableRow>[])+ : []),+ createDateTableColumn<MembersSettingsTableRow>({+ accessorKey: "createdAt",+ header: "Member Since",+ enableHiding: true,+ defaultHidden: true,+ mode: "relative",+ }),+ ],+ [+ hasOrgCudAccess,+ hasProjectCudAccess,+ onUpdateOrgRole,+ onUpdateProjectRole,+ orgId,+ project,+ projectRolesEntitlement,+ showFeaturePreviews,+ updatingOrgRoleMembershipIds,+ updatingProjectRoleMembershipIds,+ ],+ );+ const actions = useCallback<+ NonNullable<TableProps<MembersSettingsTableRow>["actions"]>+ >(+ (member) => [+ {+ id: "delete",+ type: "item",+ title:+ member.meta.userId === currentUserId+ ? "Leave organization"+ : "Remove member",+ icon: Trash,+ variant: "destructive",+ disabled:+ hasOrgCudAccess || member.meta.userId === currentUserId+ ? undefined+ : { reason: "You do not have permission to remove this member" },+ onClick: () => onDelete(member),+ },+ ],+ [currentUserId, hasOrgCudAccess, onDelete],+ );++ return (+ <SettingsTable+ tableName={project ? "project members" : "organization members"}+ columns={columns}+ actions={actions}+ columnVisibilityKey={+ project+ ? "membersColumnVisibilityProject"+ : "membersColumnVisibilityOrg"+ }+ columnOrderKey={+ project ? "membersColumnOrderProject" : "membersColumnOrderOrg"+ }+ search={{+ value: search.value,+ placeholder: "Search name or email",+ onChange: search.onChange,+ }}+ toolbarActions={toolbarActions}+ pagination={pagination}+ {...tableProps}+ />+ );+}++function RoleSelect({+ value,+ disabled,+ isProjectRole = false,+ onChange,+}: {+ value: Role;+ disabled: boolean;+ isProjectRole?: boolean;+ onChange: (role: Role) => void;+}) {+ return (+ <Select+ disabled={disabled}+ value={value}+ onValueChange={(role) => onChange(role as Role)}+ >+ <SelectTrigger className="w-[120px]">+ <SelectValue />+ </SelectTrigger>+ <SelectContent>+ {(Object.keys(orderedRoles) as Role[]).map((role) => (+ <RoleSelectItem+ role={role}+ key={role}+ isProjectRole={isProjectRole}+ />+ ))}+ </SelectContent>+ </Select>+ );+}diff --git a/web/src/features/rbac/components/MembersTable.tsx b/web/src/features/rbac/components/MembersTable.tsxdeleted file mode 100644index 266270f91f..0000000000--- a/web/src/features/rbac/components/MembersTable.tsx+++ /dev/null@@ -1,646 +0,0 @@-/* eslint-disable no-nested-ternary */-import { DataTable } from "@/src/components/table/data-table";-import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";-import { type LangfuseColumnDef } from "@/src/components/table/types";-import { Avatar } from "@/src/components/design-system/Avatar/Avatar";-import {- Select,- SelectContent,- SelectTrigger,- SelectValue,-} from "@/src/components/ui/select";-import {- useColumnOrder,- useColumnVisibility,-} from "@/src/features/column-visibility";-import { ActionButton } from "@/src/components/ActionButton";-import { CreateProjectMemberDialogController } from "@/src/features/rbac/components/CreateProjectMemberDialogController";-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";-import { api } from "@/src/utils/api";-import { safeExtract } from "@/src/utils/map-utils";-import type { RouterOutput } from "@/src/utils/types";-import { Role } from "@langfuse/shared";-import { PlusIcon, Trash } from "lucide-react";-import { useSession } from "next-auth/react";-import { Alert } from "@/src/components/design-system/Alert/Alert";-import { useHasEntitlement } from "@/src/features/entitlements";-import { showSuccessToast } from "@/src/features/notifications";-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";-import { RoleSelectItem } from "@/src/features/rbac/components/RoleSelectItem";-import {- HoverCard,- HoverCardContent,- HoverCardTrigger,- HoverCardPortal,-} from "@/src/components/ui/hover-card";-import Link from "next/link";-import { createDateTableColumn } from "@/src/components/design-system/table/columns/createDateTableColumn";-import { SettingsTableCard } from "@/src/components/layouts/settings-table-card";-import useSessionStorage from "@/src/components/useSessionStorage";-import { useQueryParam, withDefault, StringParam } from "use-query-params";-import { useEffect } from "react";-import { UserFeaturePreviewsControl } from "@/src/features/feature-flags/components/UserFeaturePreviewsPopover";-import type { FeaturePreviewFlag } from "@/src/features/feature-flags/available-flags";-import { env } from "@/src/env.mjs";-import { createTextTableColumn } from "@/src/components/design-system/table/columns/createTextTableColumn";-import { Button } from "@/src/components/ui/button";-import { Popover, PopoverTrigger } from "@/src/components/ui/popover";--export type MembersTableRow = {- user: {- image: string | null;- name: string | null;- };- email: string | null;- providers: string[];- createdAt: Date;- orgRole: Role;- projectRole?: Role;- featurePreviews: Record<FeaturePreviewFlag, boolean> | null;- featurePreviewManagement:- | RouterOutput["members"]["allFromOrg"]["memberships"][number]["featurePreviewManagement"]- | null;- meta: {- userId: string;- orgMembershipId: string;- };-};--export function MembersTable({- orgId,- project,- showSettingsCard = false,-}: {- orgId: string;- project?: { id: string; name: string };- showSettingsCard?: boolean;-}) {- // Create a unique key for this table's pagination state- const paginationKey = project- ? `projectMembers_${project.id}_pagination`- : `orgMembers_${orgId}_pagination`;-- const session = useSession();- const hasOrgViewAccess = useHasOrganizationAccess({- organizationId: orgId,- scope: "organizationMembers:read",- });- const hasProjectViewAccess =- useHasProjectAccess({- projectId: project?.id,- scope: "projectMembers:read",- }) || hasOrgViewAccess;- const [paginationState, setPaginationState] = useSessionStorage(- paginationKey,- {- pageIndex: 0,- pageSize: 10,- },- );-- const [searchQuery, setSearchQuery] = useQueryParam(- "search",- withDefault(StringParam, null),- );-- useEffect(() => {- setPaginationState((prev) => ({- pageIndex: 0,- pageSize: prev.pageSize,- }));- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [searchQuery]);-- const membersViaOrg = api.members.allFromOrg.useQuery(- {- orgId,- searchQuery: searchQuery ?? undefined,- page: paginationState.pageIndex,- limit: paginationState.pageSize,- },- {- enabled: !project && hasOrgViewAccess,- },- );- const membersViaProject = api.members.allFromProject.useQuery(- {- projectId: project?.id ?? "NOT ENABLED",- searchQuery: searchQuery ?? undefined,- page: paginationState.pageIndex,- limit: paginationState.pageSize,- },- {- enabled: project !== undefined && hasProjectViewAccess,- },- );- const members = project ? membersViaProject : membersViaOrg;-- const totalCount = members.data?.totalCount ?? null;-- const utils = api.useUtils();-- const mutDeleteMember = api.members.deleteMembership.useMutation({- onSuccess: (data) => {- if (data.userId === session.data?.user?.id) session.update();- utils.members.invalidate();- },- });-- const hasCudAccessOrgLevel = useHasOrganizationAccess({- organizationId: orgId,- scope: "organizationMembers:CUD",- });- const hasCudAccessProjectLevel = useHasProjectAccess({- projectId: project?.id,- scope: "projectMembers:CUD",- });-- const projectRolesEntitlement = useHasEntitlement("rbac-project-roles");-- const columns: LangfuseColumnDef<MembersTableRow>[] = [- {- accessorKey: "user",- id: "user",- header: "Name",- cell: ({ row }) => {- const { name, image } = row.getValue("user") as MembersTableRow["user"];- return (- <div className="flex items-center space-x-2">- <Avatar- size="md"- src={image ?? undefined}- displayName={name ?? "User"}- />- <span>{name}</span>- </div>- );- },- },- createTextTableColumn<MembersTableRow>({- accessorKey: "email",- header: "Email",- }),- createTextTableColumn<MembersTableRow, string[]>({- accessorKey: "providers",- header: "SSO Provider",- enableHiding: true,- mapValue: (providers) => (providers?.length ? providers.join(", ") : "-"),- }),- {- accessorKey: "orgRole",- id: "orgRole",- header: "Organization Role",- headerTooltip: {- description:- "The org-role is the default role for this user in this organization and applies to the organization and all its projects.",- href: "https://langfuse.com/docs/administration/rbac",- },- cell: ({ row }) => {- const orgRole = row.getValue("orgRole") as MembersTableRow["orgRole"];- const { orgMembershipId } = row.getValue(- "meta",- ) as MembersTableRow["meta"];- const { userId } = row.getValue("meta") as MembersTableRow["meta"];- const disableInProjectSettings = Boolean(project?.id);-- const ConfiguredOrgRoleDropdown = () => (- <OrgRoleDropdown- orgMembershipId={orgMembershipId}- currentRole={orgRole}- userId={userId}- orgId={orgId}- hasCudAccess={hasCudAccessOrgLevel && !disableInProjectSettings}- />- );-- return (- <div className="relative">- {disableInProjectSettings && hasCudAccessOrgLevel ? (- <HoverCard openDelay={0} closeDelay={0}>- <HoverCardTrigger>- <ConfiguredOrgRoleDropdown />- </HoverCardTrigger>- <HoverCardPortal>- <HoverCardContent- hideWhenDetached={true}- align="center"- side="right"- >- <p className="text-xs">- The organization-level role can be edited in the{" "}- <Link- href={`/organization/${orgId}/settings/members`}- className="underline"- >- organization settings- </Link>- .- </p>- </HoverCardContent>- </HoverCardPortal>- </HoverCard>- ) : (- <ConfiguredOrgRoleDropdown />- )}- </div>- );- },- },- ...(project- ? ([- {- accessorKey: "projectRole",- id: "projectRole",- header: "Project Role",- headerTooltip: {- description:- "The role for this user in this specific project. This role overrides the default project role.",- href: "https://langfuse.com/docs/administration/rbac",- },- cell: ({ row }) => {- const projectRole = row.getValue(- "projectRole",- ) as MembersTableRow["projectRole"];- const { orgMembershipId, userId } = row.getValue(- "meta",- ) as MembersTableRow["meta"];-- if (!projectRolesEntitlement) return "N/A on plan";-- return (- <ProjectRoleDropdown- orgMembershipId={orgMembershipId}- userId={userId}- currentProjectRole={projectRole ?? null}- orgId={orgId}- projectId={project.id}- hasCudAccess={- hasCudAccessOrgLevel || hasCudAccessProjectLevel- }- />- );- },- },- ] satisfies LangfuseColumnDef<MembersTableRow>[])- : []),- ...(!project &&- hasCudAccessOrgLevel &&- orgId !== env.NEXT_PUBLIC_DEMO_ORG_ID- ? ([- {- accessorKey: "featurePreviews",- id: "featurePreviews",- header: "Feature Previews",- enableHiding: true,- cell: ({ row }) => {- const { featurePreviews, featurePreviewManagement, meta } =- row.original;- if (!featurePreviews || !featurePreviewManagement) return null;-- return (- <Popover>- <UserFeaturePreviewsControl- orgId={orgId}- userId={meta.userId}- featurePreviews={featurePreviews}- management={featurePreviewManagement}- >- {({ enabledCount, totalCount, content }) => (- <>- <PopoverTrigger asChild>- <Button variant="outline" size="sm">- {enabledCount}/{totalCount} enabled- </Button>- </PopoverTrigger>- {content}- </>- )}- </UserFeaturePreviewsControl>- </Popover>- );- },- },- ] satisfies LangfuseColumnDef<MembersTableRow>[])- : []),- createDateTableColumn<MembersTableRow>({- accessorKey: "createdAt",- header: "Member Since",- enableHiding: true,- defaultHidden: true,- }),- {- accessorKey: "meta",- id: "meta",- header: "Actions",- enableHiding: false,- cell: ({ row }) => {- const { orgMembershipId, userId } = row.getValue(- "meta",- ) as MembersTableRow["meta"];- return hasCudAccessOrgLevel ||- (userId && userId === session.data?.user?.id) ? (- <div className="flex space-x-2">- <button- onClick={() => {- if (- confirm(- userId === session.data?.user?.id- ? "Are you sure you want to leave the organization?"- : "Are you sure you want to remove this member from the organization?",- )- ) {- mutDeleteMember.mutate({ orgId, orgMembershipId });- }- }}- >- <Trash size={14} />- </button>- </div>- ) : null;- },- },- ];-- const [columnVisibility, setColumnVisibility] =- useColumnVisibility<MembersTableRow>(- project ? "membersColumnVisibilityProject" : "membersColumnVisibilityOrg",- columns,- );-- const [columnOrder, setColumnOrder] = useColumnOrder<MembersTableRow>(- project ? "membersColumnOrderProject" : "membersColumnOrderOrg",- columns,- );-- const convertToTableRow = (- orgMembership:- | RouterOutput["members"]["allFromOrg"]["memberships"][number]- | RouterOutput["members"]["allFromProject"]["memberships"][number],- ): MembersTableRow => {- return {- meta: {- userId: orgMembership.userId,- orgMembershipId: orgMembership.id,- },- email: orgMembership.user.email,- user: {- image: orgMembership.user.image,- name: orgMembership.user.name,- },- providers: orgMembership.user.accounts?.map((a) => a.provider) ?? [],- createdAt: orgMembership.createdAt,- orgRole: orgMembership.role,- projectRole: orgMembership.projectRole,- featurePreviews:- "featurePreviews" in orgMembership- ? orgMembership.featurePreviews- : null,- featurePreviewManagement:- "featurePreviewManagement" in orgMembership- ? orgMembership.featurePreviewManagement- : null,- };- };-- if (project ? !hasProjectViewAccess : !hasOrgViewAccess) {- return (- <Alert>- <Alert.Title>Access Denied</Alert.Title>- <Alert.Description>- You do not have permission to view members of this organization.- </Alert.Description>- </Alert>- );- }-- return (- <>- <DataTableToolbar- tableName="members"- columns={columns}- columnVisibility={columnVisibility}- setColumnVisibility={setColumnVisibility}- columnOrder={columnOrder}- setColumnOrder={setColumnOrder}- actionButtons={- <CreateProjectMemberDialogController orgId={orgId} project={project}>- {({- hasAccess,- hasOnlySingleProjectAccess,- isSubmitting,- usageLimit,- openDialog,- }) => (- <ActionButton- variant="secondary"- loading={isSubmitting}- hasAccess={hasAccess}- usageLimit={usageLimit}- icon={<PlusIcon className="h-5 w-5" aria-hidden="true" />}- onClick={openDialog}- >- {hasOnlySingleProjectAccess- ? "Add project member"- : "Add new member"}- </ActionButton>- )}- </CreateProjectMemberDialogController>- }- searchConfig={{- metadataSearchFields: ["Name", "Email"],- updateQuery: setSearchQuery,- currentQuery: searchQuery ?? undefined,- tableAllowsFullTextSearch: false,- setSearchType: undefined,- searchType: undefined,- }}- className={showSettingsCard ? "px-0" : undefined}- />- {showSettingsCard ? (- <SettingsTableCard>- <DataTable- tableName={project ? "projectMembers" : "orgMembers"}- columns={columns}- data={- members.isPending- ? { isLoading: true, isError: false }- : members.isError- ? {- isLoading: false,- isError: true,- error: members.error.message,- }- : {- isLoading: false,- isError: false,- data: safeExtract(members.data, "memberships", []).map(- (t) => convertToTableRow(t),- ),- }- }- pagination={{- totalCount,- onChange: setPaginationState,- state: paginationState,- }}- columnVisibility={columnVisibility}- onColumnVisibilityChange={setColumnVisibility}- columnOrder={columnOrder}- onColumnOrderChange={setColumnOrder}- cellPadding="comfortable"- />- </SettingsTableCard>- ) : (- <DataTable- tableName={project ? "projectMembers" : "orgMembers"}- columns={columns}- data={- members.isPending- ? { isLoading: true, isError: false }- : members.isError- ? {- isLoading: false,- isError: true,- error: members.error.message,- }- : {- isLoading: false,- isError: false,- data: safeExtract(members.data, "memberships", []).map(- (t) => convertToTableRow(t),- ),- }- }- pagination={{- totalCount,- onChange: setPaginationState,- state: paginationState,- }}- columnVisibility={columnVisibility}- onColumnVisibilityChange={setColumnVisibility}- columnOrder={columnOrder}- onColumnOrderChange={setColumnOrder}- cellPadding="comfortable"- />- )}- </>- );-}--const OrgRoleDropdown = ({- orgMembershipId,- currentRole,- orgId,- userId,- hasCudAccess,-}: {- orgMembershipId: string;- currentRole: Role;- orgId: string;- userId: string;- hasCudAccess: boolean;-}) => {- const utils = api.useUtils();- const session = useSession();- const mut = api.members.updateOrgMembership.useMutation({- onSuccess: (data) => {- utils.members.invalidate();- if (data.userId === session.data?.user?.id) session.update();- showSuccessToast({- title: "Saved",- description: "Organization role updated successfully",- duration: 2000,- });- },- });-- return (- <Select- disabled={!hasCudAccess || mut.isPending}- value={currentRole}- onValueChange={(value) => {- if (- userId !== session.data?.user?.id ||- confirm(- "Are you sure that you want to change your own organization role?",- )- ) {- mut.mutate({- orgId,- orgMembershipId,- role: value as Role,- });- }- }}- >- <SelectTrigger className="w-[120px]">- <SelectValue />- </SelectTrigger>- <SelectContent>- {Object.values(Role).map((role) => (- <RoleSelectItem role={role} key={role} />- ))}- </SelectContent>- </Select>- );-};--const ProjectRoleDropdown = ({- orgId,- userId,- orgMembershipId,- projectId,- currentProjectRole,- hasCudAccess,-}: {- orgMembershipId: string;- userId: string;- currentProjectRole: Role | null;- orgId: string;- projectId: string;- hasCudAccess: boolean;-}) => {- const utils = api.useUtils();- const session = useSession();- const mut = api.members.updateProjectRole.useMutation({- onSuccess: (data) => {- utils.members.invalidate();- if (data.userId === session.data?.user?.id) session.update();- showSuccessToast({- title: "Saved",- description: "Project role updated successfully",- duration: 2000,- });- },- });-- return (- <Select- disabled={!hasCudAccess || mut.isPending}- value={currentProjectRole ?? Role.NONE}- onValueChange={(value) => {- if (- userId !== session.data?.user?.id ||- confirm("Are you sure that you want to change your own project role?")- ) {- mut.mutate({- orgId,- orgMembershipId,- projectId,- userId,- projectRole: value as Role,- });- }- }}- >- <SelectTrigger className="w-[120px]">- <SelectValue />- </SelectTrigger>- <SelectContent>- {Object.values(Role).map((role) => (- <RoleSelectItem role={role} key={role} isProjectRole />- ))}- </SelectContent>- </Select>- );-};diff --git a/web/src/features/rbac/components/MembershipInvitesPage.tsx b/web/src/features/rbac/components/MembershipInvitesPage.tsxdeleted file mode 100644index ec217d0d52..0000000000--- a/web/src/features/rbac/components/MembershipInvitesPage.tsx+++ /dev/null@@ -1,205 +0,0 @@-/* eslint-disable no-nested-ternary */-/* eslint-disable @repo/no-null-render */-import { DataTable } from "@/src/components/table/data-table";-import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";-import { type LangfuseColumnDef } from "@/src/components/table/types";-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";-import { api } from "@/src/utils/api";-import { safeExtract } from "@/src/utils/map-utils";-import type { RouterOutput } from "@/src/utils/types";-import { Trash } from "lucide-react";-import { type Role } from "@langfuse/shared";-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";-import Header from "@/src/components/layouts/header";-import useSessionStorage from "@/src/components/useSessionStorage";-import { createDateTableColumn } from "@/src/components/design-system/table/columns/createDateTableColumn";-import { createUserTableColumn } from "@/src/components/design-system/table/columns/createUserTableColumn";-import { createTextTableColumn } from "@/src/components/design-system/table/columns/createTextTableColumn";--export type InvitesTableRow = {- email: string;- createdAt: Date;- orgRole: Role;- projectRole?: Role;- invitedByUser: {- name: string | null;- image: string | null;- } | null;- meta: {- inviteId: string;- };-};--export function MembershipInvitesPage({- orgId,- projectId,-}: {- orgId: string;- projectId?: string;-}) {- const paginationKey = projectId- ? `projectInvites_${projectId}_pagination`- : `orgInvites_${orgId}_pagination`;-- const hasOrgViewAccess = useHasOrganizationAccess({- organizationId: orgId,- scope: "organizationMembers:read",- });- const hasProjectViewAccess =- useHasProjectAccess({- projectId,- scope: "projectMembers:read",- }) || hasOrgViewAccess;-- const [paginationState, setPaginationState] = useSessionStorage(- paginationKey,- {- pageIndex: 0,- pageSize: 10,- },- );-- const invites = projectId- ? api.members.allInvitesFromProject.useQuery(- {- projectId,- page: paginationState.pageIndex,- limit: paginationState.pageSize,- },- {- enabled: hasProjectViewAccess,- },- )- : api.members.allInvitesFromOrg.useQuery(- {- orgId,- page: paginationState.pageIndex,- limit: paginationState.pageSize,- },- {- enabled: hasOrgViewAccess,- },- );-- const totalCount = invites.data?.totalCount ?? null;-- const utils = api.useUtils();-- const mutDeleteInvite = api.members.deleteInvite.useMutation({- onSuccess: () => utils.members.invalidate(),- });-- const hasCudAccess = useHasOrganizationAccess({- organizationId: orgId,- scope: "organizationMembers:CUD",- });-- const columns: LangfuseColumnDef<InvitesTableRow>[] = [- createTextTableColumn<InvitesTableRow>({- accessorKey: "email",- header: "Email",- }),- createTextTableColumn<InvitesTableRow>({- accessorKey: "orgRole",- header: "Organization Role",- }),- createDateTableColumn<InvitesTableRow>({- accessorKey: "createdAt",- header: "Invited On",- }),- ...(projectId- ? [- createTextTableColumn<InvitesTableRow>({- accessorKey: "projectRole",- header: "Project Role",- }),- ]- : []),- createUserTableColumn<InvitesTableRow>({- accessorKey: "invitedByUser",- header: "Invited By",- variant: "avatar",- }),- {- accessorKey: "meta",- id: "meta",- header: "Actions",- cell: ({ row }) => {- const { inviteId } = row.getValue("meta") as InvitesTableRow["meta"];- return hasCudAccess ? (- <div className="flex space-x-2">- <button- onClick={() => {- if (- confirm("Are you sure you want to cancel this invitation?")- ) {- mutDeleteInvite.mutate({ inviteId, orgId });- }- }}- >- <Trash size={14} />- </button>- </div>- ) : null;- },- },- ];-- const convertToTableRow = (- invite: RouterOutput["members"]["allInvitesFromOrg"]["invitations"][0],- ): InvitesTableRow => {- return {- meta: {- inviteId: invite.id,- },- email: invite.email,- createdAt: invite.createdAt,- orgRole: invite.orgRole,- projectRole:- invite.projectId === projectId- ? (invite.projectRole ?? undefined)- : undefined,- invitedByUser: invite.invitedByUser,- };- };-- if (projectId ? !hasProjectViewAccess : !hasOrgViewAccess) {- return null;- }-- if (totalCount === 0) return null;-- return (- <>- {/* Header included in order to hide it when there are not invites yet */}- <Header title="Membership Invites" />- <DataTableToolbar columns={columns} tableName="membership-invites" />- <DataTable- tableName="membershipInvites"- columns={columns}- data={- invites.isLoading- ? { isLoading: true, isError: false }- : invites.isError- ? {- isLoading: false,- isError: true,- error: invites.error.message,- }- : {- isLoading: false,- isError: false,- data: safeExtract(invites.data, "invitations", []).map((i) =>- convertToTableRow(i),- ),- }- }- pagination={{- totalCount,- onChange: setPaginationState,- state: paginationState,- }}- />- </>- );-}diff --git a/web/src/features/rbac/components/MembershipInvitesSettingsTable/ConnectedMembershipInvitesSettingsTable.tsx b/web/src/features/rbac/components/MembershipInvitesSettingsTable/ConnectedMembershipInvitesSettingsTable.tsxnew file mode 100644index 0000000000..642cb476eb--- /dev/null+++ b/web/src/features/rbac/components/MembershipInvitesSettingsTable/ConnectedMembershipInvitesSettingsTable.tsx@@ -0,0 +1,107 @@+import { useMemo } from "react";++import { ConfirmationDialogController } from "@/src/components/design-system/ConfirmationDialogController/ConfirmationDialogController";+import { type PaginationBarState } from "@/src/components/design-system/PaginationBar/PaginationBar";+import { type AsyncTableData } from "@/src/components/design-system/table/Table";+import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";+import { api } from "@/src/utils/api";+import { safeExtract } from "@/src/utils/map-utils";+import type { RouterOutput } from "@/src/utils/types";+import {+ MembershipInvitesSettingsTable,+ type MembershipInvitesSettingsTableRow,+} from "./MembershipInvitesSettingsTable";++export function ConnectedMembershipInvitesSettingsTable({+ orgId,+ projectId,+ query,+ paginationState,+ setPaginationState,+}: {+ orgId: string;+ projectId?: string;+ query: {+ data:+ | RouterOutput["members"]["allInvitesFromProject"]+ | RouterOutput["members"]["allInvitesFromOrg"]+ | undefined;+ error: { message: string } | null;+ isError: boolean;+ isPending: boolean;+ };+ paginationState: PaginationBarState;+ setPaginationState: (state: PaginationBarState) => void;+}) {+ const hasCudAccess = useHasOrganizationAccess({+ organizationId: orgId,+ scope: "organizationMembers:CUD",+ });++ const utils = api.useUtils();++ const deleteInvite = api.members.deleteInvite.useMutation({+ onSuccess: () => utils.members.invalidate(),+ });++ const tableData = useMemo<+ AsyncTableData<MembershipInvitesSettingsTableRow[]>+ >(() => {+ if (query.isPending) return { status: "loading" };+ if (query.isError) {+ return {+ status: "error",+ error: query.error?.message ?? "Failed to load membership invites",+ };+ }+ return {+ status: "success",+ data: safeExtract(query.data, "invitations", []).map((invite) => ({+ inviteId: invite.id,+ email: invite.email,+ createdAt: invite.createdAt,+ orgRole: invite.orgRole,+ projectRole:+ invite.projectId === projectId+ ? (invite.projectRole ?? undefined)+ : undefined,+ invitedByUser: invite.invitedByUser,+ })),+ };+ }, [query.data, query.error, query.isError, query.isPending, projectId]);++ return (+ <ConfirmationDialogController<MembershipInvitesSettingsTableRow>+ title="Cancel invitation"+ text={(invite) =>+ `Are you sure you want to cancel the invitation for ${invite.email}?`+ }+ confirmLabel="Cancel invitation"+ variant="destructive"+ loading={deleteInvite.isPending}+ error={deleteInvite.error?.message}+ onAfterDismiss={deleteInvite.reset}+ onConfirm={async (invite) => {+ await deleteInvite.mutateAsync({+ inviteId: invite.inviteId,+ orgId,+ });+ }}+ >+ {({ openDialog }) => (+ <MembershipInvitesSettingsTable+ showProjectRole={Boolean(projectId)}+ hasCudAccess={hasCudAccess}+ onDelete={openDialog}+ data={tableData}+ loadingRowCount={paginationState.pageSize}+ pagination={{+ totalCount: query.data?.totalCount ?? null,+ onChange: setPaginationState,+ state: paginationState,+ }}+ />+ )}+ </ConfirmationDialogController>+ );+}diff --git a/web/src/features/rbac/components/MembershipInvitesSettingsTable/MembershipInvitesSettingsTable.stories.tsx b/web/src/features/rbac/components/MembershipInvitesSettingsTable/MembershipInvitesSettingsTable.stories.tsxnew file mode 100644index 0000000000..c4fb76a6f5--- /dev/null+++ b/web/src/features/rbac/components/MembershipInvitesSettingsTable/MembershipInvitesSettingsTable.stories.tsx@@ -0,0 +1,73 @@+import { fn } from "storybook/test";++import preview from "../../../../../.storybook/preview";+import { MembershipInvitesSettingsTable } from "./MembershipInvitesSettingsTable";++const meta = preview.meta({ component: MembershipInvitesSettingsTable });++export const Default = meta.story({+ args: {+ showProjectRole: false,+ hasCudAccess: true,+ onDelete: fn(),+ pagination: {+ totalCount: 5,+ state: { pageIndex: 0, pageSize: 10 },+ onChange: fn(),+ },+ data: {+ status: "success",+ data: [+ {+ inviteId: "invite-1",+ email: "[email protected]",+ createdAt: new Date("2026-09-18"),+ orgRole: "MEMBER",+ invitedByUser: { name: "Ada Lovelace", image: null },+ },+ {+ inviteId: "invite-2",+ email: "[email protected]",+ createdAt: new Date("2026-09-17"),+ orgRole: "VIEWER",+ invitedByUser: { name: "Grace Hopper", image: null },+ },+ {+ inviteId: "invite-3",+ email: "[email protected]",+ createdAt: new Date("2026-09-16"),+ orgRole: "ADMIN",+ invitedByUser: { name: "Ada Lovelace", image: null },+ },+ {+ inviteId: "invite-4",+ email: "[email protected]",+ createdAt: new Date("2026-09-15"),+ orgRole: "MEMBER",+ invitedByUser: null,+ },+ {+ inviteId: "invite-5",+ email: "[email protected]",+ createdAt: new Date("2026-09-14"),+ orgRole: "VIEWER",+ invitedByUser: { name: "Grace Hopper", image: null },+ },+ ],+ },+ },+});++export const Loading = meta.story({+ args: {+ showProjectRole: false,+ hasCudAccess: true,+ onDelete: fn(),+ pagination: {+ totalCount: null,+ state: { pageIndex: 0, pageSize: 10 },+ onChange: fn(),+ },+ data: { status: "loading" },+ },+});diff --git a/web/src/features/rbac/components/MembershipInvitesSettingsTable/MembershipInvitesSettingsTable.tsx b/web/src/features/rbac/components/MembershipInvitesSettingsTable/MembershipInvitesSettingsTable.tsxnew file mode 100644index 0000000000..dc5bb8f813--- /dev/null+++ b/web/src/features/rbac/components/MembershipInvitesSettingsTable/MembershipInvitesSettingsTable.tsx@@ -0,0 +1,101 @@+import { useCallback, useMemo } from "react";+import { Trash } from "lucide-react";+import { type Role } from "@langfuse/shared";++import { type PaginationBarProps } from "@/src/components/design-system/PaginationBar/PaginationBar";+import { type TableProps } from "@/src/components/design-system/table/Table";+import { SettingsTable } from "@/src/components/SettingsTable/SettingsTable";+import { createDateTableColumn } from "@/src/components/design-system/table/columns/createDateTableColumn";+import { createBadgeTableColumn } from "@/src/components/design-system/table/columns/createBadgeTableColumn";+import { createTextTableColumn } from "@/src/components/design-system/table/columns/createTextTableColumn";+import { createUserTableColumn } from "@/src/components/design-system/table/columns/createUserTableColumn";+import { type LangfuseColumnDef } from "@/src/components/table/types";++export type MembershipInvitesSettingsTableRow = {+ email: string;+ createdAt: Date;+ orgRole: Role;+ projectRole?: Role;+ invitedByUser: { name: string | null; image: string | null } | null;+ inviteId: string;+};++export function MembershipInvitesSettingsTable({+ showProjectRole,+ hasCudAccess,+ onDelete,+ pagination,+ ...tableProps+}: Pick<+ TableProps<MembershipInvitesSettingsTableRow>,+ "data" | "loadingRowCount"+> & {+ showProjectRole: boolean;+ hasCudAccess: boolean;+ onDelete: (invite: MembershipInvitesSettingsTableRow) => void;+ pagination: PaginationBarProps;+}) {+ const columns = useMemo<+ LangfuseColumnDef<MembershipInvitesSettingsTableRow>[]+ >(+ () => [+ createTextTableColumn<MembershipInvitesSettingsTableRow>({+ accessorKey: "email",+ header: "Email",+ }),+ createBadgeTableColumn<MembershipInvitesSettingsTableRow>({+ accessorKey: "orgRole",+ header: "Organization Role",+ }),+ ...(showProjectRole+ ? [+ createTextTableColumn<MembershipInvitesSettingsTableRow>({+ accessorKey: "projectRole",+ header: "Project Role",+ nullValue: "-",+ }),+ ]+ : []),+ createUserTableColumn<MembershipInvitesSettingsTableRow>({+ accessorKey: "invitedByUser",+ header: "Invited By",+ variant: "avatar",+ nullValue: "-",+ }),+ createDateTableColumn<MembershipInvitesSettingsTableRow>({+ accessorKey: "createdAt",+ header: "Invited On",+ mode: "relative",+ }),+ ],+ [showProjectRole],+ );+ const actions = useCallback<+ NonNullable<TableProps<MembershipInvitesSettingsTableRow>["actions"]>+ >(+ (invite) => [+ {+ id: "delete",+ type: "item",+ title: "Cancel invitation",+ icon: Trash,+ variant: "destructive",+ disabled: hasCudAccess+ ? undefined+ : { reason: "You do not have permission to cancel this invitation" },+ onClick: () => onDelete(invite),+ },+ ],+ [hasCudAccess, onDelete],+ );++ return (+ <SettingsTable+ tableName="membership invites"+ columns={columns}+ actions={actions}+ pagination={pagination}+ {...tableProps}+ />+ );+}diff --git a/web/src/pages/organization/[organizationId]/settings/index.tsx b/web/src/pages/organization/[organizationId]/settings/index.tsxindex 52d9292d0f..d86dc9f67e 100644--- a/web/src/pages/organization/[organizationId]/settings/index.tsx+++ b/web/src/pages/organization/[organizationId]/settings/index.tsx@@ -1,8 +1,8 @@import { PagedSettingsContainer } from "@/src/components/PagedSettingsContainer";import Header from "@/src/components/layouts/header";import { Button } from "@/src/components/ui/button";-import { MembershipInvitesPage } from "@/src/features/rbac/components/MembershipInvitesPage";-import { MembersTable } from "@/src/features/rbac/components/MembersTable";+import { ConnectedMembershipInvitesSettingsTable } from "@/src/features/rbac/components/MembershipInvitesSettingsTable/ConnectedMembershipInvitesSettingsTable";+import { ConnectedMembersSettingsTable } from "@/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable";import { JSONView } from "@/src/components/ui/CodeJsonViewer";import RenameOrganization from "@/src/features/organizations/components/RenameOrganization";import { DeleteOrganizationDialogController } from "@/src/features/organizations/components/DeleteOrganizationDialogController";@@ -30,6 +30,8 @@ import {GatewayModelsPage,GatewayProvidersPage,} from "@/src/features/ai-gateway";+import useSessionStorage from "@/src/components/useSessionStorage";+import { api } from "@/src/utils/api";type OrganizationSettingsPage = {title: string;@@ -181,17 +183,7 @@ export const getOrganizationSettingsPages = ({slug: "members",section: "Organization",cmdKKeywords: ["invite", "user", "rbac"],- content: (- <div className="flex flex-col gap-6">- <div>- <Header title="Organization Members" />- <MembersTable orgId={organization.id} />- </div>- <div>- <MembershipInvitesPage orgId={organization.id} />- </div>- </div>- ),+ content: <OrganizationMembersSettings orgId={organization.id} />,},{title: "Audit Logs",@@ -311,4 +303,49 @@ const OrgSettingsPage = () => {);};+function OrganizationMembersSettings({ orgId }: { orgId: string }) {+ const [invitesPagination, setInvitesPagination] = useSessionStorage(+ `orgInvites_${orgId}_pagination`,+ { pageIndex: 0, pageSize: 10 },+ );++ const hasViewAccess = useHasOrganizationAccess({+ organizationId: orgId,+ scope: "organizationMembers:read",+ });++ const membershipInvites = api.members.allInvitesFromOrg.useQuery(+ {+ orgId,+ page: invitesPagination.pageIndex,+ limit: invitesPagination.pageSize,+ },+ { enabled: hasViewAccess },+ );++ return (+ <div className="flex flex-col gap-6">+ <div>+ <Header title="Organization Members" />+ <ConnectedMembersSettingsTable orgId={orgId} />+ </div>+ {hasViewAccess && (+ <div+ className={+ membershipInvites.data?.totalCount === 0 ? "hidden" : undefined+ }+ >+ <Header title="Membership Invites" />+ <ConnectedMembershipInvitesSettingsTable+ orgId={orgId}+ query={membershipInvites}+ paginationState={invitesPagination}+ setPaginationState={setInvitesPagination}+ />+ </div>+ )}+ </div>+ );+}+export default OrgSettingsPage;