OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.
dashboard: restrict access to organization users
Carl-Gerhard Lindesvärdd0079c8dc358
diff --git a/apps/dashboard/Dockerfile b/apps/dashboard/Dockerfileindex eaea9a5cf..348d35fb4 100644--- a/apps/dashboard/Dockerfile+++ b/apps/dashboard/Dockerfile@@ -30,12 +30,16 @@ ENV NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY=$NEXT_PUBLIC_CLERK_PUBLISHABLE_KEYARG CLERK_SECRET_KEYENV CLERK_SECRET_KEY=$CLERK_SECRET_KEY+ARG CLERK_SIGNING_SECRET+ENV CLERK_SIGNING_SECRET=$CLERK_SIGNING_SECRET+ARG NEXT_PUBLIC_SENTRY_DSNENV NEXT_PUBLIC_SENTRY_DSN=$NEXT_PUBLIC_SENTRY_DSNARG SENTRY_AUTH_TOKENENV SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN+ENV PNPM_HOME="/pnpm"ENV PATH="$PNPM_HOME:$PATH"diff --git a/apps/dashboard/package.json b/apps/dashboard/package.jsonindex 6bf527abf..5db03c8f3 100644--- a/apps/dashboard/package.json+++ b/apps/dashboard/package.json@@ -31,6 +31,7 @@"@radix-ui/react-label": "^2.0.2","@radix-ui/react-popover": "^1.0.7","@radix-ui/react-progress": "^1.0.3",+ "@radix-ui/react-radio-group": "^1.1.3","@radix-ui/react-scroll-area": "^1.0.5","@radix-ui/react-slot": "^1.0.2","@radix-ui/react-tabs": "^1.0.4",diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout.tsxindex c9c014775..74f4844b2 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout.tsx@@ -1,7 +1,9 @@+import { FullPageEmptyState } from '@/components/full-page-empty-state';import { notFound } from 'next/navigation';import {getCurrentOrganizations,+ getCurrentProjects,getDashboardsByProjectId,getProjectsByOrganizationSlug,} from '@openpanel/db';@@ -22,16 +24,30 @@ export default async function AppLayout({}: AppLayoutProps) {const [organizations, projects, dashboards] = await Promise.all([getCurrentOrganizations(),- getProjectsByOrganizationSlug(organizationId),+ getCurrentProjects(organizationId),getDashboardsByProjectId(projectId),]);if (!organizations.find((item) => item.slug === organizationId)) {- return notFound();+ return (+ <FullPageEmptyState+ title="Could not find organization"+ className="min-h-screen"+ >+ The organization you are looking for could not be found.+ </FullPageEmptyState>+ );}if (!projects.find((item) => item.id === projectId)) {- return notFound();+ return (+ <FullPageEmptyState+ title="Could not find project"+ className="min-h-screen"+ >+ The project you are looking for could not be found.+ </FullPageEmptyState>+ );}return (diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page-layout.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page-layout.tsxindex a29594416..7e382560a 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page-layout.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page-layout.tsx@@ -1,4 +1,7 @@-import { getProjectsByOrganizationSlug } from '@openpanel/db';+import {+ getCurrentProjects,+ getProjectsByOrganizationSlug,+} from '@openpanel/db';import LayoutProjectSelector from './layout-project-selector';@@ -13,7 +16,7 @@ export default async function PageLayout({title,organizationSlug,}: PageLayoutProps) {- const projects = await getProjectsByOrganizationSlug(organizationSlug);+ const projects = await getCurrentProjects(organizationSlug);return (<>diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invite-user.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invite-user.tsxdeleted file mode 100644index bcc4b9e86..000000000--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invite-user.tsx+++ /dev/null@@ -1,60 +0,0 @@-import { api } from '@/app/_trpc/client';-import { InputWithLabel } from '@/components/forms/input-with-label';-import { Button } from '@/components/ui/button';-import { useAppParams } from '@/hooks/useAppParams';-import { zodResolver } from '@hookform/resolvers/zod';-import { SendIcon } from 'lucide-react';-import { useRouter } from 'next/navigation';-import { useForm } from 'react-hook-form';-import { toast } from 'sonner';-import type { z } from 'zod';--import { zInviteUser } from '@openpanel/validation';--type IForm = z.infer<typeof zInviteUser>;--export function InviteUser() {- const router = useRouter();- const { organizationId: organizationSlug } = useAppParams();-- const { register, handleSubmit, formState, reset } = useForm<IForm>({- resolver: zodResolver(zInviteUser),- defaultValues: {- organizationSlug,- email: '',- role: 'org:member',- },- });-- const mutation = api.organization.inviteUser.useMutation({- onSuccess() {- toast('User invited!', {- description: 'The user has been invited to the organization.',- });- reset();- router.refresh();- },- });-- return (- <form- onSubmit={handleSubmit((values) => mutation.mutate(values))}- className="flex items-end gap-4"- >- <InputWithLabel- className="w-full max-w-sm"- label="Email"- placeholder="Who do you want to invite?"- {...register('email')}- />- <Button- icon={SendIcon}- type="submit"- disabled={!formState.isDirty}- loading={mutation.isLoading}- >- Invite user- </Button>- </form>- );-}diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invited-users.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invited-users.tsxdeleted file mode 100644index 33b8bfe64..000000000--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invited-users.tsx+++ /dev/null@@ -1,65 +0,0 @@-'use client';--import {- Table,- TableBody,- TableCell,- TableHead,- TableHeader,- TableRow,-} from '@/components/ui/table';-import { Widget, WidgetBody, WidgetHead } from '@/components/widget';--import type { IServiceInvites } from '@openpanel/db';--import { InviteUser } from './invite-user';--interface InvitedUsersProps {- invites: IServiceInvites;-}-export default function InvitedUsers({ invites }: InvitedUsersProps) {- return (- <Widget>- <WidgetHead className="flex items-center justify-between">- <span className="title">Invites</span>- </WidgetHead>- <WidgetBody>- <InviteUser />-- <div className="font-medium mt-8 mb-2">Invited users</div>- <Table className="mini">- <TableHeader>- <TableRow>- <TableHead>Email</TableHead>- <TableHead>Role</TableHead>- <TableHead>Status</TableHead>- <TableHead>Created</TableHead>- </TableRow>- </TableHeader>- <TableBody>- {invites.map((item) => {- return (- <TableRow key={item.id}>- <TableCell className="font-medium">{item.email}</TableCell>- <TableCell>{item.role}</TableCell>- <TableCell>{item.status}</TableCell>- <TableCell>- {new Date(item.createdAt).toLocaleString()}- </TableCell>- </TableRow>- );- })}-- {invites.length === 0 && (- <TableRow>- <TableCell colSpan={2} className="italic">- No invites- </TableCell>- </TableRow>- )}- </TableBody>- </Table>- </WidgetBody>- </Widget>- );-}diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/create-invite.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/create-invite.tsxnew file mode 100644index 000000000..428cc392e--- /dev/null+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/create-invite.tsx@@ -0,0 +1,141 @@+import { api } from '@/app/_trpc/client';+import { InputWithLabel } from '@/components/forms/input-with-label';+import { Button } from '@/components/ui/button';+import { ComboboxAdvanced } from '@/components/ui/combobox-advanced';+import { Label } from '@/components/ui/label';+import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';+import {+ closeSheet,+ Sheet,+ SheetContent,+ SheetDescription,+ SheetFooter,+ SheetHeader,+ SheetTitle,+ SheetTrigger,+} from '@/components/ui/sheet';+import { useAppParams } from '@/hooks/useAppParams';+import { zodResolver } from '@hookform/resolvers/zod';+import { PlusIcon, SendIcon } from 'lucide-react';+import { useRouter } from 'next/navigation';+import { Controller, useForm } from 'react-hook-form';+import { toast } from 'sonner';+import type { z } from 'zod';++import type { IServiceProject } from '@openpanel/db';+import { zInviteUser } from '@openpanel/validation';++type IForm = z.infer<typeof zInviteUser>;++interface Props {+ projects: IServiceProject[];+}++export default function CreateInvite({ projects }: Props) {+ const router = useRouter();+ const { organizationId: organizationSlug } = useAppParams();++ const { register, handleSubmit, formState, reset, control } = useForm<IForm>({+ resolver: zodResolver(zInviteUser),+ defaultValues: {+ organizationSlug,+ access: [],+ role: 'org:member',+ },+ });++ const mutation = api.organization.inviteUser.useMutation({+ onSuccess() {+ toast('User invited!', {+ description: 'The user has been invited to the organization.',+ });+ reset();+ closeSheet();+ router.refresh();+ },+ });++ return (+ <Sheet>+ <SheetTrigger asChild>+ <Button icon={PlusIcon}>Invite user</Button>+ </SheetTrigger>+ <SheetContent>+ <SheetHeader>+ <SheetTitle>Invite a user</SheetTitle>+ <SheetDescription>+ Invite users to your organization. They will recieve an email will+ instructions.+ </SheetDescription>+ </SheetHeader>+ <form+ onSubmit={handleSubmit((values) => mutation.mutate(values))}+ className="flex flex-col gap-8"+ >+ <InputWithLabel+ className="w-full max-w-sm"+ label="Email"+ error={formState.errors.email?.message}+ placeholder="Who do you want to invite?"+ {...register('email')}+ />+ <div>+ <Label>What role?</Label>+ <Controller+ name="role"+ control={control}+ render={({ field }) => (+ <RadioGroup+ defaultValue={field.value}+ onChange={field.onChange}+ ref={field.ref}+ onBlur={field.onBlur}+ className="flex gap-4"+ >+ <div className="flex items-center gap-2">+ <RadioGroupItem value="org:member" id="member" />+ <Label className="mb-0" htmlFor="member">+ Member+ </Label>+ </div>+ <div className="flex items-center gap-2">+ <RadioGroupItem value="org:admin" id="admin" />+ <Label className="mb-0" htmlFor="admin">+ Admin+ </Label>+ </div>+ </RadioGroup>+ )}+ />+ </div>+ <Controller+ name="access"+ control={control}+ render={({ field }) => (+ <div>+ <Label>Restrict access</Label>+ <ComboboxAdvanced+ placeholder="Restrict access to projects"+ value={field.value}+ onChange={field.onChange}+ items={projects.map((item) => ({+ label: item.name,+ value: item.id,+ }))}+ />+ <p className="text-xs text-muted-foreground mt-1">+ Leave empty to give access to all projects+ </p>+ </div>+ )}+ />+ <SheetFooter>+ <Button icon={SendIcon} type="submit" loading={mutation.isLoading}>+ Invite user+ </Button>+ </SheetFooter>+ </form>+ </SheetContent>+ </Sheet>+ );+}diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/index.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/index.tsxnew file mode 100644index 000000000..dfa64e759--- /dev/null+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/index.tsx@@ -0,0 +1,18 @@+import { getInvites, getProjectsByOrganizationSlug } from '@openpanel/db';++import Invites from './invites';++interface Props {+ organizationSlug: string;+}++const InvitesServer = async ({ organizationSlug }: Props) => {+ const [invites, projects] = await Promise.all([+ getInvites(organizationSlug),+ getProjectsByOrganizationSlug(organizationSlug),+ ]);++ return <Invites invites={invites} projects={projects} />;+};++export default InvitesServer;diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/invites.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/invites.tsxnew file mode 100644index 000000000..adf4537e5--- /dev/null+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/invites.tsx@@ -0,0 +1,111 @@+'use client';++import { Dot } from '@/components/dot';+import { TooltipComplete } from '@/components/tooltip-complete';+import { Badge } from '@/components/ui/badge';+import {+ Table,+ TableBody,+ TableCell,+ TableHead,+ TableHeader,+ TableRow,+} from '@/components/ui/table';+import { Widget, WidgetHead } from '@/components/widget';+import { cn } from '@/utils/cn';++import type { IServiceInvite, IServiceProject } from '@openpanel/db';++import CreateInvite from './create-invite';++interface Props {+ invites: IServiceInvite[];+ projects: IServiceProject[];+}++const Invites = ({ invites, projects }: Props) => {+ return (+ <Widget>+ <WidgetHead className="flex items-center justify-between">+ <span className="title">Invites</span>+ <CreateInvite projects={projects} />+ </WidgetHead>+ <Table className="mini">+ <TableHeader>+ <TableRow>+ <TableHead>Name</TableHead>+ <TableHead>Role</TableHead>+ <TableHead>Created</TableHead>+ <TableHead>Status</TableHead>+ <TableHead>Access</TableHead>+ </TableRow>+ </TableHeader>+ <TableBody>+ {invites.map((item) => {+ return <Item {...item} projects={projects} key={item.id} />;+ })}+ </TableBody>+ </Table>+ </Widget>+ );+};++interface ItemProps extends IServiceInvite {+ projects: IServiceProject[];+}++function Item({+ id,+ email,+ role,+ createdAt,+ projects,+ publicMetadata,+ status,+}: ItemProps) {+ const access = (publicMetadata?.access ?? []) as string[];+ return (+ <TableRow key={id}>+ <TableCell className="font-medium">{email}</TableCell>+ <TableCell>{role}</TableCell>+ <TableCell>+ <TooltipComplete content={new Date(createdAt).toLocaleString()}>+ {new Date(createdAt).toLocaleDateString()}+ </TooltipComplete>+ </TableCell>+ <TableCell className="capitalize flex items-center gap-2">+ <Dot+ className={cn(+ status === 'accepted' && 'bg-emerald-600',+ status === 'revoked' && 'bg-red-600',+ status === 'pending' && 'bg-orange-600'+ )}+ animated={status === 'pending'}+ />+ {status}+ </TableCell>+ <TableCell>+ {access.map((id) => {+ const project = projects.find((p) => p.id === id);+ if (!project) {+ return (+ <Badge key={id} className="mr-1">+ Unknown+ </Badge>+ );+ }+ return (+ <Badge key={id} color="blue" className="mr-1">+ {project.name}+ </Badge>+ );+ })}+ {access.length === 0 && (+ <Badge variant={'secondary'}>All projects</Badge>+ )}+ </TableCell>+ </TableRow>+ );+}++export default Invites;diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/index.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/index.tsxnew file mode 100644index 000000000..89a424c38--- /dev/null+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/index.tsx@@ -0,0 +1,18 @@+import { getMembers, getProjectsByOrganizationSlug } from '@openpanel/db';++import Members from './members';++interface Props {+ organizationSlug: string;+}++const MembersServer = async ({ organizationSlug }: Props) => {+ const [members, projects] = await Promise.all([+ getMembers(organizationSlug),+ getProjectsByOrganizationSlug(organizationSlug),+ ]);++ return <Members members={members} projects={projects} />;+};++export default MembersServer;diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/members.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/members.tsxnew file mode 100644index 000000000..4fd1d6b5a--- /dev/null+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/members.tsx@@ -0,0 +1,93 @@+'use client';++import { useState } from 'react';+import { api } from '@/app/_trpc/client';+import { ComboboxAdvanced } from '@/components/ui/combobox-advanced';+import {+ Table,+ TableBody,+ TableCell,+ TableHead,+ TableHeader,+ TableRow,+} from '@/components/ui/table';+import { Widget, WidgetHead } from '@/components/widget';++import type { IServiceMember, IServiceProject } from '@openpanel/db';++interface Props {+ members: IServiceMember[];+ projects: IServiceProject[];+}++const Members = ({ members, projects }: Props) => {+ return (+ <Widget>+ <WidgetHead className="flex items-center justify-between">+ <span className="title">Members</span>+ </WidgetHead>+ <Table className="mini">+ <TableHeader>+ <TableRow>+ <TableHead>Name</TableHead>+ <TableHead>Role</TableHead>+ <TableHead>Created</TableHead>+ <TableHead>Access</TableHead>+ </TableRow>+ </TableHeader>+ <TableBody>+ {members.map((item) => {+ return <Item {...item} projects={projects} key={item.id} />;+ })}+ </TableBody>+ </Table>+ </Widget>+ );+};++interface ItemProps extends IServiceMember {+ projects: IServiceProject[];+}++function Item({+ id,+ name,+ role,+ createdAt,+ organization,+ projects,+ access: prevAccess,+}: ItemProps) {+ const mutation = api.organization.updateMemberAccess.useMutation();+ const [access, setAccess] = useState<string[]>(+ prevAccess.map((item) => item.projectId)+ );++ return (+ <TableRow key={id}>+ <TableCell className="font-medium">{name}</TableCell>+ <TableCell>{role}</TableCell>+ <TableCell>{new Date(createdAt).toLocaleString()}</TableCell>+ <TableCell>+ <ComboboxAdvanced+ placeholder="Restrict access to projects"+ value={access}+ onChange={(newAccess) => {+ setAccess(newAccess);+ mutation.mutate({+ userId: id!,+ organizationSlug: organization.slug,+ access: newAccess as string[],+ });+ }}+ items={projects.map((item) => ({+ label: item.name,+ value: item.id,+ }))}+ />+ </TableCell>+ </TableRow>+ );+}++export default Members;diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/page.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/page.tsxindex 30652cf38..9ced455d5 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/page.tsx@@ -1,11 +1,11 @@import PageLayout from '@/app/(app)/[organizationId]/[projectId]/page-layout';-import { clerkClient } from '@clerk/nextjs';import { notFound } from 'next/navigation';import { getInvites, getOrganizationBySlug } from '@openpanel/db';import EditOrganization from './edit-organization';-import InvitedUsers from './invited-users';+import InvitesServer from './invites';+import MembersServer from './members';interface PageProps {params: {@@ -13,8 +13,10 @@ interface PageProps {};}-export default async function Page({ params: { organizationId } }: PageProps) {- const organization = await getOrganizationBySlug(organizationId);+export default async function Page({+ params: { organizationId: organizationSlug },+}: PageProps) {+ const organization = await getOrganizationBySlug(organizationSlug);if (!organization) {return notFound();@@ -23,10 +25,11 @@ export default async function Page({ params: { organizationId } }: PageProps) {const invites = await getInvites(organization.id);return (- <PageLayout title={organization.name} organizationSlug={organizationId}>- <div className="p-4 grid grid-cols-1 gap-4">+ <PageLayout title={organization.name} organizationSlug={organizationSlug}>+ <div className="p-4 grid grid-cols-1 gap-8"><EditOrganization organization={organization} />- <InvitedUsers invites={invites} />+ <MembersServer organizationSlug={organizationSlug} />+ <InvitesServer organizationSlug={organizationSlug} /></div></PageLayout>);diff --git a/apps/dashboard/src/app/(app)/[organizationId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationId]/page.tsxindex 47d95831d..6675966a2 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/page.tsx@@ -3,6 +3,7 @@ import { ProjectCard } from '@/components/projects/project-card';import { notFound, redirect } from 'next/navigation';import {+ getCurrentProjects,getOrganizationBySlug,getProjectsByOrganizationSlug,isWaitlistUserAccepted,@@ -19,7 +20,7 @@ interface PageProps {export default async function Page({ params: { organizationId } }: PageProps) {const [organization, projects] = await Promise.all([getOrganizationBySlug(organizationId),- getProjectsByOrganizationSlug(organizationId),+ getCurrentProjects(organizationId),]);if (!organization) {diff --git a/apps/dashboard/src/app/api/clerk/webhook/route.ts b/apps/dashboard/src/app/api/clerk/webhook/route.tsnew file mode 100644index 000000000..7f4ab6ad3--- /dev/null+++ b/apps/dashboard/src/app/api/clerk/webhook/route.ts@@ -0,0 +1,37 @@+import type { WebhookEvent } from '@clerk/nextjs/server';++import { AccessLevel, db } from '@openpanel/db';++export async function POST(request: Request) {+ const payload: WebhookEvent = await request.json();++ if (payload.type === 'organizationMembership.created') {+ const access = payload.data.public_metadata.access;+ if (Array.isArray(access)) {+ await db.projectAccess.createMany({+ data: access+ .filter((a): a is string => typeof a === 'string')+ .map((projectId) => ({+ organization_slug: payload.data.organization.slug!,+ project_id: projectId,+ user_id: payload.data.public_user_data.user_id,+ level: AccessLevel.read,+ })),+ });+ }+ }+ if (payload.type === 'organizationMembership.deleted') {+ await db.projectAccess.deleteMany({+ where: {+ organization_slug: payload.data.organization.slug!,+ user_id: payload.data.public_user_data.user_id,+ },+ });+ }++ return Response.json({ message: 'Webhook received!' });+}++export async function GET() {+ return Response.json({ message: 'Hello World!' });+}diff --git a/apps/dashboard/src/components/dot.tsx b/apps/dashboard/src/components/dot.tsxnew file mode 100644index 000000000..6dd67aec2--- /dev/null+++ b/apps/dashboard/src/components/dot.tsx@@ -0,0 +1,46 @@+import { cn } from '@/utils/cn';++interface DotProps {+ className?: string;+ size?: number;+ animated?: boolean;+}++function filterCn(filter: string[], className: string | undefined) {+ const split: string[] = className?.split(' ') || [];+ return split+ .filter((item) => !filter.some((filterItem) => item.startsWith(filterItem)))+ .join(' ');+}++export function Dot({ className, size = 8, animated }: DotProps) {+ const style = {+ width: size,+ height: size,+ };+ return (+ <div+ className={cn(+ 'relative',+ filterCn(['bg-', 'animate-', 'group-hover/row'], className)+ )}+ style={style}+ >+ <div+ className={cn(+ 'absolute !m-0 rounded-full',+ animated !== false && 'animate-ping',+ className+ )}+ style={style}+ />+ <div+ className={cn(+ 'absolute !m-0 rounded-full',+ filterCn(['animate-', 'group-hover/row'], className)+ )}+ style={style}+ />+ </div>+ );+}diff --git a/apps/dashboard/src/components/full-page-empty-state.tsx b/apps/dashboard/src/components/full-page-empty-state.tsxindex 092e9582a..6c74dfbc6 100644--- a/apps/dashboard/src/components/full-page-empty-state.tsx+++ b/apps/dashboard/src/components/full-page-empty-state.tsx@@ -1,3 +1,4 @@+import { cn } from '@/utils/cn';import { BoxSelectIcon } from 'lucide-react';import type { LucideIcon } from 'lucide-react';@@ -5,15 +6,17 @@ interface FullPageEmptyStateProps {icon?: LucideIcon;title: string;children: React.ReactNode;+ className?: string;}export function FullPageEmptyState({icon: Icon = BoxSelectIcon,title,children,+ className,}: FullPageEmptyStateProps) {return (- <div className="p-4 flex items-center justify-center">+ <div className={cn('p-4 flex items-center justify-center', className)}><div className="p-8 w-full max-w-xl flex flex-col items-center justify-center"><div className="w-24 h-24 bg-white shadow-sm rounded-full flex justify-center items-center mb-6"><Icon size={60} strokeWidth={1} />diff --git a/apps/dashboard/src/components/report/sidebar/filters/FilterItem.tsx b/apps/dashboard/src/components/report/sidebar/filters/FilterItem.tsxindex fb37473db..816bf370b 100644--- a/apps/dashboard/src/components/report/sidebar/filters/FilterItem.tsx+++ b/apps/dashboard/src/components/report/sidebar/filters/FilterItem.tsx@@ -120,11 +120,7 @@ export function FilterItem({ filter, event }: FilterProps) {items={valuesCombobox}value={filter.value}className="flex-1"- onChange={(setFn) => {- changeFilterValue(- typeof setFn === 'function' ? setFn(filter.value) : setFn- );- }}+ onChange={changeFilterValue}placeholder="Select..."/></div>diff --git a/apps/dashboard/src/components/tooltip-complete.tsx b/apps/dashboard/src/components/tooltip-complete.tsxnew file mode 100644index 000000000..20022a8c6--- /dev/null+++ b/apps/dashboard/src/components/tooltip-complete.tsx@@ -0,0 +1,26 @@+import { Tooltip, TooltipContent, TooltipTrigger } from './ui/tooltip';++interface TooltipCompleteProps {+ children: React.ReactNode | string;+ content: React.ReactNode | string;+ disabled?: boolean;+ side?: 'top' | 'right' | 'bottom' | 'left';+}++export function TooltipComplete({+ children,+ disabled,+ content,+ side,+}: TooltipCompleteProps) {+ return (+ <Tooltip>+ <TooltipTrigger asChild={typeof children !== 'string'}>+ {children}+ </TooltipTrigger>+ <TooltipContent side={side} disabled={disabled}>+ {content}+ </TooltipContent>+ </Tooltip>+ );+}diff --git a/apps/dashboard/src/components/ui/combobox-advanced.tsx b/apps/dashboard/src/components/ui/combobox-advanced.tsxindex 91251087d..667bf144c 100644--- a/apps/dashboard/src/components/ui/combobox-advanced.tsx+++ b/apps/dashboard/src/components/ui/combobox-advanced.tsx@@ -19,7 +19,7 @@ type IItem = Record<'value' | 'label', IValue>;interface ComboboxAdvancedProps {value: IValue[];- onChange: React.Dispatch<React.SetStateAction<IValue[]>>;+ onChange: (value: IValue[]) => void;items: IItem[];placeholder: string;className?: string;@@ -57,12 +57,11 @@ export function ComboboxAdvanced({}}onSelect={() => {setInputValue('');- onChange((prev) => {- if (prev.includes(item.value)) {- return prev.filter((s) => s !== item.value);- }- return [...prev, item.value];- });+ onChange(+ value.includes(item.value)+ ? value.filter((s) => s !== item.value)+ : [...value, item.value]+ );}}className={'cursor-pointer flex items-center gap-2'}>diff --git a/apps/dashboard/src/components/ui/radio-group.tsx b/apps/dashboard/src/components/ui/radio-group.tsxindex fb251a995..357aee181 100644--- a/apps/dashboard/src/components/ui/radio-group.tsx+++ b/apps/dashboard/src/components/ui/radio-group.tsx@@ -1,47 +1,42 @@-'use client';+import * as React from "react"+import * as RadioGroupPrimitive from "@radix-ui/react-radio-group"+import { Circle } from "lucide-react"-import * as React from 'react';-import { cn } from '@/utils/cn';+import { cn } from "@/utils/cn"-export type RadioGroupProps = React.InputHTMLAttributes<HTMLDivElement>;-export type RadioGroupItemProps =- React.InputHTMLAttributes<HTMLButtonElement> & {- active?: boolean;- };+const RadioGroup = React.forwardRef<+ React.ElementRef<typeof RadioGroupPrimitive.Root>,+ React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Root>+>(({ className, ...props }, ref) => {+ return (+ <RadioGroupPrimitive.Root+ className={cn("grid gap-2", className)}+ {...props}+ ref={ref}+ />+ )+})+RadioGroup.displayName = RadioGroupPrimitive.Root.displayName-const RadioGroup = React.forwardRef<HTMLDivElement, RadioGroupProps>(- ({ className, type, ...props }, ref) => {- return (- <div- className={cn(- 'flex h-10 divide-x rounded-md border border-input bg-background text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',- className- )}- ref={ref}- {...props}- />- );- }-);+const RadioGroupItem = React.forwardRef<+ React.ElementRef<typeof RadioGroupPrimitive.Item>,+ React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Item>+>(({ className, ...props }, ref) => {+ return (+ <RadioGroupPrimitive.Item+ ref={ref}+ className={cn(+ "aspect-square h-4 w-4 rounded-full border border-primary text-primary ring-offset-background focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",+ className+ )}+ {...props}+ >+ <RadioGroupPrimitive.Indicator className="flex items-center justify-center">+ <Circle className="h-2.5 w-2.5 fill-current text-current" />+ </RadioGroupPrimitive.Indicator>+ </RadioGroupPrimitive.Item>+ )+})+RadioGroupItem.displayName = RadioGroupPrimitive.Item.displayName-const RadioGroupItem = React.forwardRef<HTMLButtonElement, RadioGroupItemProps>(- ({ className, active, ...props }, ref) => {- return (- <button- {...props}- className={cn(- 'flex-1 px-3 whitespace-nowrap leading-none hover:bg-slate-100 transition-colors font-medium',- className,- active && 'bg-slate-100'- )}- type="button"- ref={ref}- />- );- }-);--RadioGroup.displayName = 'RadioGroup';-RadioGroupItem.displayName = 'RadioGroupItem';--export { RadioGroup, RadioGroupItem };+export { RadioGroup, RadioGroupItem }diff --git a/apps/dashboard/src/components/ui/sheet.tsx b/apps/dashboard/src/components/ui/sheet.tsxindex e3b6b2863..225ed9af4 100644--- a/apps/dashboard/src/components/ui/sheet.tsx+++ b/apps/dashboard/src/components/ui/sheet.tsx@@ -133,6 +133,14 @@ const SheetDescription = React.forwardRef<));SheetDescription.displayName = SheetPrimitive.Description.displayName;+export function closeSheet() {+ if (typeof document === 'undefined') return;+ const element = document.querySelector('#close-sheet');+ if (element instanceof HTMLElement) {+ element.click();+ }+}+export {Sheet,SheetPortal,diff --git a/apps/dashboard/src/components/ui/table.tsx b/apps/dashboard/src/components/ui/table.tsxindex e99dfa414..56d4727ae 100644--- a/apps/dashboard/src/components/ui/table.tsx+++ b/apps/dashboard/src/components/ui/table.tsx@@ -6,18 +6,14 @@ import { cn } from '@/utils/cn';const Table = React.forwardRef<HTMLTableElement,React.HTMLAttributes<HTMLTableElement> & {- wrapper?: boolean;overflow?: boolean;}->(({ className, wrapper, overflow = true, ...props }, ref) => (+>(({ className, overflow = true, ...props }, ref) => (<div className={cn('card', className)}><div className={cn('relative w-full', overflow && 'overflow-auto')}><tableref={ref}- className={cn(- 'w-full caption-bottom text-sm [&.mini]:text-xs',- className- )}+ className={cn('w-full caption-bottom text-sm', className)}{...props}/></div>@@ -79,7 +75,7 @@ const TableHead = React.forwardRef<<thref={ref}className={cn(- 'p-4 text-left align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0 shadow-[0_0_0_0.5px] shadow-border [.mini_&]:p-2',+ 'px-4 h-10 text-left align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0 shadow-[0_0_0_0.5px] shadow-border',className)}{...props}@@ -94,7 +90,7 @@ const TableCell = React.forwardRef<<tdref={ref}className={cn(- 'p-4 align-middle [&:has([role=checkbox])]:pr-0 shadow-[0_0_0_0.5px] shadow-border [.mini_&]:p-2 whitespace-nowrap',+ 'px-4 h-12 align-middle [&:has([role=checkbox])]:pr-0 shadow-[0_0_0_0.5px] shadow-border whitespace-nowrap',className)}{...props}diff --git a/apps/dashboard/src/components/ui/tooltip.tsx b/apps/dashboard/src/components/ui/tooltip.tsxindex cd2156364..eeeaefaf3 100644--- a/apps/dashboard/src/components/ui/tooltip.tsx+++ b/apps/dashboard/src/components/ui/tooltip.tsx@@ -12,18 +12,22 @@ const TooltipTrigger = TooltipPrimitive.Trigger;const TooltipContent = React.forwardRef<React.ElementRef<typeof TooltipPrimitive.Content>,- React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>->(({ className, sideOffset = 4, ...props }, ref) => (- <TooltipPrimitive.Content- ref={ref}- sideOffset={sideOffset}- className={cn(- 'z-50 overflow-hidden rounded-md border bg-black px-3 py-1.5 text-sm text-popover shadow-md animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',- className- )}- {...props}- />-));+ React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content> & {+ disabled?: boolean;+ }+>(({ className, sideOffset = 4, disabled, ...props }, ref) =>+ disabled ? null : (+ <TooltipPrimitive.Content+ ref={ref}+ sideOffset={sideOffset}+ className={cn(+ 'z-50 overflow-hidden rounded-md border bg-black px-3 py-1.5 text-sm text-popover shadow-md animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',+ className+ )}+ {...props}+ />+ )+);TooltipContent.displayName = TooltipPrimitive.Content.displayName;export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };diff --git a/apps/dashboard/src/middleware.ts b/apps/dashboard/src/middleware.tsindex a9af39afd..1c966765d 100644--- a/apps/dashboard/src/middleware.ts+++ b/apps/dashboard/src/middleware.ts@@ -4,7 +4,7 @@ import { authMiddleware } from '@clerk/nextjs';// Please edit this to allow other routes to be public as needed.// See https://clerk.com/docs/references/nextjs/auth-middleware for more information about configuring your Middlewareexport default authMiddleware({- publicRoutes: ['/share/overview/:id', '/api/trpc(.*)'],+ publicRoutes: ['/share/overview/:id', '/api/trpc(.*)', '/api/clerk/(.*)?'],});export const config = {diff --git a/apps/dashboard/src/server/api/routers/organization.ts b/apps/dashboard/src/server/api/routers/organization.tsindex dc648f8bf..8a816bc92 100644--- a/apps/dashboard/src/server/api/routers/organization.ts+++ b/apps/dashboard/src/server/api/routers/organization.ts@@ -2,7 +2,7 @@ import { createTRPCRouter, protectedProcedure } from '@/server/api/trpc';import { clerkClient } from '@clerk/nextjs';import { z } from 'zod';-import { getOrganizationBySlug } from '@openpanel/db';+import { db, getOrganizationBySlug } from '@openpanel/db';import { zInviteUser } from '@openpanel/validation';export const organizationRouter = createTRPCRouter({@@ -30,6 +30,7 @@ export const organizationRouter = createTRPCRouter({name: input.name,});}),+inviteUser: protectedProcedure.input(zInviteUser).mutation(async ({ input, ctx }) => {@@ -44,6 +45,50 @@ export const organizationRouter = createTRPCRouter({emailAddress: input.email,role: input.role,inviterUserId: ctx.session.userId,+ publicMetadata: {+ access: input.access,+ },+ });+ }),+ revokeInvite: protectedProcedure+ .input(+ z.object({+ organizationId: z.string(),+ invitationId: z.string(),+ })+ )+ .mutation(async ({ input, ctx }) => {+ return clerkClient.organizations.revokeOrganizationInvitation({+ organizationId: input.organizationId,+ invitationId: input.invitationId,+ requestingUserId: ctx.session.userId,});}),++ updateMemberAccess: protectedProcedure+ .input(+ z.object({+ userId: z.string(),+ organizationSlug: z.string(),+ access: z.array(z.string()),+ })+ )+ .mutation(async ({ input }) => {+ return db.$transaction([+ db.projectAccess.deleteMany({+ where: {+ user_id: input.userId,+ organization_slug: input.organizationSlug,+ },+ }),+ db.projectAccess.createMany({+ data: input.access.map((projectId) => ({+ user_id: input.userId,+ organization_slug: input.organizationSlug,+ project_id: projectId,+ level: 'read',+ })),+ }),+ ]);+ }),});diff --git a/packages/db/prisma/migrations/20240325221639_add_project_access/migration.sql b/packages/db/prisma/migrations/20240325221639_add_project_access/migration.sqlnew file mode 100644index 000000000..eb00e8af3--- /dev/null+++ b/packages/db/prisma/migrations/20240325221639_add_project_access/migration.sql@@ -0,0 +1,17 @@+-- CreateEnum+CREATE TYPE "AccessLevel" AS ENUM ('read', 'write', 'admin');++-- CreateTable+CREATE TABLE "project_access" (+ "id" TEXT NOT NULL,+ "project_id" TEXT NOT NULL,+ "user_id" TEXT NOT NULL,+ "level" "AccessLevel" NOT NULL,+ "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,+ "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,++ CONSTRAINT "project_access_pkey" PRIMARY KEY ("id")+);++-- AddForeignKey+ALTER TABLE "project_access" ADD CONSTRAINT "project_access_project_id_fkey" FOREIGN KEY ("project_id") REFERENCES "projects"("id") ON DELETE RESTRICT ON UPDATE CASCADE;diff --git a/packages/db/prisma/migrations/20240325221913_add_uuid_project_access/migration.sql b/packages/db/prisma/migrations/20240325221913_add_uuid_project_access/migration.sqlnew file mode 100644index 000000000..4370f80bc--- /dev/null+++ b/packages/db/prisma/migrations/20240325221913_add_uuid_project_access/migration.sql@@ -0,0 +1,12 @@+/*+ Warnings:++ - The primary key for the `project_access` table will be changed. If it partially fails, the table could be left without primary key constraint.+ - The `id` column on the `project_access` table would be dropped and recreated. This will lead to data loss if there is data in the column.++*/+-- AlterTable+ALTER TABLE "project_access" DROP CONSTRAINT "project_access_pkey",+DROP COLUMN "id",+ADD COLUMN "id" UUID NOT NULL DEFAULT gen_random_uuid(),+ADD CONSTRAINT "project_access_pkey" PRIMARY KEY ("id");diff --git a/packages/db/prisma/migrations/20240325222110_add_org_slug_to_project_access/migration.sql b/packages/db/prisma/migrations/20240325222110_add_org_slug_to_project_access/migration.sqlnew file mode 100644index 000000000..32d438105--- /dev/null+++ b/packages/db/prisma/migrations/20240325222110_add_org_slug_to_project_access/migration.sql@@ -0,0 +1,8 @@+/*+ Warnings:++ - Added the required column `organization_slug` to the `project_access` table without a default value. This is not possible if the table is not empty.++*/+-- AlterTable+ALTER TABLE "project_access" ADD COLUMN "organization_slug" TEXT NOT NULL;diff --git a/packages/db/prisma/schema.prisma b/packages/db/prisma/schema.prismaindex 1800d5786..0adb4fc14 100644--- a/packages/db/prisma/schema.prisma+++ b/packages/db/prisma/schema.prisma@@ -27,9 +27,30 @@ model Project {EventMeta EventMeta[]Reference Reference[]+ access ProjectAccess[]+@@map("projects")}+enum AccessLevel {+ read+ write+ admin+}++model ProjectAccess {+ id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid+ project_id String+ project Project @relation(fields: [project_id], references: [id])+ organization_slug String+ user_id String+ level AccessLevel+ createdAt DateTime @default(now())+ updatedAt DateTime @default(now()) @updatedAt++ @@map("project_access")+}+model Event {id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuidname Stringdiff --git a/packages/db/src/services/organization.service.ts b/packages/db/src/services/organization.service.tsindex a4456d410..cb0821c91 100644--- a/packages/db/src/services/organization.service.ts+++ b/packages/db/src/services/organization.service.ts@@ -2,21 +2,31 @@ import { auth, clerkClient } from '@clerk/nextjs';import type {Organization,OrganizationInvitation,+ OrganizationMembership,} from '@clerk/nextjs/dist/types/server';+import type { ProjectAccess } from '../prisma-client';import { db } from '../prisma-client';-export type IServiceOrganization = Awaited<- ReturnType<typeof getCurrentOrganizations>->[number];--export type IServiceInvites = Awaited<ReturnType<typeof getInvites>>;+export type IServiceOrganization = ReturnType<typeof transformOrganization>;+export type IServiceInvite = ReturnType<typeof transformInvite>;+export type IServiceMember = ReturnType<typeof transformMember>;+export type IServiceProjectAccess = ReturnType<typeof transformAccess>;export function transformOrganization(org: Organization) {return {id: org.id,name: org.name,- slug: org.slug,+ slug: org.slug!,+ };+}++export function transformAccess(access: ProjectAccess) {+ return {+ projectId: access.project_id,+ userId: access.user_id,+ level: access.level,+ organizationSlug: access.organization_slug,};}@@ -50,18 +60,77 @@ export async function getOrganizationByProjectId(projectId: string) {export function transformInvite(invite: OrganizationInvitation) {return {id: invite.id,+ organizationId: invite.organizationId,email: invite.emailAddress,role: invite.role,status: invite.status,createdAt: invite.createdAt,updatedAt: invite.updatedAt,+ publicMetadata: invite.publicMetadata,};}-export async function getInvites(organizationId: string) {+export async function getInvites(organizationSlug: string) {+ const org = await getOrganizationBySlug(organizationSlug);+ if (!org) return [];return await clerkClient.organizations.getOrganizationInvitationList({- organizationId,+ organizationId: org.id,}).then((invites) => invites.map(transformInvite));}++export function transformMember(+ item: OrganizationMembership & {+ access: IServiceProjectAccess[];+ }+) {+ return {+ memberId: item.id,+ id: item.publicUserData?.userId,+ name:+ [item.publicUserData?.firstName, item.publicUserData?.lastName]+ .filter(Boolean)+ .join(' ') || 'Unknown',+ role: item.role,+ createdAt: item.createdAt,+ updatedAt: item.updatedAt,+ publicMetadata: item.publicMetadata,+ organization: transformOrganization(item.organization),+ access: item.access,+ };+}++export async function getMembers(organizationSlug: string) {+ const org = await getOrganizationBySlug(organizationSlug);+ if (!org) return [];+ const [members, access] = await Promise.all([+ clerkClient.organizations.getOrganizationMembershipList({+ organizationId: org.id,+ }),+ db.projectAccess.findMany({+ where: {+ organization_slug: organizationSlug,+ },+ }),+ ]);++ return members+ .map((member) => {+ const projectAccess = access.filter(+ (item) => item.user_id === member.publicUserData?.userId+ );+ return {+ ...member,+ access: projectAccess.map(transformAccess),+ };+ })+ .map(transformMember);+}++export async function getMember(organizationSlug: string, userId: string) {+ const org = await getOrganizationBySlug(organizationSlug);+ if (!org) return null;+ const members = await getMembers(org.id);+ return members.find((member) => member.id === userId) ?? null;+}diff --git a/packages/db/src/services/project.service.ts b/packages/db/src/services/project.service.tsindex 044cdc216..4c70831e2 100644--- a/packages/db/src/services/project.service.ts+++ b/packages/db/src/services/project.service.ts@@ -1,3 +1,6 @@+import { auth } from '@clerk/nextjs';+import { project } from 'ramda';+import type { Project } from '../prisma-client';import { db } from '../prisma-client';@@ -33,3 +36,31 @@ export async function getProjectsByOrganizationSlug(slug: string) {return res.map(transformProject);}++export async function getCurrentProjects(slug: string) {+ const session = auth();+ if (!session.userId) {+ return [];+ }++ const access = await db.projectAccess.findMany({+ where: {+ organization_slug: slug,+ user_id: session.userId,+ },+ });++ const res = await db.project.findMany({+ where: {+ organization_slug: slug,+ },+ });++ if (access.length === 0) {+ return res.map(transformProject);+ }++ return res+ .filter((project) => access.some((a) => a.project_id === project.id))+ .map(transformProject);+}diff --git a/packages/validation/src/index.ts b/packages/validation/src/index.tsindex 7ca07272e..01713bb62 100644--- a/packages/validation/src/index.ts+++ b/packages/validation/src/index.ts@@ -80,7 +80,8 @@ export const zChartInput = z.object({export const zInviteUser = z.object({email: z.string().email(),organizationSlug: z.string(),- role: z.enum(['admin', 'org:member']),+ role: z.enum(['org:admin', 'org:member']),+ access: z.array(z.string()),});export const zShareOverview = z.object({diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 19ec4ac33..1f4feb2f5 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -168,6 +168,9 @@ importers:'@radix-ui/react-progress':specifier: ^1.0.3version: 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])+ '@radix-ui/react-radio-group':+ specifier: ^1.1.3+ version: 1.1.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])'@radix-ui/react-scroll-area':specifier: ^1.0.5version: 1.0.5(@types/[email protected])(@types/[email protected])([email protected])([email protected])@@ -5327,6 +5330,36 @@ packages:react-dom: 18.2.0([email protected])dev: false+ /@radix-ui/[email protected](@types/[email protected])(@types/[email protected])([email protected])([email protected]):+ resolution: {integrity: sha512-x+yELayyefNeKeTx4fjK6j99Fs6c4qKm3aY38G3swQVTN6xMpsrbigC0uHs2L//g8q4qR7qOcww8430jJmi2ag==}+ peerDependencies:+ '@types/react': '*'+ '@types/react-dom': '*'+ react: ^16.8 || ^17.0 || ^18.0+ react-dom: ^16.8 || ^17.0 || ^18.0+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true+ dependencies:+ '@babel/runtime': 7.23.9+ '@radix-ui/primitive': 1.0.1+ '@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])+ '@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])+ '@radix-ui/react-direction': 1.0.1(@types/[email protected])([email protected])+ '@radix-ui/react-presence': 1.0.1(@types/[email protected])(@types/[email protected])([email protected])([email protected])+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])+ '@radix-ui/react-roving-focus': 1.0.4(@types/[email protected])(@types/[email protected])([email protected])([email protected])+ '@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])+ '@radix-ui/react-use-previous': 1.0.1(@types/[email protected])([email protected])+ '@radix-ui/react-use-size': 1.0.1(@types/[email protected])([email protected])+ '@types/react': 18.2.56+ '@types/react-dom': 18.2.19+ react: 18.2.0+ react-dom: 18.2.0([email protected])+ dev: false+/@radix-ui/[email protected](@types/[email protected])(@types/[email protected])([email protected])([email protected]):resolution: {integrity: sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==}peerDependencies: