🪢 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): clean up `CreateProjectMemberButton` (#16483)
Ben Bachem971a7a5c0935
diff --git a/web/src/features/rbac/components/CreateProjectMemberButton.tsx b/web/src/features/rbac/components/CreateProjectMemberButton.tsxdeleted file mode 100644index b789b77cdc..0000000000--- a/web/src/features/rbac/components/CreateProjectMemberButton.tsx+++ /dev/null@@ -1,277 +0,0 @@-/* eslint-disable @repo/no-abstracted-overlay-trigger */-import { Button } from "@/src/components/ui/button";-import { api, reportTrpcErrorWithoutToast } from "@/src/utils/api";-import { useState } from "react";-import { PlusIcon } from "lucide-react";-import * as z from "zod";-import { zodResolver } from "@hookform/resolvers/zod";-import { useForm } from "react-hook-form";-import {- Dialog,- DialogBody,- DialogContent,- DialogFooter,- DialogHeader,- DialogTitle,- DialogTrigger,-} from "@/src/components/ui/dialog";-import {- Form,- FormControl,- FormDescription,- FormField,- FormItem,- FormLabel,- FormMessage,-} from "@/src/components/ui/form";-import {- Select,- SelectContent,- SelectTrigger,- SelectValue,-} from "@/src/components/ui/select";-import { Input } from "@/src/components/ui/input";-import { Role } from "@langfuse/shared";-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";-import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";-import {- useHasEntitlement,- useEntitlementLimit,-} from "@/src/features/entitlements/hooks";-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";-import { RoleSelectItem } from "@/src/features/rbac/components/RoleSelectItem";-import { ActionButton } from "@/src/components/ActionButton";--const formSchema = z.object({- email: z.string().trim().pipe(z.email()),- orgRole: z.enum(Role),- projectRole: z.enum(Role),-});--export function CreateProjectMemberButton(props: {- orgId: string;- project?: { id: string; name: string };-}) {- const capture = usePostHogClientCapture();- const [open, setOpen] = useState(false);- const hasOrgAccess = useHasOrganizationAccess({- organizationId: props.orgId,- scope: "organizationMembers:CUD",- });- const hasProjectAccess = useHasProjectAccess({- projectId: props.project?.id,- scope: "projectMembers:CUD",- });- const orgMemberLimit = useEntitlementLimit("organization-member-count");- const orgMemberCount = api.members.allFromOrg.useQuery(- {- orgId: props.orgId,- page: 0,- limit: 1,- },- {- enabled: hasOrgAccess,- },- ).data?.totalCount;- const inviteCount = api.members.allInvitesFromOrg.useQuery(- {- orgId: props.orgId,- page: 0,- limit: 1,- },- {- enabled: hasOrgAccess,- },- ).data?.totalCount;- const hasProjectRoleEntitlement = useHasEntitlement("rbac-project-roles");- const hasOnlySingleProjectAccess =- !hasOrgAccess && hasProjectAccess && hasProjectRoleEntitlement;-- const utils = api.useUtils();- const mutCreateProjectMember = api.members.create.useMutation({- onSuccess: () => utils.members.invalidate(),- onError: (error) =>- form.setError("email", {- type: "manual",- message: error.message,- }),- });-- const form = useForm({- resolver: zodResolver(formSchema),- defaultValues: {- email: "",- orgRole: hasOnlySingleProjectAccess ? Role.NONE : Role.MEMBER,- projectRole: hasOnlySingleProjectAccess ? Role.MEMBER : Role.NONE,- },- });-- function onSubmit(values: z.infer<typeof formSchema>) {- capture(- props.project- ? "project_settings:send_membership_invitation"- : "organization_settings:send_membership_invitation",- {- orgRole: values.orgRole,- projectRole: values.projectRole,- },- );- return mutCreateProjectMember- .mutateAsync({- orgId: props.orgId,- email: values.email,- orgRole: values.orgRole,- //optional- projectId: props.project?.id,- projectRole:- values.projectRole === Role.NONE ? undefined : values.projectRole,- })- .then(() => {- form.reset();- setOpen(false);- })- .catch((error) => reportTrpcErrorWithoutToast(error, "members"));- }-- return (- <>- <Dialog open={open} onOpenChange={setOpen}>- <DialogTrigger asChild>- <ActionButton- variant="secondary"- loading={mutCreateProjectMember.isPending}- hasAccess={hasOrgAccess || hasOnlySingleProjectAccess}- usageLimit={- typeof orgMemberLimit === "number"- ? {- current: (orgMemberCount ?? 0) + (inviteCount ?? 0),- max: orgMemberLimit,- }- : undefined- }- icon={<PlusIcon className="h-5 w-5" aria-hidden="true" />}- >- {hasOnlySingleProjectAccess- ? "Add project member"- : "Add new member"}- </ActionButton>- </DialogTrigger>- <DialogContent>- <DialogHeader>- <DialogTitle>- Add new member to the{" "}- {hasOnlySingleProjectAccess ? "project" : "organization"}- </DialogTitle>- </DialogHeader>- <Form {...form}>- <form className="space-y-6" onSubmit={form.handleSubmit(onSubmit)}>- <DialogBody>- <FormField- control={form.control}- name="email"- render={({ field }) => (- <FormItem>- <FormLabel>Email</FormLabel>- <FormControl>- <Input placeholder="[email protected]" {...field} />- </FormControl>- <FormMessage />- </FormItem>- )}- />- {!hasOnlySingleProjectAccess && (- <FormField- control={form.control}- name="orgRole"- render={({ field }) => (- <FormItem>- <FormLabel>Organization Role</FormLabel>- <Select- defaultValue={field.value}- onValueChange={(value) =>- field.onChange(- value as (typeof Role)[keyof typeof Role],- )- }- >- <FormControl>- <SelectTrigger>- <SelectValue placeholder="Select an organization role" />- </SelectTrigger>- </FormControl>- <SelectContent>- {Object.values(Role).map((role) => (- <RoleSelectItem role={role} key={role} />- ))}- </SelectContent>- </Select>- <FormMessage />- </FormItem>- )}- />- )}- {props.project !== undefined && hasProjectRoleEntitlement && (- <FormField- control={form.control}- name="projectRole"- render={({ field }) => (- <FormItem>- <FormLabel>Project Role</FormLabel>- <Select- defaultValue={field.value}- onValueChange={(value) =>- field.onChange(- value as (typeof Role)[keyof typeof Role],- )- }- >- <FormControl>- <SelectTrigger>- <SelectValue placeholder="Select a project role" />- </SelectTrigger>- </FormControl>- <SelectContent>- {Object.values(Role)- .filter(- (role) =>- !hasOnlySingleProjectAccess ||- role !== Role.NONE,- )- .map((role) => (- <RoleSelectItem- role={role}- key={role}- isProjectRole- />- ))}- </SelectContent>- </Select>- {!hasOnlySingleProjectAccess && (- <FormDescription>- This project role will override the default role for- this current project ({props.project!.name}).- </FormDescription>- )}- <FormMessage />- </FormItem>- )}- />- )}- </DialogBody>- <DialogFooter>- <Button- type="submit"- className="w-full"- loading={form.formState.isSubmitting}- >- Grant access- </Button>- <FormMessage />- </DialogFooter>- </form>- </Form>- </DialogContent>- </Dialog>- </>- );-}diff --git a/web/src/features/rbac/components/CreateProjectMemberDialogContent.stories.tsx b/web/src/features/rbac/components/CreateProjectMemberDialogContent.stories.tsxnew file mode 100644index 0000000000..585cc28726--- /dev/null+++ b/web/src/features/rbac/components/CreateProjectMemberDialogContent.stories.tsx@@ -0,0 +1,89 @@+import { type ComponentProps } from "react";+import { expect, fn, userEvent, within } from "storybook/test";++import preview from "../../../../.storybook/preview";+import {+ Dialog,+ DialogContent,+ DialogHeader,+ DialogTitle,+} from "@/src/components/ui/dialog";++import { CreateProjectMemberDialogContent } from "./CreateProjectMemberDialogContent";++const defaultArgs = {+ project: undefined,+ hasOnlySingleProjectAccess: false,+ hasProjectRoleEntitlement: false,+ isSubmitting: false,+ createProjectMember: fn().mockResolvedValue(undefined),+ onSuccess: fn(),+} satisfies ComponentProps<typeof CreateProjectMemberDialogContent>;++const meta = preview.meta({+ component: CreateProjectMemberDialogContent,+ parameters: {+ layout: "fullscreen",+ },+ decorators: [+ (Story) => (+ <Dialog open onOpenChange={fn()}>+ <DialogContent>+ <DialogHeader>+ <DialogTitle>Add member</DialogTitle>+ </DialogHeader>+ <Story />+ </DialogContent>+ </Dialog>+ ),+ ],+});++export const OrganizationMember = meta.story({+ args: defaultArgs,+});++export const ProjectMember = meta.story({+ args: {+ ...defaultArgs,+ project: { id: "project-1", name: "Support assistant" },+ hasProjectRoleEntitlement: true,+ },+});++export const SingleProjectAccess = meta.story({+ args: {+ ...defaultArgs,+ project: { id: "project-1", name: "Support assistant" },+ hasOnlySingleProjectAccess: true,+ hasProjectRoleEntitlement: true,+ },+});++export const Submitting = meta.story({+ args: {+ ...defaultArgs,+ isSubmitting: true,+ },+});++export const SubmitsInvitation = meta.story({+ name: "(Test) Submits invitation",+ args: defaultArgs,+ play: async ({ args, canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);++ await userEvent.type(+ body.getByRole("textbox", { name: "Email" }),+ "[email protected]",+ );+ await userEvent.click(body.getByRole("button", { name: "Grant access" }));++ await expect(args.createProjectMember).toHaveBeenCalledWith({+ email: "[email protected]",+ orgRole: "MEMBER",+ projectRole: "NONE",+ });+ await expect(args.onSuccess).toHaveBeenCalledOnce();+ },+});diff --git a/web/src/features/rbac/components/CreateProjectMemberDialogContent.tsx b/web/src/features/rbac/components/CreateProjectMemberDialogContent.tsxnew file mode 100644index 0000000000..a565b9993a--- /dev/null+++ b/web/src/features/rbac/components/CreateProjectMemberDialogContent.tsx@@ -0,0 +1,191 @@+import { zodResolver } from "@hookform/resolvers/zod";+import { type Role } from "@langfuse/shared";+import { useForm } from "react-hook-form";+import * as z from "zod";++import { Button } from "@/src/components/ui/button";+import { DialogBody, DialogFooter } from "@/src/components/ui/dialog";+import {+ Form,+ FormControl,+ FormDescription,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from "@/src/components/ui/form";+import { Input } from "@/src/components/ui/input";+import {+ Select,+ SelectContent,+ SelectTrigger,+ SelectValue,+} from "@/src/components/ui/select";+import { RoleSelectItem } from "@/src/features/rbac/components/RoleSelectItem";+import { reportTrpcErrorWithoutToast } from "@/src/utils/api";++const roleValues = {+ OWNER: "OWNER",+ ADMIN: "ADMIN",+ MEMBER: "MEMBER",+ VIEWER: "VIEWER",+ NONE: "NONE",+} as const satisfies Record<Role, Role>;++const formSchema = z.object({+ email: z.string().trim().pipe(z.email()),+ orgRole: z.enum(roleValues),+ projectRole: z.enum(roleValues),+});++type FormValues = z.infer<typeof formSchema>;++type CreateProjectMemberDialogContentProps = {+ project: { id: string; name: string } | undefined;+ hasOnlySingleProjectAccess: boolean;+ hasProjectRoleEntitlement: boolean;+ isSubmitting: boolean;+ createProjectMember: (values: FormValues) => Promise<void>;+ onSuccess: () => void;+};++export function CreateProjectMemberDialogContent({+ project,+ hasOnlySingleProjectAccess,+ hasProjectRoleEntitlement,+ isSubmitting,+ createProjectMember,+ onSuccess,+}: CreateProjectMemberDialogContentProps) {+ const form = useForm<FormValues>({+ resolver: zodResolver(formSchema),+ defaultValues: {+ email: "",+ orgRole: hasOnlySingleProjectAccess ? roleValues.NONE : roleValues.MEMBER,+ projectRole: hasOnlySingleProjectAccess+ ? roleValues.MEMBER+ : roleValues.NONE,+ },+ });++ async function onSubmit(values: FormValues) {+ try {+ await createProjectMember(values);+ form.reset();+ onSuccess();+ } catch (error) {+ form.setError("email", {+ type: "manual",+ message:+ error instanceof Error ? error.message : "Failed to add member",+ });+ reportTrpcErrorWithoutToast(error, "members");+ }+ }++ return (+ <Form {...form}>+ <form className="space-y-6" onSubmit={form.handleSubmit(onSubmit)}>+ <DialogBody>+ <FormField+ control={form.control}+ name="email"+ render={({ field }) => (+ <FormItem>+ <FormLabel>Email</FormLabel>+ <FormControl>+ <Input placeholder="[email protected]" {...field} />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ {!hasOnlySingleProjectAccess && (+ <FormField+ control={form.control}+ name="orgRole"+ render={({ field }) => (+ <FormItem>+ <FormLabel>Organization Role</FormLabel>+ <Select+ defaultValue={field.value}+ onValueChange={(value) =>+ field.onChange(+ value as (typeof roleValues)[keyof typeof roleValues],+ )+ }+ >+ <FormControl>+ <SelectTrigger>+ <SelectValue placeholder="Select an organization role" />+ </SelectTrigger>+ </FormControl>+ <SelectContent>+ {Object.values(roleValues).map((role) => (+ <RoleSelectItem role={role} key={role} />+ ))}+ </SelectContent>+ </Select>+ <FormMessage />+ </FormItem>+ )}+ />+ )}+ {project !== undefined && hasProjectRoleEntitlement && (+ <FormField+ control={form.control}+ name="projectRole"+ render={({ field }) => (+ <FormItem>+ <FormLabel>Project Role</FormLabel>+ <Select+ defaultValue={field.value}+ onValueChange={(value) =>+ field.onChange(+ value as (typeof roleValues)[keyof typeof roleValues],+ )+ }+ >+ <FormControl>+ <SelectTrigger>+ <SelectValue placeholder="Select a project role" />+ </SelectTrigger>+ </FormControl>+ <SelectContent>+ {Object.values(roleValues)+ .filter(+ (role) =>+ !hasOnlySingleProjectAccess ||+ role !== roleValues.NONE,+ )+ .map((role) => (+ <RoleSelectItem+ role={role}+ key={role}+ isProjectRole+ />+ ))}+ </SelectContent>+ </Select>+ {!hasOnlySingleProjectAccess && (+ <FormDescription>+ This project role will override the default role for this+ current project ({project.name}).+ </FormDescription>+ )}+ <FormMessage />+ </FormItem>+ )}+ />+ )}+ </DialogBody>+ <DialogFooter>+ <Button type="submit" className="w-full" loading={isSubmitting}>+ Grant access+ </Button>+ <FormMessage />+ </DialogFooter>+ </form>+ </Form>+ );+}diff --git a/web/src/features/rbac/components/CreateProjectMemberDialogController.tsx b/web/src/features/rbac/components/CreateProjectMemberDialogController.tsxnew file mode 100644index 0000000000..dabcc2d50b--- /dev/null+++ b/web/src/features/rbac/components/CreateProjectMemberDialogController.tsx@@ -0,0 +1,148 @@+import { type ReactNode } from "react";++import {+ DialogController,+ DialogHeader,+ DialogTitle,+ type DialogTrigger,+} from "@/src/components/ui/dialog";+import { CreateProjectMemberDialogContent } from "@/src/features/rbac/components/CreateProjectMemberDialogContent";+import {+ useEntitlementLimit,+ useHasEntitlement,+} from "@/src/features/entitlements/hooks";+import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";+import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";+import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";+import { api } from "@/src/utils/api";++type CreateProjectMemberDialogControllerProps = {+ orgId: string;+ project: { id: string; name: string } | undefined;+ children: (control: {+ hasAccess: boolean;+ hasOnlySingleProjectAccess: boolean;+ isSubmitting: boolean;+ usageLimit:+ | {+ current: number | undefined;+ max: number;+ }+ | undefined;+ Trigger: typeof DialogTrigger;+ }) => ReactNode;+};++export function CreateProjectMemberDialogController({+ orgId,+ project,+ children,+}: CreateProjectMemberDialogControllerProps) {+ const hasOrgAccess = useHasOrganizationAccess({+ organizationId: orgId,+ scope: "organizationMembers:CUD",+ });+ const hasProjectAccess = useHasProjectAccess({+ projectId: project?.id,+ scope: "projectMembers:CUD",+ });+ const hasProjectRoleEntitlement = useHasEntitlement("rbac-project-roles");+ const hasOnlySingleProjectAccess =+ !hasOrgAccess && hasProjectAccess && hasProjectRoleEntitlement;+ const hasAccess = hasOrgAccess || hasOnlySingleProjectAccess;++ const orgMemberLimit = useEntitlementLimit("organization-member-count");+ const orgMemberCount = api.members.allFromOrg.useQuery(+ {+ orgId,+ page: 0,+ limit: 1,+ },+ {+ enabled: hasOrgAccess,+ },+ ).data?.totalCount;+ const inviteCount = api.members.allInvitesFromOrg.useQuery(+ {+ orgId,+ page: 0,+ limit: 1,+ },+ {+ enabled: hasOrgAccess,+ },+ ).data?.totalCount;++ const utils = api.useUtils();+ const capture = usePostHogClientCapture();+ const createProjectMemberMutation = api.members.create.useMutation({+ onSuccess: () => utils.members.invalidate(),+ // The form owns error presentation; avoid a duplicate global toast.+ onError: () => undefined,+ });+ const usageLimit =+ typeof orgMemberLimit === "number"+ ? {+ current: (orgMemberCount ?? 0) + (inviteCount ?? 0),+ max: orgMemberLimit,+ }+ : undefined;++ return (+ <DialogController+ closeOnInteractionOutside={false}+ size="default"+ renderContent={({ closeDialog }) => (+ <>+ <DialogHeader>+ <DialogTitle>+ Add new member to the{" "}+ {hasOnlySingleProjectAccess ? "project" : "organization"}+ </DialogTitle>+ </DialogHeader>+ <CreateProjectMemberDialogContent+ project={project}+ hasOnlySingleProjectAccess={hasOnlySingleProjectAccess}+ hasProjectRoleEntitlement={hasProjectRoleEntitlement}+ isSubmitting={createProjectMemberMutation.isPending}+ createProjectMember={(values) => {+ capture(+ project+ ? "project_settings:send_membership_invitation"+ : "organization_settings:send_membership_invitation",+ {+ orgRole: values.orgRole,+ projectRole: values.projectRole,+ },+ );++ return createProjectMemberMutation+ .mutateAsync({+ orgId,+ email: values.email,+ orgRole: values.orgRole,+ projectId: project?.id,+ projectRole:+ values.projectRole === "NONE"+ ? undefined+ : values.projectRole,+ })+ .then(() => undefined);+ }}+ onSuccess={closeDialog}+ />+ </>+ )}+ >+ {({ Trigger }) =>+ children({+ hasAccess,+ hasOnlySingleProjectAccess,+ isSubmitting: createProjectMemberMutation.isPending,+ usageLimit,+ Trigger,+ })+ }+ </DialogController>+ );+}diff --git a/web/src/features/rbac/components/MembersTable.tsx b/web/src/features/rbac/components/MembersTable.tsxindex 158a4048f4..78ca01ce06 100644--- a/web/src/features/rbac/components/MembersTable.tsx+++ b/web/src/features/rbac/components/MembersTable.tsx@@ -13,13 +13,14 @@ import {SelectValue,} from "@/src/components/ui/select";import useColumnVisibility from "@/src/features/column-visibility/hooks/useColumnVisibility";-import { CreateProjectMemberButton } from "@/src/features/rbac/components/CreateProjectMemberButton";+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 { Trash } from "lucide-react";+import { PlusIcon, Trash } from "lucide-react";import { useSession } from "next-auth/react";import { Alert, AlertDescription, AlertTitle } from "@/src/components/ui/alert";import { useHasEntitlement } from "@/src/features/entitlements/hooks";@@ -384,7 +385,29 @@ export function MembersTable({columnOrder={columnOrder}setColumnOrder={setColumnOrder}actionButtons={- <CreateProjectMemberButton orgId={orgId} project={project} />+ <CreateProjectMemberDialogController orgId={orgId} project={project}>+ {({+ hasAccess,+ hasOnlySingleProjectAccess,+ isSubmitting,+ usageLimit,+ Trigger,+ }) => (+ <Trigger asChild>+ <ActionButton+ variant="secondary"+ loading={isSubmitting}+ hasAccess={hasAccess}+ usageLimit={usageLimit}+ icon={<PlusIcon className="h-5 w-5" aria-hidden="true" />}+ >+ {hasOnlySingleProjectAccess+ ? "Add project member"+ : "Add new member"}+ </ActionButton>+ </Trigger>+ )}+ </CreateProjectMemberDialogController>}searchConfig={{metadataSearchFields: ["Name", "Email"],diff --git a/web/src/features/rbac/components/RoleSelectItem.tsx b/web/src/features/rbac/components/RoleSelectItem.tsxindex ecf2966e30..f45b9c89c8 100644--- a/web/src/features/rbac/components/RoleSelectItem.tsx+++ b/web/src/features/rbac/components/RoleSelectItem.tsx@@ -6,9 +6,9 @@ import {} from "@/src/components/ui/hover-card";import { SelectItem } from "@/src/components/ui/select";import {- Role,projectNoneRoleComment,projectRoleAccessRights,+ type Role,} from "@langfuse/shared";import {organizationRoleAccessRights,@@ -23,8 +23,8 @@ export const RoleSelectItem = ({role: Role;isProjectRole?: boolean;}) => {- const isProjectNoneRole = role === Role.NONE && isProjectRole;- const isOrgNoneRole = role === Role.NONE && !isProjectRole;+ const isProjectNoneRole = role === "NONE" && isProjectRole;+ const isOrgNoneRole = role === "NONE" && !isProjectRole;const orgScopes = reduceScopesToListItems(organizationRoleAccessRights, role);const projectScopes = reduceScopesToListItems(projectRoleAccessRights, role);diff --git a/web/src/features/rbac/constants/orderedRoles.ts b/web/src/features/rbac/constants/orderedRoles.tsindex bae7f4affb..0516c188de 100644--- a/web/src/features/rbac/constants/orderedRoles.ts+++ b/web/src/features/rbac/constants/orderedRoles.ts@@ -1,9 +1,9 @@-import { Role } from "@langfuse/shared";+import { type Role } from "@langfuse/shared/src/db";export const orderedRoles: Record<Role, number> = {- [Role.OWNER]: 4,- [Role.ADMIN]: 3,- [Role.MEMBER]: 2,- [Role.VIEWER]: 1,- [Role.NONE]: 0,+ OWNER: 4,+ ADMIN: 3,+ MEMBER: 2,+ VIEWER: 1,+ NONE: 0,};