Revert "improve(funnel): make sure group by profile id works as you would think"

This reverts commit 56edb91dd0.

packages/trpc/src/routers/chart.ts

@@ -7,7 +7,6 @@ import {
   chQuery,
   createSqlBuilder,
   db,
-  getFunnelData,
   getSelectPropertyKey,
   toDate,
 } from '@openpanel/db';
@@ -32,6 +31,8 @@ import {
   getChart,
   getChartPrevStartEndDate,
   getChartStartEndDate,
+  getFunnelData,
+  getFunnelStep,
 } from './chart.helpers';
 
 function utc(date: string | Date) {
@@ -86,12 +87,9 @@ export const chartRouter = createTRPCRouter({
         .map((item) => item.replace(/\.([0-9]+)/g, '[*]'))
         .map((item) => `properties.${item}`);
 
-      if (event === '*') {
-        properties.push('name');
-      }
-
       properties.push(
         'has_profile',
+        'name',
         'path',
         'origin',
         'referrer',
@@ -186,9 +184,7 @@ export const chartRouter = createTRPCRouter({
 
     const [current, previous] = await Promise.all([
       getFunnelData({ ...input, ...currentPeriod }),
-      input.previous
-        ? getFunnelData({ ...input, ...previousPeriod })
-        : Promise.resolve(null),
+      getFunnelData({ ...input, ...previousPeriod }),
     ]);
 
     return {
@@ -197,6 +193,17 @@ export const chartRouter = createTRPCRouter({
     };
   }),
 
+  funnelStep: protectedProcedure
+    .input(
+      zChartInput.extend({
+        step: z.number(),
+      }),
+    )
+    .query(async ({ input }) => {
+      const currentPeriod = getChartStartEndDate(input);
+      return getFunnelStep({ ...input, ...currentPeriod });
+    }),
+
   chart: publicProcedure.input(zChartInput).query(async ({ input, ctx }) => {
     if (ctx.session.userId) {
       const access = await getProjectAccessCached({