fix: longer event id for events with long paths

Author: izadoesdev

apps/api/src/query/builders/geo.ts

@@ -70,25 +70,7 @@ export const GeoBuilders: Record<string, SimpleQueryConfig> = {
         customizable: true
     },
 
-    countries: {
-        table: 'analytics.events',
-        fields: [
-            'country as name',
-            'COUNT(*) as pageviews',
-            'COUNT(DISTINCT anonymous_id) as visitors',
-            'ROUND((COUNT(*) / SUM(COUNT(*)) OVER()) * 100, 2) as percentage'
-        ],
-        where: ['country != \'\'', 'event_name = \'screen_view\''],
-        groupBy: ['country'],
-        orderBy: 'pageviews DESC',
-        limit: 25,
-        timeField: 'time',
-        allowedFilters: ['country', 'path', 'device_type', 'browser_name'],
-        customizable: true,
-        plugins: { normalizeGeo: true, deduplicateGeo: true }
-    },
-
-    cities: {
+    city: {
         table: 'analytics.events',
         fields: [
             'city as name',
@@ -99,42 +81,9 @@ export const GeoBuilders: Record<string, SimpleQueryConfig> = {
         where: ['city != \'\'', 'event_name = \'screen_view\''],
         groupBy: ['city'],
         orderBy: 'pageviews DESC',
-        limit: 25,
-        timeField: 'time',
-        allowedFilters: ['city', 'country', 'path', 'device_type'],
-        customizable: true
-    },
-
-    regions: {
-        table: 'analytics.events',
-        fields: [
-            'region as name',
-            'COUNT(*) as pageviews',
-            'COUNT(DISTINCT anonymous_id) as visitors',
-            'ROUND((COUNT(*) / SUM(COUNT(*)) OVER()) * 100, 2) as percentage'
-        ],
-        where: ['region != \'\'', 'event_name = \'screen_view\''],
-        groupBy: ['region'],
-        orderBy: 'pageviews DESC',
-        limit: 25,
-        timeField: 'time',
-        allowedFilters: ['region', 'country', 'path', 'device_type'],
-        customizable: true
-    },
-
-    geo_time_series: {
-        table: 'analytics.events',
-        fields: [
-            'toDate(time) as date',
-            'country',
-            'COUNT(*) as pageviews',
-            'COUNT(DISTINCT anonymous_id) as visitors'
-        ],
-        where: ['country != \'\'', 'event_name = \'screen_view\''],
-        groupBy: ['toDate(time)', 'country'],
-        orderBy: 'date ASC, pageviews DESC',
+        limit: 100,
         timeField: 'time',
-        allowedFilters: ['country', 'city', 'region', 'path'],
+        allowedFilters: ['country', 'path', 'device_type'],
         customizable: true
     }
 }; 

apps/basket/src/utils/event-schema.ts

@@ -35,7 +35,7 @@ const MAX_FUTURE_MS = 60 * 60 * 1000; // 1 hour
 const MIN_TIMESTAMP = 946684800000; // year 2000
 
 export const analyticsEventSchema = z.object({
-    eventId: z.string().max(128),
+    eventId: z.string().max(512),
     name: z.string().min(1).max(128),
     anonymousId: z.string().nullable().optional(),
     sessionId: z.string().nullable().optional(),

apps/dashboard/app/(main)/websites/[id]/_components/tabs/audience-tab.tsx

@@ -84,6 +84,7 @@ interface ProcessedData {
   geographic: {
     countries: GeographicEntry[];
     regions: GeographicEntry[];
+    cities: GeographicEntry[];
     timezones: GeographicEntry[];
     languages: GeographicEntry[];
   };
@@ -167,7 +168,7 @@ export function WebsiteAudienceTab({
     () => [
       {
         id: "geographic-data",
-        parameters: ["country", "region", "timezone", "language"],
+        parameters: ["country", "region", "city", "timezone", "language"],
         limit: 100,
       },
       {
@@ -227,7 +228,7 @@ export function WebsiteAudienceTab({
   const processedData = useMemo((): ProcessedData => {
     if (!batchResults?.length) {
       return {
-        geographic: { countries: [], regions: [], timezones: [], languages: [] },
+        geographic: { countries: [], regions: [], cities: [], timezones: [], languages: [] },
         device: {
           device_type: [],
           browser_name: [],
@@ -247,6 +248,7 @@ export function WebsiteAudienceTab({
       geographic: {
         countries: normalizeData(geographicResult?.data?.country || []),
         regions: normalizeData(geographicResult?.data?.region || []),
+        cities: normalizeData(geographicResult?.data?.city || []),
         timezones: normalizeData(geographicResult?.data?.timezone || []),
         languages: normalizeData(geographicResult?.data?.language || []),
       },
@@ -644,6 +646,46 @@ export function WebsiteAudienceTab({
     []
   );
 
+  // City specific columns with icon
+  const cityColumns = useMemo(
+    (): ColumnDef<GeographicEntry>[] => [
+      {
+        id: "name",
+        accessorKey: "name",
+        header: "City",
+        cell: (info: CellContext<GeographicEntry, any>) => {
+          const name = info.getValue() as string;
+          return (
+            <div className="flex items-center gap-2">
+              <MapPin className="h-4 w-4 text-primary" />
+              <span className="font-medium">{name}</span>
+            </div>
+          );
+        },
+      },
+      {
+        id: "visitors",
+        accessorKey: "visitors",
+        header: "Visitors",
+      },
+      {
+        id: "pageviews",
+        accessorKey: "pageviews",
+        header: "Pageviews",
+      },
+      {
+        id: "percentage",
+        accessorKey: "percentage",
+        header: "Share",
+        cell: (info: CellContext<GeographicEntry, any>) => {
+          const percentage = info.getValue() as number;
+          return <PercentageBadge percentage={percentage} />;
+        },
+      },
+    ],
+    []
+  );
+
   // Prepare tabs for enhanced geographic data with unique keys
   const geographicTabs = useMemo(
     () => [
@@ -683,16 +725,27 @@ export function WebsiteAudienceTab({
         })),
         columns: languageColumns,
       },
+      {
+        id: "cities",
+        label: "Cities",
+        data: processedData.geographic.cities.map((item, index) => ({
+          ...item,
+          _uniqueKey: `city-${item.name}-${index}`,
+        })),
+        columns: cityColumns,
+      },
     ],
     [
       processedData.geographic.countries,
       processedData.geographic.regions,
       processedData.geographic.timezones,
       processedData.geographic.languages,
+      processedData.geographic.cities,
       countryColumns,
       geographicColumns,
       timezoneColumns,
       languageColumns,
+      cityColumns,
     ]
   );