Skip to content

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

⚡️ Switch the active space in one round trip (#3363)

Luke Vella050eccd1ece8
diff --git a/apps/web/src/features/space/actions.ts b/apps/web/src/features/space/actions.ts
index 531031ed2..a1ad95a54 100644
--- a/apps/web/src/features/space/actions.ts
+++ b/apps/web/src/features/space/actions.ts
@@ -2,13 +2,14 @@
import { subject } from "@casl/ability";
import { prisma } from "@rallly/database";
+import { refresh } from "next/cache";
import { createMiddleware } from "next-safe-action";
import * as z from "zod";
import { getInstancePolicy } from "@/features/instance-policy/data";
import { spaceIconAssetProfile } from "@/features/space/constants";
import { getActiveSpaceForUser } from "@/features/space/data";
import { defineAbilityForMember } from "@/features/space/member/ability";
-import { effectiveSpaceMemberWhere } from "@/features/space/member/utils";
+import { setActiveSpace } from "@/features/space/member/mutations";
import {
createSpace,
deleteSpace,
@@ -27,7 +28,6 @@ import {
updateSpaceSharedSchema,
updateSpaceShowBrandingSchema,
} from "@/features/space/schema";
-import { setActiveSpace } from "@/features/user/mutations";
import { AppError } from "@/lib/errors/app-error";
import { identifyGroup, track } from "@/lib/posthog";
import {
@@ -69,24 +69,22 @@ export const setActiveSpaceAction = authActionClient
.metadata({ actionName: "set_active_space" })
.inputSchema(z.object({ spaceId: z.string() }))
.action(async ({ ctx, parsedInput }) => {
- const member = await prisma.spaceMember.findFirst({
- where: {
- spaceId: parsedInput.spaceId,
- ...effectiveSpaceMemberWhere({ userId: ctx.user.id }),
- },
+ const updated = await setActiveSpace({
+ userId: ctx.user.id,
+ spaceId: parsedInput.spaceId,
});
- if (!member) {
+ if (!updated) {
throw new AppError({
code: "NOT_FOUND",
message: "Space not found",
});
}
- await setActiveSpace({
- userId: ctx.user.id,
- spaceId: parsedInput.spaceId,
- });
+ // Renders the new space's tree into the action response, so the client
+ // needs no follow-up router.refresh(). Unlike revalidatePath, this
+ // leaves the Data Cache alone.
+ refresh();
track(ctx.user, {
event: "space_set_active",
diff --git a/apps/web/src/features/space/components/space-dropdown.tsx b/apps/web/src/features/space/components/space-dropdown.tsx
index 8c4cf3cb4..926c40a19 100644
--- a/apps/web/src/features/space/components/space-dropdown.tsx
+++ b/apps/web/src/features/space/components/space-dropdown.tsx
@@ -28,7 +28,7 @@ import { SpaceRole } from "@/features/space/components/space-role";
import { SpaceTierLabel } from "@/features/space/components/space-tier";
import type { MemberRole, SpaceTier } from "@/features/space/schema";
import { Trans } from "@/i18n/client";
-import { useSafeAction } from "@/lib/safe-action/client";
+import { useRevalidatingSafeAction } from "@/lib/safe-action/client";
import { CreateSpaceDialog } from "./create-space-dialog";
import { SpaceIcon } from "./space-icon";
@@ -46,7 +46,7 @@ export function SpaceDropdown({
const { data: activeSpace } = useSpace();
const [pendingSpaceId, setPendingSpaceId] = React.useState<string>();
- const setActiveSpace = useSafeAction(setActiveSpaceAction, {
+ const setActiveSpace = useRevalidatingSafeAction(setActiveSpaceAction, {
onError: () => setPendingSpaceId(undefined),
});
const newSpaceDialog = useDialog();
diff --git a/apps/web/src/features/space/member/mutations.ts b/apps/web/src/features/space/member/mutations.ts
index e18238691..304318952 100644
--- a/apps/web/src/features/space/member/mutations.ts
+++ b/apps/web/src/features/space/member/mutations.ts
@@ -7,9 +7,9 @@ import { absoluteUrl } from "@rallly/utils/absolute-url";
import { revalidatePath } from "next/cache";
import { getInstanceBranding } from "@/emails/branding";
import { getTotalSeatsForSpace } from "@/features/space/data";
+import { effectiveSpaceMemberWhere } from "@/features/space/member/utils";
import type { MemberRole } from "@/features/space/schema";
import { toDBRole } from "@/features/space/utils";
-import { setActiveSpace } from "@/features/user/mutations";
const logger = createLogger("space/member/mutations");
@@ -17,6 +17,24 @@ function revalidateMembersPage() {
revalidatePath("/[locale]/(space)/(dashboard)/members", "page");
}
+/**
+ * Returns false when the user is not an effective member of the space.
+ */
+export async function setActiveSpace({
+ userId,
+ spaceId,
+}: {
+ userId: string;
+ spaceId: string;
+}) {
+ const { count } = await prisma.spaceMember.updateMany({
+ where: { spaceId, ...effectiveSpaceMemberWhere({ userId }) },
+ data: { lastSelectedAt: new Date() },
+ });
+
+ return count > 0;
+}
+
export async function inviteMember({
spaceId,
spaceName,
diff --git a/apps/web/src/features/user/mutations.ts b/apps/web/src/features/user/mutations.ts
index ee3348ae5..7fd470c1f 100644
--- a/apps/web/src/features/user/mutations.ts
+++ b/apps/web/src/features/user/mutations.ts
@@ -263,23 +263,3 @@ export async function deleteOrphanedAnonymousUsers() {
return deleted;
}
-
-export async function setActiveSpace({
- userId,
- spaceId,
-}: {
- userId: string;
- spaceId: string;
-}) {
- return await prisma.spaceMember.update({
- where: {
- spaceId_userId: {
- spaceId: spaceId,
- userId: userId,
- },
- },
- data: {
- lastSelectedAt: new Date(),
- },
- });
-}
diff --git a/apps/web/src/lib/safe-action/client.ts b/apps/web/src/lib/safe-action/client.ts
index fe445934a..7e99f3be8 100644
--- a/apps/web/src/lib/safe-action/client.ts
+++ b/apps/web/src/lib/safe-action/client.ts
@@ -7,13 +7,30 @@ import { useTranslation } from "@/i18n/client";
import type { AppErrorCode } from "@/lib/errors/app-error";
export const useSafeAction: typeof useAction = (action, options) => {
- const { t } = useTranslation();
const router = useRouter();
+ return useSafeActionBase(action, {
+ ...options,
+ onSuccess: (args) => {
+ router.refresh();
+ options?.onSuccess?.(args);
+ },
+ });
+};
+
+/**
+ * For actions that call refresh() or revalidatePath: the action response
+ * already carries the re-rendered page, so a router.refresh() would be a
+ * second render.
+ */
+export const useRevalidatingSafeAction: typeof useAction = (action, options) =>
+ useSafeActionBase(action, options);
+
+const useSafeActionBase: typeof useAction = (action, options) => {
+ const { t } = useTranslation();
const queryClient = useQueryClient();
return useAction(action, {
...options,
onSuccess: (args) => {
- router.refresh();
// Same blanket invalidation the tRPC mutation override does, so a
// client query never shows stale data after a write.
void queryClient.invalidateQueries();