Skip to content

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

♻️ Set new space as active before closing create dialog (#2755)

Luke Vella6517974f9795
diff --git a/apps/web/src/features/space/actions.ts b/apps/web/src/features/space/actions.ts
index 92709be79..0bad264d2 100644
--- a/apps/web/src/features/space/actions.ts
+++ b/apps/web/src/features/space/actions.ts
@@ -7,12 +7,14 @@ import { getActiveSpaceForUser } from "@/features/space/data";
import { defineAbilityForMember } from "@/features/space/member/ability";
import { effectiveSpaceMemberWhere } from "@/features/space/member/utils";
import {
+ createSpace,
removeSpaceImage,
updateSpace,
updateSpaceImage,
updateSpaceShowBranding,
} from "@/features/space/mutations";
import {
+ createSpaceSchema,
spaceImageUploadSchema,
updateSpaceImageSchema,
updateSpaceSchema,
@@ -21,7 +23,10 @@ import {
import { setActiveSpace } from "@/features/user/mutations";
import { AppError } from "@/lib/errors/app-error";
import { identifyGroup, track } from "@/lib/posthog";
-import { authActionClient } from "@/lib/safe-action/server";
+import {
+ authActionClient,
+ createRateLimitMiddleware,
+} from "@/lib/safe-action/server";
import { getImageUploadUrl } from "@/lib/storage/image-upload";
async function requireSpaceWithUpdateAbility(user: { id: string }) {
@@ -80,6 +85,40 @@ export const setActiveSpaceAction = authActionClient
});
});
+export const createSpaceAction = authActionClient
+ .metadata({ actionName: "create_space" })
+ .use(createRateLimitMiddleware(5, "1 m"))
+ .inputSchema(createSpaceSchema)
+ .action(async ({ ctx, parsedInput }) => {
+ const space = await createSpace({
+ name: parsedInput.name,
+ ownerId: ctx.user.id,
+ });
+
+ identifyGroup({
+ groupType: "space",
+ groupKey: space.id,
+ properties: {
+ name: space.name,
+ member_count: 1,
+ seat_count: 1,
+ tier: space.tier,
+ },
+ });
+
+ track(ctx.user, {
+ event: "space_create",
+ properties: {
+ space_name: space.name,
+ },
+ groups: {
+ space: space.id,
+ },
+ });
+
+ return space;
+ });
+
export const updateSpaceAction = authActionClient
.metadata({ actionName: "update_space" })
.inputSchema(updateSpaceSchema)
diff --git a/apps/web/src/features/space/components/create-space-dialog.tsx b/apps/web/src/features/space/components/create-space-dialog.tsx
index 3a9ad1160..c6b587ad1 100644
--- a/apps/web/src/features/space/components/create-space-dialog.tsx
+++ b/apps/web/src/features/space/components/create-space-dialog.tsx
@@ -19,31 +19,21 @@ import {
FormMessage,
} from "@rallly/ui/form";
import { Input } from "@rallly/ui/input";
-import { toast } from "@rallly/ui/sonner";
import { useForm } from "react-hook-form";
-import * as z from "zod";
-import { Trans, useTranslation } from "@/i18n/client";
-import { trpc } from "@/trpc/client";
-
-const createSpaceFormSchema = z.object({
- name: z.string().min(1).max(100),
-});
+import { createSpaceAction } from "@/features/space/actions";
+import { createSpaceSchema } from "@/features/space/schema";
+import { Trans } from "@/i18n/client";
+import { useSafeAction } from "@/lib/safe-action/client";
export function CreateSpaceDialog(props: DialogProps) {
- const { t } = useTranslation();
-
const form = useForm({
- resolver: zodResolver(createSpaceFormSchema),
+ resolver: zodResolver(createSpaceSchema),
defaultValues: {
name: "",
},
});
- const createSpace = trpc.spaces.create.useMutation({
- onSuccess: () => {
- form.reset();
- },
- });
+ const createSpace = useSafeAction(createSpaceAction);
return (
<Dialog {...props}>
@@ -61,24 +51,12 @@ export function CreateSpaceDialog(props: DialogProps) {
</DialogDescription>
</DialogHeader>
<form
- onSubmit={form.handleSubmit(({ name }) => {
- props.onOpenChange?.(false);
- toast.promise(
- createSpace.mutateAsync({
- name,
- }),
- {
- loading: t("createSpaceLoading", {
- defaultValue: "Creating space...",
- }),
- success: t("createSpaceSuccess", {
- defaultValue: "Space created successfully",
- }),
- error: t("createSpaceError", {
- defaultValue: "Failed to create space",
- }),
- },
- );
+ onSubmit={form.handleSubmit(async ({ name }) => {
+ const result = await createSpace.executeAsync({ name });
+ if (result?.data) {
+ props.onOpenChange?.(false);
+ form.reset();
+ }
})}
>
<FormField
diff --git a/apps/web/src/features/space/schema.ts b/apps/web/src/features/space/schema.ts
index fabbbab62..c895b2a2f 100644
--- a/apps/web/src/features/space/schema.ts
+++ b/apps/web/src/features/space/schema.ts
@@ -6,6 +6,10 @@ export type MemberRole = z.infer<typeof memberRoleSchema>;
export const spaceTierSchema = z.enum(["hobby", "pro"]);
export type SpaceTier = z.infer<typeof spaceTierSchema>;
+export const createSpaceSchema = z.object({
+ name: z.string().min(1).max(100),
+});
+
export const updateSpaceSchema = z.object({
name: z.string().min(1).max(100).optional(),
primaryColor: z
diff --git a/apps/web/src/trpc/routers/spaces.ts b/apps/web/src/trpc/routers/spaces.ts
index 764fea581..95b1a5de7 100644
--- a/apps/web/src/trpc/routers/spaces.ts
+++ b/apps/web/src/trpc/routers/spaces.ts
@@ -5,16 +5,10 @@ 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 { createSpace } from "@/features/space/mutations";
import type { SpaceDTO } from "@/features/space/types";
import { fromDBRole } from "@/features/space/utils";
-import { identifyGroup, track } from "@/lib/posthog";
-import {
- createRateLimitMiddleware,
- privateProcedure,
- router,
- spaceProcedure,
-} from "../trpc";
+import { track } from "@/lib/posthog";
+import { privateProcedure, router, spaceProcedure } from "../trpc";
export const spaces = router({
// ── Queries ──────────────────────────────────────────────────────────
@@ -127,39 +121,6 @@ export const spaces = router({
}));
}),
// ── Mutations ────────────────────────────────────────────────────────
- create: privateProcedure
- .use(createRateLimitMiddleware("space_create", 5, "1 m"))
- .input(z.object({ name: z.string().min(1).max(100) }))
- .mutation(async ({ ctx, input }) => {
- const space = await createSpace({
- name: input.name,
- ownerId: ctx.user.id,
- });
-
- identifyGroup({
- groupType: "space",
- groupKey: space.id,
- properties: {
- name: space.name,
- member_count: 1,
- seat_count: 1,
- tier: "hobby",
- },
- });
-
- track(ctx.user, {
- event: "space_create",
- properties: {
- space_name: space.name,
- },
- groups: {
- space: space.id,
- },
- });
-
- return space;
- }),
-
delete: spaceProcedure.mutation(async ({ ctx }) => {
const memberAbility = defineAbilityForMember({
user: ctx.user,