diff --git a/apps/sdk-api/Dockerfile b/apps/sdk-api/Dockerfile index c8ccb6f8..e251c8cc 100644 --- a/apps/sdk-api/Dockerfile +++ b/apps/sdk-api/Dockerfile @@ -46,6 +46,8 @@ COPY packages/db/package.json packages/db/package.json COPY packages/redis/package.json packages/redis/package.json COPY packages/queue/package.json packages/queue/package.json COPY packages/common/package.json packages/common/package.json +COPY packages/constants/package.json packages/constants/package.json +COPY packages/validation/package.json packages/validation/package.json COPY packages/types/package.json packages/types/package.json # BUILD diff --git a/apps/sdk-api/src/controllers/event.controller.ts b/apps/sdk-api/src/controllers/event.controller.ts index 1ca35148..a17079fa 100644 --- a/apps/sdk-api/src/controllers/event.controller.ts +++ b/apps/sdk-api/src/controllers/event.controller.ts @@ -141,7 +141,7 @@ export async function postEvent( ); } - const payload: IServiceCreateEventPayload = { + const payload: Omit = { name: body.name, profileId, projectId, @@ -166,6 +166,8 @@ export async function postEvent( referrer: referrer?.url, referrerName: referrer?.name ?? utmReferrer?.name ?? '', referrerType: referrer?.type ?? utmReferrer?.type ?? '', + profile: undefined, + meta: undefined, }; const job = findJobByPrefix(eventsJobs, `event:${projectId}:${profileId}:`); diff --git a/apps/web/src/components/overview/overview-top-sources.tsx b/apps/web/src/components/overview/overview-top-sources.tsx index 07907e61..e8c05946 100644 --- a/apps/web/src/components/overview/overview-top-sources.tsx +++ b/apps/web/src/components/overview/overview-top-sources.tsx @@ -280,19 +280,19 @@ export default function OverviewTopSources({ setWidget('domain'); break; case 'utm_source': - setFilter('utm_source', item.name); + setFilter('properties.query.utm_source', item.name); break; case 'utm_medium': - setFilter('utm_medium', item.name); + setFilter('properties.query.utm_medium', item.name); break; case 'utm_campaign': - setFilter('utm_campaign', item.name); + setFilter('properties.query.utm_campaign', item.name); break; case 'utm_term': - setFilter('utm_term', item.name); + setFilter('properties.query.utm_term', item.name); break; case 'utm_content': - setFilter('utm_content', item.name); + setFilter('properties.query.utm_content', item.name); break; } }} diff --git a/apps/web/src/components/overview/useOverviewOptions.ts b/apps/web/src/components/overview/useOverviewOptions.ts index 704239e4..bc0a1ca5 100644 --- a/apps/web/src/components/overview/useOverviewOptions.ts +++ b/apps/web/src/components/overview/useOverviewOptions.ts @@ -12,7 +12,7 @@ const nuqsOptions = { history: 'push' } as const; export function useOverviewOptions() { const [previous, setPrevious] = useQueryState( - 'name', + 'compare', parseAsBoolean.withDefault(true).withOptions(nuqsOptions) ); const [range, setRange] = useQueryState( diff --git a/apps/worker/Dockerfile b/apps/worker/Dockerfile index 0eb49212..6f20638d 100644 --- a/apps/worker/Dockerfile +++ b/apps/worker/Dockerfile @@ -45,6 +45,8 @@ COPY packages/db/package.json packages/db/package.json COPY packages/redis/package.json packages/redis/package.json COPY packages/queue/package.json packages/queue/package.json COPY packages/common/package.json packages/common/package.json +COPY packages/constants/package.json packages/constants/package.json +COPY packages/validation/package.json packages/validation/package.json COPY packages/types/package.json packages/types/package.json # BUILD diff --git a/apps/worker/src/jobs/events.create-session-end.ts b/apps/worker/src/jobs/events.create-session-end.ts index f22659c6..88ed4a45 100644 --- a/apps/worker/src/jobs/events.create-session-end.ts +++ b/apps/worker/src/jobs/events.create-session-end.ts @@ -71,11 +71,12 @@ export async function createSessionEnd( return createEvent({ ...sessionStart, properties: { + ...sessionStart.properties, _bounce: screenViews.length === 1, }, name: 'session_end', duration: sessionDuration, path: lastScreenView?.path ?? sessionStart.path, - createdAt: toISOString(getTime(lastScreenView.createdAt) + 100), + createdAt: new Date(getTime(lastScreenView.createdAt) + 100), }); } diff --git a/packages/queue/src/queues.ts b/packages/queue/src/queues.ts index ec2a3531..ae81da33 100644 --- a/packages/queue/src/queues.ts +++ b/packages/queue/src/queues.ts @@ -6,7 +6,7 @@ import { connection } from './connection'; export interface EventsQueuePayloadCreateEvent { type: 'createEvent'; - payload: IServiceCreateEventPayload; + payload: Omit; } export interface EventsQueuePayloadCreateSessionEnd { type: 'createSessionEnd';