Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Remove owner role (#1849)
Luke Vellaf99b9b0b79ca
diff --git a/apps/web/src/app/[locale]/(space)/members/components/tabs.tsx b/apps/web/src/app/[locale]/(space)/members/components/tabs.tsxindex 08b046fb0..d4a193e51 100644--- a/apps/web/src/app/[locale]/(space)/members/components/tabs.tsx+++ b/apps/web/src/app/[locale]/(space)/members/components/tabs.tsx@@ -26,9 +26,6 @@ export const MembersTabs = ({<PageTabsTrigger value="admin"><Trans i18nKey="admin" defaults="Admin" /></PageTabsTrigger>- <PageTabsTrigger value="owner">- <Trans i18nKey="owner" defaults="Owner" />- </PageTabsTrigger></PageTabsList><PageTabsContent value={value}>{children}</PageTabsContent></PageTabs>diff --git a/apps/web/src/app/[locale]/(space)/members/page.tsx b/apps/web/src/app/[locale]/(space)/members/page.tsxindex 2ee6e0bac..f47c64118 100644--- a/apps/web/src/app/[locale]/(space)/members/page.tsx+++ b/apps/web/src/app/[locale]/(space)/members/page.tsx@@ -1,3 +1,4 @@+import { Badge } from "@rallly/ui/badge";import { UserSearchIcon } from "lucide-react";import type { Metadata } from "next";import { MembersHeader } from "@/app/[locale]/(space)/members/components/header";@@ -65,14 +66,25 @@ export default async function MembersPage({name={member.name}size="md"/>- <div className="text-sm">- <div className="font-semibold">{member.name}</div>- <div className="text-muted-foreground">+ <div>+ <div className="flex items-center gap-x-2">+ <div className="font-semibold text-sm">+ {member.name}+ </div>+ <div>+ {member.isOwner ? (+ <Badge>+ <Trans i18nKey="owner" defaults="Owner" />+ </Badge>+ ) : null}+ </div>+ </div>+ <div className="text-muted-foreground text-sm">{member.email}</div></div></div>- <div className="text-sm capitalize">+ <div className="text-sm"><SpaceRole role={member.role} /></div></StackedListItem>diff --git a/apps/web/src/app/[locale]/(space)/members/schema.ts b/apps/web/src/app/[locale]/(space)/members/schema.tsindex be5784916..2b863ee51 100644--- a/apps/web/src/app/[locale]/(space)/members/schema.ts+++ b/apps/web/src/app/[locale]/(space)/members/schema.ts@@ -4,5 +4,5 @@ export const searchParamsSchema = z.object({page: z.coerce.number().min(1).default(1),pageSize: z.coerce.number().min(1).default(10),q: z.string().optional(),- role: z.enum(["all", "member", "admin", "owner"]).optional().catch("all"),+ role: z.enum(["all", "member", "admin"]).optional().catch("all"),});diff --git a/apps/web/src/features/spaces/actions.ts b/apps/web/src/features/spaces/actions.tsindex ad7aee144..7e52637d3 100644--- a/apps/web/src/features/spaces/actions.ts+++ b/apps/web/src/features/spaces/actions.ts@@ -72,7 +72,7 @@ export const createSpaceAction = authActionClientmembers: {create: {userId: ctx.user.id,- role: "OWNER",+ role: "ADMIN",},},},diff --git a/apps/web/src/features/spaces/components/space-role.tsx b/apps/web/src/features/spaces/components/space-role.tsxindex 600426f82..e330bb3fe 100644--- a/apps/web/src/features/spaces/components/space-role.tsx+++ b/apps/web/src/features/spaces/components/space-role.tsx@@ -5,8 +5,6 @@ import type { SpaceMemberRole } from "@/features/spaces/schema";export const SpaceRole = ({ role }: { role: SpaceMemberRole }) => {switch (role) {- case "owner":- return <Trans i18nKey="owner" defaults="Owner" />;case "admin":return <Trans i18nKey="admin" defaults="Admin" />;case "member":diff --git a/apps/web/src/features/spaces/data.ts b/apps/web/src/features/spaces/data.tsindex 5377a1fb8..e2492d4dd 100644--- a/apps/web/src/features/spaces/data.ts+++ b/apps/web/src/features/spaces/data.ts@@ -156,6 +156,7 @@ type MemberDTO = {email: string;image?: string;role: SpaceMemberRole;+ isOwner: boolean;};export const loadMembers = cache(@@ -235,6 +236,7 @@ export const loadMembers = cache(email: member.user.email,image: member.user.image ?? undefined,role: fromDBRole(member.role),+ isOwner: member.userId === space.ownerId,}) satisfies MemberDTO,),hasNextPage: page * pageSize < totalCount,diff --git a/apps/web/src/features/spaces/mutations.ts b/apps/web/src/features/spaces/mutations.tsindex e6842e4ad..e41ff3262 100644--- a/apps/web/src/features/spaces/mutations.ts+++ b/apps/web/src/features/spaces/mutations.ts@@ -14,7 +14,7 @@ export async function createSpace({members: {create: {userId: ownerId,- role: "OWNER",+ role: "ADMIN",},},},diff --git a/apps/web/src/features/spaces/schema.ts b/apps/web/src/features/spaces/schema.tsindex d92787385..02558af6d 100644--- a/apps/web/src/features/spaces/schema.ts+++ b/apps/web/src/features/spaces/schema.ts@@ -1,4 +1,4 @@import { z } from "zod";-export const spaceMemberRoleSchema = z.enum(["member", "admin", "owner"]);+export const spaceMemberRoleSchema = z.enum(["member", "admin"]);export type SpaceMemberRole = z.infer<typeof spaceMemberRoleSchema>;diff --git a/apps/web/src/features/spaces/utils.ts b/apps/web/src/features/spaces/utils.tsindex f080e05d8..4667c8385 100644--- a/apps/web/src/features/spaces/utils.ts+++ b/apps/web/src/features/spaces/utils.ts@@ -7,8 +7,6 @@ export const toDBRole = (role: SpaceMemberRole): PrismaSpaceMemberRole => {return "MEMBER";case "admin":return "ADMIN";- case "owner":- return "OWNER";}};@@ -18,7 +16,5 @@ export const fromDBRole = (role: PrismaSpaceMemberRole): SpaceMemberRole => {return "member";case "ADMIN":return "admin";- case "OWNER":- return "owner";}};diff --git a/apps/web/src/features/user/mutations.ts b/apps/web/src/features/user/mutations.tsindex b50dcf1be..cb0823557 100644--- a/apps/web/src/features/user/mutations.ts+++ b/apps/web/src/features/user/mutations.ts@@ -46,7 +46,7 @@ export async function createUser({data: {spaceId: space.id,userId: user.id,- role: "OWNER",+ role: "ADMIN",},});diff --git a/apps/web/src/lib/ability-manager/ability.ts b/apps/web/src/lib/ability-manager/ability.tsindex 8082d664c..5f1f97763 100644--- a/apps/web/src/lib/ability-manager/ability.ts+++ b/apps/web/src/lib/ability-manager/ability.ts@@ -12,6 +12,7 @@ import type {Subscription,UserRole,} from "@prisma/client";+import type { SpaceMemberRole } from "@/features/spaces/schema";export type UserContext = {id: string;@@ -20,7 +21,7 @@ export type UserContext = {};type SpaceTier = "hobby" | "pro";-type SpaceRole = "member" | "owner" | "admin";+type SpaceRole = SpaceMemberRole;type SpaceContext = {id: string;@@ -166,9 +167,6 @@ function defineSpaceRules(const { role, tier, id: spaceId } = spaceContext;switch (role) {- case "owner":- defineSpaceOwnerRules(builder, user, spaceContext);- break;case "admin":defineSpaceAdminRules(builder, user, spaceContext);break;@@ -217,18 +215,3 @@ function defineSpaceAdminRules(userId: user.id,});}--function defineSpaceOwnerRules(- builder: AbilityBuilder<AppAbility>,- user: UserContext,- space: SpaceContext,-) {- const { can, cannot } = builder;-- can(["read", "update", "delete"], "SpaceMember", { spaceId: space.id });- cannot("update", "SpaceMember", ["role"], {- spaceId: space.id,- userId: user.id,- });- can("cancel", "ScheduledEvent", { spaceId: space.id });-}diff --git a/apps/web/tests/test-utils.ts b/apps/web/tests/test-utils.tsindex 54afa97bf..4ee1ea774 100644--- a/apps/web/tests/test-utils.ts+++ b/apps/web/tests/test-utils.ts@@ -35,7 +35,7 @@ export async function createUserInDb({data: {spaceId: space.id,userId: user.id,- role: "OWNER",+ role: "ADMIN",},});diff --git a/packages/database/prisma/migrations/20250722083454_remove_owner_role/migration.sql b/packages/database/prisma/migrations/20250722083454_remove_owner_role/migration.sqlnew file mode 100644index 000000000..e2183e6b8--- /dev/null+++ b/packages/database/prisma/migrations/20250722083454_remove_owner_role/migration.sql@@ -0,0 +1,17 @@+/*+ Warnings:++ - The values [OWNER] on the enum `SpaceMemberRole` will be removed. If these variants are still used in the database, this will fail.++*/+-- AlterEnum+BEGIN;+UPDATE "space_members" SET "role" = 'ADMIN' WHERE "role" = 'OWNER';+CREATE TYPE "SpaceMemberRole_new" AS ENUM ('ADMIN', 'MEMBER');+ALTER TABLE "space_members" ALTER COLUMN "role" DROP DEFAULT;+ALTER TABLE "space_members" ALTER COLUMN "role" TYPE "SpaceMemberRole_new" USING ("role"::text::"SpaceMemberRole_new");+ALTER TYPE "SpaceMemberRole" RENAME TO "SpaceMemberRole_old";+ALTER TYPE "SpaceMemberRole_new" RENAME TO "SpaceMemberRole";+DROP TYPE "SpaceMemberRole_old";+ALTER TABLE "space_members" ALTER COLUMN "role" SET DEFAULT 'MEMBER';+COMMIT;diff --git a/packages/database/prisma/models/space.prisma b/packages/database/prisma/models/space.prismaindex 01ca430ed..b4d30387d 100644--- a/packages/database/prisma/models/space.prisma+++ b/packages/database/prisma/models/space.prisma@@ -18,7 +18,6 @@ model Space {}enum SpaceMemberRole {- OWNERADMINMEMBER}diff --git a/packages/database/prisma/seed/users.ts b/packages/database/prisma/seed/users.tsindex 50eae25a6..7a5ac8cb5 100644--- a/packages/database/prisma/seed/users.ts+++ b/packages/database/prisma/seed/users.ts@@ -55,7 +55,7 @@ async function createUser({data: {spaceId: space.id,userId: id,- role: "OWNER",+ role: "ADMIN",},});