Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ Migrate space deletion from tRPC to server action (#2756)

Luke Vella6d85cf75512a
diff --git a/apps/web/src/app/[locale]/(space)/settings/general/components/delete-space-button.tsx b/apps/web/src/app/[locale]/(space)/settings/general/components/delete-space-button.tsx
index e3efff6f9..55712fc60 100644
--- a/apps/web/src/app/[locale]/(space)/settings/general/components/delete-space-button.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/general/components/delete-space-button.tsx
@@ -18,8 +18,9 @@ import { toast } from "@rallly/ui/sonner";
import { useRouter } from "next/navigation";
import { useForm } from "react-hook-form";
+import { deleteSpaceAction } from "@/features/space/actions";
import { Trans, useTranslation } from "@/i18n/client";
-import { trpc } from "@/trpc/client";
+import { useSafeAction } from "@/lib/safe-action/client";
interface DeleteSpaceDialogProps extends DialogProps {
spaceName: string;
@@ -39,7 +40,7 @@ function DeleteSpaceDialog({
const router = useRouter();
const { t } = useTranslation();
- const deleteSpace = trpc.spaces.delete.useMutation({
+ const deleteSpace = useSafeAction(deleteSpaceAction, {
onSuccess: () => {
toast.success(
t("deletedSpaceSuccess", {
@@ -57,7 +58,7 @@ function DeleteSpaceDialog({
<DialogContent>
<form
onSubmit={form.handleSubmit(() => {
- deleteSpace.mutate();
+ deleteSpace.execute();
})}
>
<DialogHeader>
@@ -114,7 +115,7 @@ function DeleteSpaceDialog({
</DialogClose>
<Button
type="submit"
- loading={deleteSpace.isPending}
+ loading={deleteSpace.isExecuting}
variant="destructive"
>
<Trans
diff --git a/apps/web/src/features/space/actions.ts b/apps/web/src/features/space/actions.ts
index 0bad264d2..072d6937b 100644
--- a/apps/web/src/features/space/actions.ts
+++ b/apps/web/src/features/space/actions.ts
@@ -8,6 +8,7 @@ import { defineAbilityForMember } from "@/features/space/member/ability";
import { effectiveSpaceMemberWhere } from "@/features/space/member/utils";
import {
createSpace,
+ deleteSpace,
removeSpaceImage,
updateSpace,
updateSpaceImage,
@@ -119,6 +120,52 @@ export const createSpaceAction = authActionClient
return space;
});
+export const deleteSpaceAction = authActionClient
+ .metadata({ actionName: "delete_space" })
+ .action(async ({ ctx }) => {
+ const space = await getActiveSpaceForUser(ctx.user.id);
+
+ if (!space) {
+ throw new AppError({
+ code: "NOT_FOUND",
+ message: "No active space found",
+ });
+ }
+
+ const ability = defineAbilityForMember({ user: ctx.user, space });
+
+ if (ability.cannot("delete", subject("Space", space))) {
+ throw new AppError({
+ code: "FORBIDDEN",
+ message: "You do not have permission to delete this space",
+ });
+ }
+
+ const activeSubscriptionCount = await prisma.subscription.count({
+ where: { spaceId: space.id, active: true },
+ });
+
+ if (activeSubscriptionCount > 0) {
+ throw new AppError({
+ code: "FORBIDDEN",
+ message:
+ "Cannot delete space with an active subscription. Please cancel the subscription first.",
+ });
+ }
+
+ await deleteSpace({ spaceId: space.id });
+
+ track(ctx.user, {
+ event: "space_delete",
+ properties: {
+ space_id: space.id,
+ },
+ groups: {
+ space: space.id,
+ },
+ });
+ });
+
export const updateSpaceAction = authActionClient
.metadata({ actionName: "update_space" })
.inputSchema(updateSpaceSchema)
diff --git a/apps/web/src/features/space/mutations.ts b/apps/web/src/features/space/mutations.ts
index 011ca8ddf..26a9f9760 100644
--- a/apps/web/src/features/space/mutations.ts
+++ b/apps/web/src/features/space/mutations.ts
@@ -94,6 +94,18 @@ export async function updateSpaceImage({
}
}
+export async function deleteSpace({ spaceId }: { spaceId: string }) {
+ const deletedSpace = await prisma.space.delete({
+ where: { id: spaceId },
+ });
+
+ const imageKey = deletedSpace.image;
+
+ if (imageKey) {
+ after(() => deleteImageFromS3(imageKey));
+ }
+}
+
export async function removeSpaceImage({ spaceId }: { spaceId: string }) {
const space = await prisma.space.findUnique({
where: { id: spaceId },
diff --git a/apps/web/src/trpc/routers/spaces.ts b/apps/web/src/trpc/routers/spaces.ts
index 95b1a5de7..7ee1ef583 100644
--- a/apps/web/src/trpc/routers/spaces.ts
+++ b/apps/web/src/trpc/routers/spaces.ts
@@ -1,9 +1,7 @@
-import { subject } from "@casl/ability";
import { prisma } from "@rallly/database";
import { TRPCError } from "@trpc/server";
import * as z from "zod";
import { createSpaceDTO } from "@/features/space/data";
-import { defineAbilityForMember } from "@/features/space/member/ability";
import { effectiveSpaceMemberWhere } from "@/features/space/member/utils";
import type { SpaceDTO } from "@/features/space/types";
import { fromDBRole } from "@/features/space/utils";
@@ -121,46 +119,6 @@ export const spaces = router({
}));
}),
// ── Mutations ────────────────────────────────────────────────────────
- delete: spaceProcedure.mutation(async ({ ctx }) => {
- const memberAbility = defineAbilityForMember({
- user: ctx.user,
- space: ctx.space,
- });
-
- if (memberAbility.cannot("delete", subject("Space", ctx.space))) {
- throw new TRPCError({
- code: "FORBIDDEN",
- message: "You do not have permission to delete this space",
- });
- }
-
- const activeSubscriptionCount = await prisma.subscription.count({
- where: { spaceId: ctx.space.id, active: true },
- });
-
- if (activeSubscriptionCount > 0) {
- throw new TRPCError({
- code: "FORBIDDEN",
- message:
- "Cannot delete space with an active subscription. Please cancel the subscription first.",
- });
- }
-
- await prisma.space.delete({
- where: { id: ctx.space.id },
- });
-
- track(ctx.user, {
- event: "space_delete",
- properties: {
- space_id: ctx.space.id,
- },
- groups: {
- space: ctx.space.id,
- },
- });
- }),
-
leave: spaceProcedure.mutation(async ({ ctx }) => {
if (ctx.space.ownerId === ctx.user.id) {
throw new TRPCError({