fix types and dockerfiles

This commit is contained in:
Carl-Gerhard Lindesvärd
2024-02-19 11:34:06 +01:00
parent 2f3c5ddf76
commit 95bc55b493
7 changed files with 16 additions and 9 deletions

View File

@@ -46,6 +46,8 @@ COPY packages/db/package.json packages/db/package.json
COPY packages/redis/package.json packages/redis/package.json COPY packages/redis/package.json packages/redis/package.json
COPY packages/queue/package.json packages/queue/package.json COPY packages/queue/package.json packages/queue/package.json
COPY packages/common/package.json packages/common/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 COPY packages/types/package.json packages/types/package.json
# BUILD # BUILD

View File

@@ -141,7 +141,7 @@ export async function postEvent(
); );
} }
const payload: IServiceCreateEventPayload = { const payload: Omit<IServiceCreateEventPayload, 'id'> = {
name: body.name, name: body.name,
profileId, profileId,
projectId, projectId,
@@ -166,6 +166,8 @@ export async function postEvent(
referrer: referrer?.url, referrer: referrer?.url,
referrerName: referrer?.name ?? utmReferrer?.name ?? '', referrerName: referrer?.name ?? utmReferrer?.name ?? '',
referrerType: referrer?.type ?? utmReferrer?.type ?? '', referrerType: referrer?.type ?? utmReferrer?.type ?? '',
profile: undefined,
meta: undefined,
}; };
const job = findJobByPrefix(eventsJobs, `event:${projectId}:${profileId}:`); const job = findJobByPrefix(eventsJobs, `event:${projectId}:${profileId}:`);

View File

@@ -280,19 +280,19 @@ export default function OverviewTopSources({
setWidget('domain'); setWidget('domain');
break; break;
case 'utm_source': case 'utm_source':
setFilter('utm_source', item.name); setFilter('properties.query.utm_source', item.name);
break; break;
case 'utm_medium': case 'utm_medium':
setFilter('utm_medium', item.name); setFilter('properties.query.utm_medium', item.name);
break; break;
case 'utm_campaign': case 'utm_campaign':
setFilter('utm_campaign', item.name); setFilter('properties.query.utm_campaign', item.name);
break; break;
case 'utm_term': case 'utm_term':
setFilter('utm_term', item.name); setFilter('properties.query.utm_term', item.name);
break; break;
case 'utm_content': case 'utm_content':
setFilter('utm_content', item.name); setFilter('properties.query.utm_content', item.name);
break; break;
} }
}} }}

View File

@@ -12,7 +12,7 @@ const nuqsOptions = { history: 'push' } as const;
export function useOverviewOptions() { export function useOverviewOptions() {
const [previous, setPrevious] = useQueryState( const [previous, setPrevious] = useQueryState(
'name', 'compare',
parseAsBoolean.withDefault(true).withOptions(nuqsOptions) parseAsBoolean.withDefault(true).withOptions(nuqsOptions)
); );
const [range, setRange] = useQueryState( const [range, setRange] = useQueryState(

View File

@@ -45,6 +45,8 @@ COPY packages/db/package.json packages/db/package.json
COPY packages/redis/package.json packages/redis/package.json COPY packages/redis/package.json packages/redis/package.json
COPY packages/queue/package.json packages/queue/package.json COPY packages/queue/package.json packages/queue/package.json
COPY packages/common/package.json packages/common/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 COPY packages/types/package.json packages/types/package.json
# BUILD # BUILD

View File

@@ -71,11 +71,12 @@ export async function createSessionEnd(
return createEvent({ return createEvent({
...sessionStart, ...sessionStart,
properties: { properties: {
...sessionStart.properties,
_bounce: screenViews.length === 1, _bounce: screenViews.length === 1,
}, },
name: 'session_end', name: 'session_end',
duration: sessionDuration, duration: sessionDuration,
path: lastScreenView?.path ?? sessionStart.path, path: lastScreenView?.path ?? sessionStart.path,
createdAt: toISOString(getTime(lastScreenView.createdAt) + 100), createdAt: new Date(getTime(lastScreenView.createdAt) + 100),
}); });
} }

View File

@@ -6,7 +6,7 @@ import { connection } from './connection';
export interface EventsQueuePayloadCreateEvent { export interface EventsQueuePayloadCreateEvent {
type: 'createEvent'; type: 'createEvent';
payload: IServiceCreateEventPayload; payload: Omit<IServiceCreateEventPayload, 'id'>;
} }
export interface EventsQueuePayloadCreateSessionEnd { export interface EventsQueuePayloadCreateSessionEnd {
type: 'createSessionEnd'; type: 'createSessionEnd';