Skip to content

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

♻️ Copy space procedures to spaces router and deprecate old ones (RAL… (#2236)

Luke Vella4bb38c1ebe80
diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/events-page.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/events-page.tsx
index eee608e5a..8d86a7f0c 100644
--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/events-page.tsx
+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/events-page.tsx
@@ -102,7 +102,7 @@ function EventsEmptyState({ status }: { status: Status }) {
function EventsPageContent() {
const searchParams = useSearchParams();
const { t } = useTranslation();
- const [{ data: members }] = trpc.space.listMembers.useSuspenseQuery();
+ const [{ data: members }] = trpc.spaces.listMembers.useSuspenseQuery();
const { status, q, member } = eventsSearchParamsSchema.parse(
Object.fromEntries(searchParams.entries()),
diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/page.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/page.tsx
index 2a43c3135..542a4e75a 100644
--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/page.tsx
+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/page.tsx
@@ -14,7 +14,7 @@ export default async function Page(props: {
const helpers = await createPrivateSSRHelper();
await Promise.all([
- helpers.space.listMembers.prefetch(),
+ helpers.spaces.listMembers.prefetch(),
helpers.events.infiniteList.prefetchInfinite({
status,
search: q,
diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/page.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/page.tsx
index 7055f5994..54d5160df 100644
--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/page.tsx
+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/page.tsx
@@ -14,7 +14,7 @@ export default async function Page(props: {
const helpers = await createPrivateSSRHelper();
await Promise.all([
- helpers.space.listMembers.prefetch(),
+ helpers.spaces.listMembers.prefetch(),
helpers.polls.infiniteChronological.prefetchInfinite({
status,
search: q,
diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsx
index 481d79154..cec233961 100644
--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsx
+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsx
@@ -57,7 +57,7 @@ function PollsEmptyState() {
export function PollsPage() {
const searchParams = useSearchParams();
const { t } = useTranslation();
- const [{ data: members }] = trpc.space.listMembers.useSuspenseQuery();
+ const [{ data: members }] = trpc.spaces.listMembers.useSuspenseQuery();
const { status, q, member } = searchParamsSchema.parse(
Object.fromEntries(searchParams.entries()),
diff --git a/apps/web/src/app/[locale]/(app)/(space)/layout.tsx b/apps/web/src/app/[locale]/(app)/(space)/layout.tsx
index 2325ef854..d62aa8f87 100644
--- a/apps/web/src/app/[locale]/(app)/(space)/layout.tsx
+++ b/apps/web/src/app/[locale]/(app)/(space)/layout.tsx
@@ -13,7 +13,7 @@ export default async function Layout({
}) {
const helpers = await createPrivateSSRHelper();
- const space = await helpers.space.getCurrent.fetch();
+ const space = await helpers.spaces.getCurrent.fetch();
if (!space) {
const pathname = await getPathname();
diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page-client.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page-client.tsx
index 7757ad340..6a7779abd 100644
--- a/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page-client.tsx
+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page-client.tsx
@@ -77,7 +77,7 @@ function BillingPageContent({ tier }: { tier: SpaceTier }) {
const { showPayWall } = useBilling();
const [subscription] = trpc.billing.getSubscription.useSuspenseQuery();
- const [seats] = trpc.space.seats.useSuspenseQuery();
+ const [seats] = trpc.spaces.getSeats.useSuspenseQuery();
const didUpdateSeats = searchParams.has("seats_updated");
diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page.tsx
index 6a913bb6f..641c4bc65 100644
--- a/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page.tsx
+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page.tsx
@@ -15,7 +15,7 @@ export default async function BillingSettingsPage() {
await Promise.all([
helpers.billing.getSubscription.prefetch(),
- helpers.space.seats.prefetch(),
+ helpers.spaces.getSeats.prefetch(),
]);
return (
diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/members/page-client.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/members/page-client.tsx
index 223926190..34852c731 100644
--- a/apps/web/src/app/[locale]/(app)/(space)/settings/members/page-client.tsx
+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/members/page-client.tsx
@@ -31,9 +31,9 @@ import { InviteMemberButton } from "./components/invite-member-button";
import { MemberDropdownMenu } from "./components/member-dropdown-menu";
export function MembersSettingsPageClient() {
- const [members] = trpc.space.listMembers.useSuspenseQuery();
- const [invites] = trpc.space.listInvites.useSuspenseQuery();
- const [seats] = trpc.space.seats.useSuspenseQuery();
+ const [members] = trpc.spaces.listMembers.useSuspenseQuery();
+ const [invites] = trpc.spaces.listInvites.useSuspenseQuery();
+ const [seats] = trpc.spaces.getSeats.useSuspenseQuery();
return (
<SettingsPage>
diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/members/page.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/members/page.tsx
index fb3b0bb79..386666ab5 100644
--- a/apps/web/src/app/[locale]/(app)/(space)/settings/members/page.tsx
+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/members/page.tsx
@@ -8,9 +8,9 @@ export default async function MembersSettingsPage() {
const helpers = await createPrivateSSRHelper();
await Promise.all([
- helpers.space.listMembers.prefetch(),
- helpers.space.listInvites.prefetch(),
- helpers.space.seats.prefetch(),
+ helpers.spaces.listMembers.prefetch(),
+ helpers.spaces.listInvites.prefetch(),
+ helpers.spaces.getSeats.prefetch(),
]);
return (
diff --git a/apps/web/src/features/space/client.tsx b/apps/web/src/features/space/client.tsx
index d05fb0716..3a33fa8c2 100644
--- a/apps/web/src/features/space/client.tsx
+++ b/apps/web/src/features/space/client.tsx
@@ -10,7 +10,7 @@ import { defineAbilityForSpace } from "./ability";
export const useSpace = () => {
const [user] = trpc.user.getAuthed.useSuspenseQuery();
- const [data] = trpc.space.getCurrent.useSuspenseQuery();
+ const [data] = trpc.spaces.getCurrent.useSuspenseQuery();
if (!data) {
throw new Error("No active space found");
@@ -36,7 +36,7 @@ export const useSpace = () => {
export function SpaceProvider({ children }: { children: React.ReactNode }) {
const router = useRouter();
- const { data: space, isLoading } = trpc.space.getCurrent.useQuery();
+ const { data: space, isLoading } = trpc.spaces.getCurrent.useQuery();
const posthog = usePostHog();
React.useEffect(() => {
diff --git a/apps/web/src/trpc/routers/space.ts b/apps/web/src/trpc/routers/space.ts
index f5ca80d1d..6dd34064b 100644
--- a/apps/web/src/trpc/routers/space.ts
+++ b/apps/web/src/trpc/routers/space.ts
@@ -3,6 +3,10 @@ import { getSpaceSeatCount } from "@/features/space/data";
import { fromDBRole, getTotalSeatsForSpace } from "@/features/space/utils";
import { router, spaceProcedure } from "../trpc";
+/**
+ * @deprecated Use `spaces` router instead. This router is kept for backward
+ * compatibility during the transition and will be removed in a future release.
+ */
export const space = router({
getCurrent: spaceProcedure.query(async ({ ctx }) => {
return ctx.space;
diff --git a/apps/web/src/trpc/routers/spaces.ts b/apps/web/src/trpc/routers/spaces.ts
index 9699d10c2..3dfe78178 100644
--- a/apps/web/src/trpc/routers/spaces.ts
+++ b/apps/web/src/trpc/routers/spaces.ts
@@ -1,7 +1,8 @@
import { prisma } from "@rallly/database";
-import { createSpaceDTO } from "@/features/space/data";
+import { createSpaceDTO, getSpaceSeatCount } from "@/features/space/data";
import type { SpaceDTO } from "@/features/space/types";
-import { privateProcedure, router } from "../trpc";
+import { fromDBRole, getTotalSeatsForSpace } from "@/features/space/utils";
+import { privateProcedure, router, spaceProcedure } from "../trpc";
export const spaces = router({
list: privateProcedure.query(async ({ ctx }) => {
@@ -36,4 +37,83 @@ export const spaces = router({
}),
);
}),
+ getCurrent: spaceProcedure.query(async ({ ctx }) => {
+ return ctx.space;
+ }),
+ listMembers: spaceProcedure.query(async ({ ctx }) => {
+ const [members, totalCount] = await Promise.all([
+ prisma.spaceMember.findMany({
+ where: {
+ spaceId: ctx.space.id,
+ },
+ select: {
+ id: true,
+ userId: true,
+ role: true,
+ spaceId: true,
+ user: {
+ select: {
+ name: true,
+ email: true,
+ image: true,
+ },
+ },
+ },
+ orderBy: {
+ createdAt: "asc",
+ },
+ }),
+ prisma.spaceMember.count({
+ where: {
+ spaceId: ctx.space.id,
+ },
+ }),
+ ]);
+
+ return {
+ total: totalCount,
+ data: members.map((member) => ({
+ id: member.id,
+ userId: member.userId,
+ spaceId: member.spaceId,
+ name: member.user.name,
+ email: member.user.email,
+ image: member.user.image ?? undefined,
+ role: fromDBRole(member.role),
+ isOwner: member.userId === ctx.space.ownerId,
+ })),
+ };
+ }),
+ listInvites: spaceProcedure.query(async ({ ctx }) => {
+ const invites = await prisma.spaceMemberInvite.findMany({
+ where: {
+ spaceId: ctx.space.id,
+ },
+ include: {
+ invitedBy: {
+ select: {
+ id: true,
+ name: true,
+ email: true,
+ },
+ },
+ },
+ orderBy: {
+ createdAt: "desc",
+ },
+ });
+
+ return invites.map((invite) => ({
+ ...invite,
+ role: fromDBRole(invite.role),
+ }));
+ }),
+ getSeats: spaceProcedure.query(async ({ ctx }) => {
+ const [total, used] = await Promise.all([
+ getTotalSeatsForSpace(ctx.space.id),
+ getSpaceSeatCount(ctx.space.id),
+ ]);
+
+ return { total, used };
+ }),
});