OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.
fix(dashboard): duplicate members
Carl-Gerhard Lindesvärdb693d0ba2b66
diff --git a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/create-invite.tsx b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/create-invite.tsxindex 2ed0428f7..bbf9ac6dc 100644--- a/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/create-invite.tsx+++ b/apps/dashboard/src/app/(app)/[organizationSlug]/[projectId]/settings/organization/invites/create-invite.tsx@@ -67,11 +67,13 @@ export default function CreateInvite({ projects }: Props) {</SheetTrigger><SheetContent><SheetHeader>- <SheetTitle>Invite a user</SheetTitle>- <SheetDescription>- Invite users to your organization. They will recieve an email will- instructions.- </SheetDescription>+ <div>+ <SheetTitle>Invite a user</SheetTitle>+ <SheetDescription>+ Invite users to your organization. They will recieve an email will+ instructions.+ </SheetDescription>+ </div></SheetHeader><formonSubmit={handleSubmit((values) => mutation.mutate(values))}diff --git a/apps/dashboard/src/app/(onboarding)/onboarding/onboarding-tracking.tsx b/apps/dashboard/src/app/(onboarding)/onboarding/onboarding-tracking.tsxindex 448a843f1..4afc5ba21 100644--- a/apps/dashboard/src/app/(onboarding)/onboarding/onboarding-tracking.tsx+++ b/apps/dashboard/src/app/(onboarding)/onboarding/onboarding-tracking.tsx@@ -104,7 +104,7 @@ const Tracking = ({render={({ field, formState }) => {return (<div>- <Label>Workspace name</Label>+ <Label>Workspace</Label><ComboboxclassName="w-full"placeholder="Select workspace"diff --git a/apps/dashboard/src/components/settings/members/columns.tsx b/apps/dashboard/src/components/settings/members/columns.tsxindex 93ed5b036..9babe6dac 100644--- a/apps/dashboard/src/components/settings/members/columns.tsx+++ b/apps/dashboard/src/components/settings/members/columns.tsx@@ -11,7 +11,7 @@ import { api } from '@/trpc/client';import type { ColumnDef, Row } from '@tanstack/react-table';import { MoreHorizontalIcon } from 'lucide-react';import { useRouter } from 'next/navigation';-import { useState } from 'react';+import { useRef, useState } from 'react';import { toast } from 'sonner';import type { IServiceMember, IServiceProject } from '@openpanel/db';@@ -76,10 +76,16 @@ function AccessCell({row: Row<IServiceMember>;projects: IServiceProject[];}) {+ const initial = useRef(row.original.access.map((item) => item.projectId));const [access, setAccess] = useState<string[]>(row.original.access.map((item) => item.projectId),);- const mutation = api.organization.updateMemberAccess.useMutation();+ const mutation = api.organization.updateMemberAccess.useMutation({+ onError(error) {+ toast.error(error.message);+ setAccess(initial.current);+ },+ });return (<ComboboxAdvanced@@ -128,7 +134,8 @@ function ActionsCell({ row }: { row: Row<IServiceMember> }) {onClick={() => {revoke.mutate({organizationId: row.original.organizationId,- userId: row.original.id,+ userId: row.original.userId!,+ id: row.original.id,});}}>diff --git a/packages/trpc/src/routers/onboarding.ts b/packages/trpc/src/routers/onboarding.tsindex 6bbf36084..733ccc395 100644--- a/packages/trpc/src/routers/onboarding.ts+++ b/packages/trpc/src/routers/onboarding.ts@@ -77,14 +77,16 @@ export const onboardingRouter = createTRPCRouter({throw new Error('Organization slug is missing');}- await db.member.create({- data: {- email: user.email,- organizationId: organization.id,- role: 'org:admin',- userId: user.id,- },- });+ if (input.organization) {+ await db.member.create({+ data: {+ email: user.email,+ organizationId: organization.id,+ role: 'org:admin',+ userId: user.id,+ },+ });+ }const project = await db.project.create({data: {diff --git a/packages/trpc/src/routers/organization.ts b/packages/trpc/src/routers/organization.tsindex 560c20b29..e27b493af 100644--- a/packages/trpc/src/routers/organization.ts+++ b/packages/trpc/src/routers/organization.ts@@ -130,10 +130,18 @@ export const organizationRouter = createTRPCRouter({z.object({organizationId: z.string(),userId: z.string(),+ id: z.string(),}),).mutation(async ({ input, ctx }) => {- if (ctx.session.userId === input.userId) {+ const exists = await db.member.count({+ where: {+ userId: input.userId,+ organizationId: input.organizationId,+ },+ });++ if (ctx.session.userId === input.userId && exists === 1) {throw new Error('You cannot remove yourself from the organization');}@@ -147,8 +155,9 @@ export const organizationRouter = createTRPCRouter({}await db.$transaction([- db.member.deleteMany({+ db.member.delete({where: {+ id: input.id,userId: input.userId,organizationId: input.organizationId,},@@ -171,6 +180,10 @@ export const organizationRouter = createTRPCRouter({}),).mutation(async ({ input, ctx }) => {+ if (input.userId === ctx.session.userId) {+ throw TRPCAccessError('You cannot update your own access');+ }+const access = await getOrganizationAccess({userId: ctx.session.userId,organizationId: input.organizationSlug,