fixes

packages/common/scripts/get-referrers.ts

@@ -74,7 +74,6 @@ const extraReferrers = {
   'rytr.me': { type: 'ai', name: 'Rytr' },
   'notion.ai': { type: 'ai', name: 'Notion AI' },
   'grammarly.com': { type: 'ai', name: 'Grammarly' },
-  'bing.com': { type: 'ai', name: 'Bing AI' },
   'grok.com': { type: 'ai', name: 'Grok' },
   'x.ai': { type: 'ai', name: 'xAI' },
   'aistudio.google.com': { type: 'ai', name: 'Google AI Studio' },

packages/db/src/services/chart.service.ts

@@ -167,8 +167,12 @@ export function getChartSql({
   const anyBreakdownOnGroup = breakdowns.some((breakdown) =>
     breakdown.name.startsWith('group.')
   );
+  const anyMetricOnGroup = !!event.property?.startsWith('group.');
   const needsGroupArrayJoin =
-    anyFilterOnGroup || anyBreakdownOnGroup || event.segment === 'group';
+    anyFilterOnGroup ||
+    anyBreakdownOnGroup ||
+    anyMetricOnGroup ||
+    event.segment === 'group';
 
   if (needsGroupArrayJoin) {
     addCte(
@@ -453,8 +457,12 @@ export function getAggregateChartSql({
   const anyBreakdownOnGroup = breakdowns.some((breakdown) =>
     breakdown.name.startsWith('group.')
   );
+  const anyMetricOnGroup = !!event.property?.startsWith('group.');
   const needsGroupArrayJoin =
-    anyFilterOnGroup || anyBreakdownOnGroup || event.segment === 'group';
+    anyFilterOnGroup ||
+    anyBreakdownOnGroup ||
+    anyMetricOnGroup ||
+    event.segment === 'group';
 
   if (needsGroupArrayJoin) {
     addCte(

packages/db/src/services/event.service.ts

@@ -676,6 +676,7 @@ export async function getEventList(options: GetEventListOptions) {
 export async function getEventsCount({
   projectId,
   profileId,
+  groupId,
   events,
   filters,
   startDate,
@@ -687,6 +688,10 @@ export async function getEventsCount({
     sb.where.profileId = `profile_id = ${sqlstring.escape(profileId)}`;
   }
 
+  if (groupId) {
+    sb.where.groupId = `has(groups, ${sqlstring.escape(groupId)})`;
+  }
+
   if (startDate && endDate) {
     sb.where.created_at = `toDate(created_at) BETWEEN toDate('${formatClickhouseDate(startDate)}') AND toDate('${formatClickhouseDate(endDate)}')`;
   }

packages/db/src/services/group.service.ts

@@ -137,7 +137,7 @@ export async function getGroupList({
     WHERE ${conditions.join(' AND ')}
     ORDER BY created_at DESC
     LIMIT ${take}
-    OFFSET ${cursor ?? 0}
+    OFFSET ${Math.max(0, (cursor ?? 0) * take)}
   `);
   return rows.map(transformGroup);
 }
@@ -194,15 +194,19 @@ export async function updateGroup(
   if (!existing) {
     throw new Error(`Group ${id} not found`);
   }
+  const mergedProperties = {
+    ...(existing.properties ?? {}),
+    ...(data.properties ?? {}),
+  };
+  const normalizedProperties = toDots(
+    mergedProperties as Record<string, unknown>
+  );
   const updated = {
     id,
     projectId,
     type: data.type ?? existing.type,
     name: data.name ?? existing.name,
-    properties: (data.properties ?? existing.properties) as Record<
+    properties: normalizedProperties,
-      string,
-      string
-    >,
     createdAt: existing.createdAt,
   };
   await writeGroupToCh(updated);
@@ -314,7 +318,7 @@ export async function getGroupMemberProfiles({
   take: number;
   search?: string;
 }): Promise<{ data: IServiceProfile[]; count: number }> {
-  const offset = Math.max(0, cursor ?? 0);
+  const offset = Math.max(0, (cursor ?? 0) * take);
   const searchCondition = search?.trim()
     ? `AND (email ILIKE ${sqlstring.escape(`%${search.trim()}%`)} OR first_name ILIKE ${sqlstring.escape(`%${search.trim()}%`)} OR last_name ILIKE ${sqlstring.escape(`%${search.trim()}%`)})`
     : '';

packages/sdks/sdk/src/index.ts

@@ -277,10 +277,7 @@ export class OpenPanel {
       const mergedGroups = [...new Set([...this.groups, ...queuedGroups])];
       return {
         ...item.payload,
-        profileId:
+        profileId: item.payload.profileId ?? this.profileId,
-          'profileId' in item.payload
-            ? (item.payload.profileId ?? this.profileId)
-            : this.profileId,
         groups: mergedGroups.length > 0 ? mergedGroups : undefined,
       };
     }
@@ -291,11 +288,7 @@ export class OpenPanel {
     ) {
       return {
         ...item.payload,
-        profileId: String(
+        profileId: item.payload.profileId ?? this.profileId,
-          'profileId' in item.payload
-            ? (item.payload.profileId ?? this.profileId)
-            : (this.profileId ?? '')
-        ),
       } as TrackHandlerPayload['payload'];
     }
     if (item.type === 'group') {

packages/validation/src/track.validation.ts

@@ -7,15 +7,15 @@ export const zGroupPayload = z.object({
   type: z.string().min(1),
   name: z.string().min(1),
   properties: z.record(z.unknown()).optional(),
-  profileId: z.string().optional(),
+  profileId: z.union([z.string().min(1), z.number()]).optional(),
 });
 
 export const zTrackPayload = z
   .object({
     name: z.string().min(1),
     properties: z.record(z.string(), z.unknown()).optional(),
-    profileId: z.string().or(z.number()).optional(),
+    profileId: z.union([z.string().min(1), z.number()]).optional(),
-    groups: z.array(z.string()).optional(),
+    groups: z.array(z.string().min(1)).optional(),
   })
   .refine((data) => !RESERVED_EVENT_NAMES.includes(data.name as any), {
     message: `Event name cannot be one of the reserved names: ${RESERVED_EVENT_NAMES.join(', ')}`,