Skip to content

OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.

fix types and dockerfiles

Carl-Gerhard Lindesvärd95bc55b493e2
diff --git a/apps/sdk-api/Dockerfile b/apps/sdk-api/Dockerfile
index c8ccb6f8d..e251c8ccd 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 1ca35148b..a17079fad 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<IServiceCreateEventPayload, 'id'> = {
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 07907e61a..e8c059467 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 704239e46..bc0a1ca56 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 0eb49212e..6f20638de 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 f22659c6e..88ed4a45c 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 ec2a35311..ae81da330 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<IServiceCreateEventPayload, 'id'>;
}
export interface EventsQueuePayloadCreateSessionEnd {
type: 'createSessionEnd';