Skip to content

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

🐛 Fix layout shift on invite page

Luke Vella00387ba49331
diff --git a/apps/web/src/app/[locale]/invite/[urlId]/invite-page-loader.tsx b/apps/web/src/app/[locale]/invite/[urlId]/invite-page-loader.tsx
new file mode 100644
index 000000000..ca2cf9a81
--- /dev/null
+++ b/apps/web/src/app/[locale]/invite/[urlId]/invite-page-loader.tsx
@@ -0,0 +1,11 @@
+"use client";
+import dynamic from "next/dynamic";
+
+const InvitePage = dynamic(
+ () => import("./invite-page").then((mod) => mod.InvitePage),
+ { ssr: false },
+);
+
+export function InvitePageLoader() {
+ return <InvitePage />;
+}
diff --git a/apps/web/src/app/[locale]/invite/[urlId]/page.tsx b/apps/web/src/app/[locale]/invite/[urlId]/page.tsx
index d4f82bb8f..38d21a680 100644
--- a/apps/web/src/app/[locale]/invite/[urlId]/page.tsx
+++ b/apps/web/src/app/[locale]/invite/[urlId]/page.tsx
@@ -3,7 +3,7 @@ import { absoluteUrl } from "@rallly/utils/absolute-url";
import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
import type { Metadata } from "next";
import { notFound } from "next/navigation";
-import { InvitePage } from "@/app/[locale]/invite/[urlId]/invite-page";
+import { InvitePageLoader } from "@/app/[locale]/invite/[urlId]/invite-page-loader";
import { PermissionProvider } from "@/contexts/permissions";
import { createSSRHelper } from "@/trpc/server/create-ssr-helper";
import Providers from "./providers";
@@ -12,23 +12,29 @@ export default async function Page(props: {
params: Promise<{ urlId: string }>;
}) {
const params = await props.params;
- const trpc = createSSRHelper();
- const [poll] = await Promise.all([
- trpc.polls.get.fetch({ urlId: params.urlId }),
- trpc.polls.participants.list.prefetch({ pollId: params.urlId }),
- trpc.polls.comments.list.prefetch({ pollId: params.urlId }),
- ]);
+ const poll = await prisma.poll.findUnique({
+ where: { id: params.urlId },
+ select: { deleted: true, user: { select: { banned: true } } },
+ });
if (!poll || poll.deleted || poll.user?.banned) {
notFound();
}
+ const trpc = createSSRHelper();
+
+ await Promise.all([
+ trpc.polls.get.prefetch({ urlId: params.urlId }),
+ trpc.polls.participants.list.prefetch({ pollId: params.urlId }),
+ trpc.polls.comments.list.prefetch({ pollId: params.urlId }),
+ ]);
+
return (
<HydrationBoundary state={dehydrate(trpc.queryClient)}>
<Providers>
<PermissionProvider>
- <InvitePage />
+ <InvitePageLoader />
</PermissionProvider>
</Providers>
</HydrationBoundary>
diff --git a/apps/web/src/contexts/poll.tsx b/apps/web/src/contexts/poll.tsx
index c936c58ed..58bd52594 100644
--- a/apps/web/src/contexts/poll.tsx
+++ b/apps/web/src/contexts/poll.tsx
@@ -4,11 +4,9 @@ import { trpc } from "@/trpc/client";
export const usePoll = () => {
const params = useParams<{ urlId: string }>();
- const pollQuery = trpc.polls.get.useQuery({ urlId: params?.urlId as string });
+ const [poll] = trpc.polls.get.useSuspenseQuery({
+ urlId: params?.urlId as string,
+ });
- if (!pollQuery.data) {
- throw new Error("Expected poll to be prefetched");
- }
-
- return pollQuery.data;
+ return poll;
};
diff --git a/apps/web/src/trpc/routers/polls.ts b/apps/web/src/trpc/routers/polls.ts
index 7d781af83..b10093cf9 100644
--- a/apps/web/src/trpc/routers/polls.ts
+++ b/apps/web/src/trpc/routers/polls.ts
@@ -740,7 +740,10 @@ export const polls = router({
});
if (!res) {
- return null;
+ throw new TRPCError({
+ code: "NOT_FOUND",
+ message: "Poll not found",
+ });
}
const inviteLink = shortUrl(`/invite/${res.id}`);