Skip to content

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

📈 Send space group properties from SpaceProvider (#2715)

Luke Vellaf1cf6db95630
diff --git a/apps/web/src/features/space/client.tsx b/apps/web/src/features/space/client.tsx
index adee6bd63..084f77d6f 100644
--- a/apps/web/src/features/space/client.tsx
+++ b/apps/web/src/features/space/client.tsx
@@ -44,8 +44,23 @@ export function SpaceProvider({
children: React.ReactNode;
}) {
React.useEffect(() => {
- posthog?.group("space", space.id);
- }, [space.id]);
+ // Property names must match the server-side identifyGroup payloads.
+ // posthog-js only re-sends $groupidentify when these values change.
+ posthog?.group("space", space.id, {
+ name: space.name,
+ tier: space.tier,
+ custom_branding: space.showBranding,
+ member_count: space.memberCount,
+ seat_count: space.seatCount,
+ });
+ }, [
+ space.id,
+ space.name,
+ space.tier,
+ space.showBranding,
+ space.memberCount,
+ space.seatCount,
+ ]);
const primaryColorVars =
space.showBranding && space.primaryColor
diff --git a/apps/web/src/features/space/data.ts b/apps/web/src/features/space/data.ts
index 8db1874f3..c27593f5c 100644
--- a/apps/web/src/features/space/data.ts
+++ b/apps/web/src/features/space/data.ts
@@ -61,6 +61,8 @@ export function createSpaceDTO(space: {
tier: DBSpaceTier;
primaryColor?: string | null;
showBranding: boolean;
+ memberCount: number;
+ seatCount: number;
}): SpaceDTO {
return {
id: space.id as AuthorizedSpaceId,
@@ -68,6 +70,8 @@ export function createSpaceDTO(space: {
ownerId: space.ownerId,
tier: isSelfHosted ? "pro" : space.tier,
role: fromDBRole(space.role),
+ memberCount: space.memberCount,
+ seatCount: space.seatCount,
image: space.image ?? undefined,
primaryColor: space.primaryColor ?? undefined,
showBranding: space.showBranding,
@@ -195,7 +199,16 @@ export const getActiveSpaceForUser = cache(async (userId: string) => {
lastSelectedAt: "desc",
},
include: {
- space: true,
+ space: {
+ include: {
+ _count: { select: { members: true } },
+ subscriptions: {
+ where: { active: true },
+ select: { quantity: true },
+ take: 1,
+ },
+ },
+ },
},
});
@@ -206,5 +219,7 @@ export const getActiveSpaceForUser = cache(async (userId: string) => {
return createSpaceDTO({
...spaceMember.space,
role: spaceMember.role,
+ memberCount: spaceMember.space._count.members,
+ seatCount: spaceMember.space.subscriptions[0]?.quantity ?? 1,
});
});
diff --git a/apps/web/src/features/space/mutations.ts b/apps/web/src/features/space/mutations.ts
index b2316f246..011ca8ddf 100644
--- a/apps/web/src/features/space/mutations.ts
+++ b/apps/web/src/features/space/mutations.ts
@@ -31,7 +31,12 @@ export async function createSpace({
},
});
- return createSpaceDTO({ ...space, role: "ADMIN" });
+ return createSpaceDTO({
+ ...space,
+ role: "ADMIN",
+ memberCount: 1,
+ seatCount: 1,
+ });
}
export async function updateSpace({
diff --git a/apps/web/src/features/space/types.ts b/apps/web/src/features/space/types.ts
index 1cd88a085..e20c43464 100644
--- a/apps/web/src/features/space/types.ts
+++ b/apps/web/src/features/space/types.ts
@@ -12,6 +12,8 @@ export type SpaceDTO = {
ownerId: string;
tier: "hobby" | "pro";
role: MemberRole;
+ memberCount: number;
+ seatCount: number;
image?: string;
primaryColor?: string;
showBranding: boolean;
diff --git a/apps/web/src/trpc/routers/spaces.ts b/apps/web/src/trpc/routers/spaces.ts
index d25ef1f2d..71ca66892 100644
--- a/apps/web/src/trpc/routers/spaces.ts
+++ b/apps/web/src/trpc/routers/spaces.ts
@@ -55,6 +55,12 @@ export const spaces = router({
tier: true,
primaryColor: true,
showBranding: true,
+ _count: { select: { members: true } },
+ subscriptions: {
+ where: { active: true },
+ select: { quantity: true },
+ take: 1,
+ },
},
},
},
@@ -64,6 +70,8 @@ export const spaces = router({
createSpaceDTO({
...spaceMember.space,
role: spaceMember.role,
+ memberCount: spaceMember.space._count.members,
+ seatCount: spaceMember.space.subscriptions[0]?.quantity ?? 1,
}),
);
}),