🪢 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(members): filter project and organization members by role (#17810)
Hassieb Pakzad48190065fd97
diff --git a/web/src/__tests__/server/members-trpc.servertest.ts b/web/src/__tests__/server/members-trpc.servertest.tsindex f139886921..aa29fd3490 100644--- a/web/src/__tests__/server/members-trpc.servertest.ts+++ b/web/src/__tests__/server/members-trpc.servertest.ts@@ -432,6 +432,142 @@ describe("membersRouter.allInvitesFromProject", () => {});});+describe("membersRouter.allFromProject / allFromOrg - role filter", () => {+ async function addMember(params: {+ orgId: string;+ orgRole: Role;+ projectRole?: { projectId: string; role: Role };+ }) {+ const user = await createTestUser();+ const orgMembership = await prisma.organizationMembership.create({+ data: { userId: user.id, orgId: params.orgId, role: params.orgRole },+ });+ if (params.projectRole) {+ await prisma.projectMembership.create({+ data: {+ userId: user.id,+ projectId: params.projectRole.projectId,+ role: params.projectRole.role,+ orgMembershipId: orgMembership.id,+ },+ });+ }+ return user;+ }++ async function prepareMembers() {+ const prepared = await prepare("cloud:core");+ const { org, project } = prepared;+ const otherProject = await prisma.project.create({+ data: {+ id: uuidv4(),+ name: `Other Project ${uuidv4().substring(0, 8)}`,+ orgId: org.id,+ },+ });++ const orgAdmin = await addMember({ orgId: org.id, orgRole: Role.ADMIN });+ const orgAdminViewerInProject = await addMember({+ orgId: org.id,+ orgRole: Role.ADMIN,+ projectRole: { projectId: project.id, role: Role.VIEWER },+ });+ const memberPromotedInProject = await addMember({+ orgId: org.id,+ orgRole: Role.MEMBER,+ projectRole: { projectId: project.id, role: Role.ADMIN },+ });+ const memberPromotedInOtherProject = await addMember({+ orgId: org.id,+ orgRole: Role.MEMBER,+ projectRole: { projectId: otherProject.id, role: Role.ADMIN },+ });++ return {+ ...prepared,+ orgAdmin,+ orgAdminViewerInProject,+ memberPromotedInProject,+ memberPromotedInOtherProject,+ };+ }++ it("filters project members by their effective project role", async () => {+ const {+ caller,+ project,+ orgAdmin,+ orgAdminViewerInProject,+ memberPromotedInProject,+ } = await prepareMembers();++ const admins = await caller.members.allFromProject({+ projectId: project.id,+ roles: [Role.ADMIN],+ page: 0,+ limit: 10,+ });+ expect(admins.totalCount).toBe(2);+ expect(admins.memberships.map((m) => m.userId).sort()).toEqual(+ [orgAdmin.id, memberPromotedInProject.id].sort(),+ );++ const viewers = await caller.members.allFromProject({+ projectId: project.id,+ roles: [Role.VIEWER],+ page: 0,+ limit: 10,+ });+ expect(viewers.memberships.map((m) => m.userId)).toEqual([+ orgAdminViewerInProject.id,+ ]);+ });++ it("matches any of several roles and combines with search", async () => {+ const { caller, project, ownerUser, orgAdmin, memberPromotedInProject } =+ await prepareMembers();++ const ownersAndAdmins = await caller.members.allFromProject({+ projectId: project.id,+ roles: [Role.OWNER, Role.ADMIN],+ page: 0,+ limit: 10,+ });+ expect(ownersAndAdmins.totalCount).toBe(3);+ expect(ownersAndAdmins.memberships.map((m) => m.userId).sort()).toEqual(+ [ownerUser.id, orgAdmin.id, memberPromotedInProject.id].sort(),+ );++ const searched = await caller.members.allFromProject({+ projectId: project.id,+ roles: [Role.ADMIN],+ searchQuery: memberPromotedInProject.email ?? undefined,+ page: 0,+ limit: 10,+ });+ expect(searched.totalCount).toBe(1);+ expect(searched.memberships.map((m) => m.userId)).toEqual([+ memberPromotedInProject.id,+ ]);+ });++ it("filters organization members by their organization role", async () => {+ const { caller, org, orgAdmin, orgAdminViewerInProject } =+ await prepareMembers();++ const admins = await caller.members.allFromOrg({+ orgId: org.id,+ roles: [Role.ADMIN],+ page: 0,+ limit: 10,+ });+ expect(admins.totalCount).toBe(2);+ expect(admins.memberships.map((m) => m.userId).sort()).toEqual(+ [orgAdmin.id, orgAdminViewerInProject.id].sort(),+ );+ });+});+describe("membersRouter.updateOrgMembership - audit log state capture", () => {it("records both before and after when changing an org role", async () => {const { org, caller } = await prepare("cloud:core");diff --git a/web/src/components/SettingsTable/SettingsTable.tsx b/web/src/components/SettingsTable/SettingsTable.tsxindex ab41e231e7..7fbca81f8f 100644--- a/web/src/components/SettingsTable/SettingsTable.tsx+++ b/web/src/components/SettingsTable/SettingsTable.tsx@@ -11,10 +11,12 @@ import {Table,type TableProps,} from "@/src/components/design-system/table/Table";+import { MultiSelectInput } from "@/src/components/design-system/MultiSelectInput/MultiSelectInput";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 { cn } from "@/src/utils/tailwind";import {useColumnOrder,useColumnVisibility,@@ -26,6 +28,15 @@ type SettingsTableToolbarAction = ActionButtonProps extends infer TAction: never: never;+type SettingsTableFilter = {+ id: string;+ label: string;+ placeholder: string;+ options: { value: string; label: string }[];+ value: string[];+ onChange: (value: string[]) => void;+};+export type SettingsTableProps<TData extends object> = Omit<TableProps<TData>,"columns"@@ -38,6 +49,7 @@ export type SettingsTableProps<TData extends object> = Omit<placeholder: string;onChange: (value: string) => void;};+ filters?: SettingsTableFilter[];toolbarActions?: SettingsTableToolbarAction[];pagination?: PaginationBarProps;};@@ -47,6 +59,7 @@ export function SettingsTable<TData extends object>({columnOrderKey,columnVisibilityKey,search,+ filters,toolbarActions,pagination,...tableProps@@ -68,32 +81,62 @@ export function SettingsTable<TData extends object>({? search.value: searchDraft.value;- const hasToolbar = Boolean(search || columnVisibilityKey || toolbarActions);+ const hasFilters = Boolean(filters?.length);+ const hasToolbar = Boolean(+ search || hasFilters || 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={cn(+ "flex items-center justify-between gap-2",+ hasFilters && "flex-wrap",)}+ >+ <div+ className={cn(+ "flex flex-1 items-center gap-2",+ hasFilters ? "min-w-72" : "min-w-0",+ )}+ >+ {search && (+ <div className="w-full max-w-sm min-w-0">+ <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>+ )}+ {filters?.map((filter) => (+ <div key={filter.id} className="w-44 shrink-0">+ <MultiSelectInput+ aria-label={`Filter by ${filter.label.toLowerCase()}`}+ value={filter.value}+ options={filter.options}+ onValueChange={filter.onChange}+ placeholder={filter.placeholder}+ selectedLabel={filter.options+ .filter((option) => filter.value.includes(option.value))+ .map((option) => option.label)+ .join(", ")}+ searchPlaceholder="Search..."+ emptyMessage="No options found."+ />+ </div>+ ))}+ </div>- <div className="flex items-center gap-2">+ <div className="ml-auto flex items-center gap-2">{columnVisibilityKey && (<DataTableColumnVisibilityFiltercolumns={columns}diff --git a/web/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable.tsx b/web/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable.tsxindex f34d0f5495..bbf16710d9 100644--- a/web/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable.tsx+++ b/web/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable.tsx@@ -1,7 +1,13 @@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 {+ ArrayParam,+ StringParam,+ useQueryParam,+ withDefault,+} from "use-query-params";+import { type Role } from "@langfuse/shared";import { Alert } from "@/src/components/design-system/Alert/Alert";import { type AsyncTableData } from "@/src/components/design-system/table/Table";@@ -12,6 +18,7 @@ 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 { orderedRoles } from "@/src/features/rbac/constants/orderedRoles";import { api } from "@/src/utils/api";import { safeExtract } from "@/src/utils/map-utils";import type { RouterOutput } from "@/src/utils/types";@@ -65,18 +72,32 @@ export function ConnectedMembersSettingsTable({withDefault(StringParam, null),);- const [paginationState, setPaginationState] = useSessionStorage(+ const [rolesParam, setRolesParam] = useQueryParam("roles", ArrayParam);+ const roles = (rolesParam ?? []).filter(isRole);+ const rolesKey = roles.toSorted().join(",");++ const [storedPagination, setPaginationState] = useSessionStorage<{+ pageIndex: number;+ pageSize: number;+ rolesKey?: string;+ }>(project? `projectMembers_${project.id}_pagination`: `orgMembers_${orgId}_pagination`,{ pageIndex: 0, pageSize: 10 },);+ // The stored page belongs to the role filter it was paged under; any other+ // filter (dropdown, URL, or history navigation) starts on the first page.+ const paginationState = {+ pageIndex:+ (storedPagination.rolesKey ?? "") === rolesKey+ ? storedPagination.pageIndex+ : 0,+ pageSize: storedPagination.pageSize,+ };useEffect(() => {- setPaginationState((previous) => ({- pageIndex: 0,- pageSize: previous.pageSize,- }));+ setPaginationState((previous) => ({ ...previous, pageIndex: 0 }));// eslint-disable-next-line react-hooks/exhaustive-deps}, [searchQuery]);@@ -84,6 +105,7 @@ export function ConnectedMembersSettingsTable({{orgId,searchQuery: searchQuery ?? undefined,+ roles,page: paginationState.pageIndex,limit: paginationState.pageSize,},@@ -94,6 +116,7 @@ export function ConnectedMembersSettingsTable({{projectId: project?.id ?? "NOT ENABLED",searchQuery: searchQuery ?? undefined,+ roles,page: paginationState.pageIndex,limit: paginationState.pageSize,},@@ -277,6 +300,10 @@ export function ConnectedMembersSettingsTable({value: searchQuery ?? "",onChange: (value) => setSearchQuery(value || null),}}+ roleFilter={{+ value: roles,+ onChange: (value) => setRolesParam(value.length > 0 ? value : null),+ }}toolbarActions={[{id: "add-member",@@ -293,7 +320,7 @@ export function ConnectedMembersSettingsTable({]}pagination={{totalCount: members.data?.totalCount ?? null,- onChange: setPaginationState,+ onChange: (state) => setPaginationState({ ...state, rolesKey }),state: paginationState,}}/>@@ -302,6 +329,10 @@ export function ConnectedMembersSettingsTable({);}+function isRole(value: string | null): value is Role {+ return value !== null && Object.hasOwn(orderedRoles, value);+}+function convertToTableRow(membership:| RouterOutput["members"]["allFromOrg"]["memberships"][number]diff --git a/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.stories.tsx b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.stories.tsxindex cd3a198d5c..fe0311b462 100644--- a/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.stories.tsx+++ b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.stories.tsx@@ -1,10 +1,66 @@import { fn } from "storybook/test";import preview from "../../../../../.storybook/preview";-import { MembersSettingsTable } from "./MembersSettingsTable";+import {+ MembersSettingsTable,+ type MembersSettingsTableRow,+} from "./MembersSettingsTable";const meta = preview.meta({ component: MembersSettingsTable });+const members: MembersSettingsTableRow[] = [+ {+ 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 Default = meta.story({args: {orgId: "org-1",@@ -18,6 +74,7 @@ export const Default = meta.story({onUpdateOrgRole: fn(),onUpdateProjectRole: fn(),search: { value: "", onChange: fn() },+ roleFilter: { value: [], onChange: fn() },toolbarActions: [{ id: "add-member", label: "Add new member", onClick: fn() },],@@ -26,60 +83,35 @@ export const Default = meta.story({state: { pageIndex: 0, pageSize: 10 },onChange: fn(),},+ data: { status: "success", data: members },+ },+});++export const FilteredByRole = 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() },+ roleFilter: { value: ["OWNER", "ADMIN"], onChange: fn() },+ toolbarActions: [+ { id: "add-member", label: "Add new member", onClick: fn() },+ ],+ pagination: {+ totalCount: 2,+ 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" },- },- ],+ data: members.filter((member) => member.orgRole === "ADMIN"),},},});@@ -97,6 +129,7 @@ export const Loading = meta.story({onUpdateOrgRole: fn(),onUpdateProjectRole: fn(),search: { value: "", onChange: fn() },+ roleFilter: { value: [], onChange: fn() },toolbarActions: [{ id: "add-member", label: "Add new member", onClick: fn() },],diff --git a/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsx b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsxindex c7071ca148..94c0920c84 100644--- a/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsx+++ b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsx@@ -34,6 +34,13 @@ import Link from "next/link";import { Popover, PopoverTrigger } from "@/src/components/ui/popover";import { Button } from "@/src/components/ui/button";+const formatRoleLabel = (role: Role) =>+ role.charAt(0).toUpperCase() + role.slice(1).toLowerCase();++const roleFilterOptions = (Object.keys(orderedRoles) as Role[])+ .toSorted((a, b) => orderedRoles[b] - orderedRoles[a])+ .map((role) => ({ value: role, label: formatRoleLabel(role) }));+export type MembersSettingsTableRow = {user: { image: string | null; name: string | null };email: string | null;@@ -68,6 +75,10 @@ type MembersSettingsTableProps = Pick<value: string;onChange: (value: string) => void;};+ roleFilter: {+ value: Role[];+ onChange: (roles: Role[]) => void;+ };toolbarActions: SettingsTableProps<MembersSettingsTableRow>["toolbarActions"];pagination: PaginationBarProps;};@@ -86,6 +97,7 @@ export function MembersSettingsTable({onUpdateOrgRole,onUpdateProjectRole,search,+ roleFilter,toolbarActions,pagination,...tableProps@@ -284,6 +296,21 @@ export function MembersSettingsTable({placeholder: "Search name or email",onChange: search.onChange,}}+ filters={[+ {+ id: "roles",+ label: project ? "Project role" : "Role",+ placeholder: "All roles",+ options: roleFilterOptions,+ value: roleFilter.value,+ onChange: (values) =>+ roleFilter.onChange(+ roleFilterOptions+ .map((option) => option.value)+ .filter((role) => values.includes(role)),+ ),+ },+ ]}toolbarActions={toolbarActions}pagination={pagination}{...tableProps}diff --git a/web/src/features/rbac/server/allMembersRoutes.ts b/web/src/features/rbac/server/allMembersRoutes.tsindex bc2948450c..5563bf243c 100644--- a/web/src/features/rbac/server/allMembersRoutes.ts+++ b/web/src/features/rbac/server/allMembersRoutes.ts@@ -7,7 +7,12 @@ import {protectedOrganizationProcedure,protectedProjectProcedure,} from "@/src/server/api/trpc";-import { paginationZod, type PrismaClient, Role } from "@langfuse/shared";+import {+ paginationZod,+ type Prisma,+ type PrismaClient,+ Role,+} from "@langfuse/shared";import { formatAuthProviderName } from "@langfuse/shared/src/server";import { TRPCError } from "@trpc/server";import { z } from "zod";@@ -21,15 +26,37 @@ import {const orgLevelMemberQuery = z.object({orgId: z.string(),searchQuery: z.string().optional(),+ roles: z.array(z.enum(Role)).optional(),...paginationZod,});const projectLevelMemberQuery = z.object({projectId: z.string(),searchQuery: z.string().optional(),+ roles: z.array(z.enum(Role)).optional(),...paginationZod,});+/**+ * In a project, a member's effective role is their project role if one is+ * set, otherwise their organization role.+ */+function roleFilter(+ roles: Role[],+ projectId: string | undefined,+): Prisma.OrganizationMembershipWhereInput {+ if (!projectId) return { role: { in: roles } };+ return {+ OR: [+ { ProjectMemberships: { some: { projectId, role: { in: roles } } } },+ {+ role: { in: roles },+ ProjectMemberships: { none: { projectId } },+ },+ ],+ };+}+async function getMembers(prisma: PrismaClient,query:@@ -37,50 +64,64 @@ async function getMembers(| (z.infer<typeof projectLevelMemberQuery> & { orgId: string }),showAllOrgMembers = true,) {- // Build common where clause to ensure consistency between findMany and count queries- const whereClause = {- orgId: query.orgId,- // restrict to only members with role in a project if projectId is set and showAllOrgMembers is false- ...("projectId" in query && !showAllOrgMembers- ? {- // either org level role or project level role- OR: [- {+ if (!query.orgId) throw Error("Org ID required to get members");++ const projectId = "projectId" in query ? query.projectId : undefined;+ const conditions: Prisma.OrganizationMembershipWhereInput[] = [];++ // restrict to only members with role in a project if projectId is set and showAllOrgMembers is false+ if (projectId && !showAllOrgMembers) {+ conditions.push({+ // either org level role or project level role+ OR: [+ {+ role: {+ not: Role.NONE,+ },+ },+ {+ ProjectMemberships: {+ some: {+ projectId,role: {not: Role.NONE,},},- {- ProjectMemberships: {- some: {- projectId: query.projectId,- role: {- not: Role.NONE,- },- },- },- },- ],- }- : {}),- ...(query.searchQuery && {+ },+ },+ ],+ });+ }++ if (query.searchQuery) {+ conditions.push({user: {OR: [{name: {contains: query.searchQuery,- mode: "insensitive" as const,+ mode: "insensitive",},},{email: {contains: query.searchQuery,- mode: "insensitive" as const,+ mode: "insensitive",},},],},- }),+ });+ }++ if (query.roles?.length) {+ conditions.push(roleFilter(query.roles, projectId));+ }++ // Build common where clause to ensure consistency between findMany and count queries+ const whereClause: Prisma.OrganizationMembershipWhereInput = {+ orgId: query.orgId,+ AND: conditions,};const orgMemberships = await prisma.organizationMembership.findMany({