refactor Property components to be resused for both session/event data. Implement session-data screens + filtering. Remove all event-data specific compoenents/queries
This commit is contained in:
1 parent
9da332c489
commit
680a1ca1a2
71 files changed
+2814
-958
No files matched your search
@@ -28,13 +28,13 @@ async function relationalQuery(
|
||||
eventFilters: EventPropertyFilter[] = [],
|
||||
) {
|
||||
const { timezone = 'utc' } = filters;
|
||||
const { rawQuery, parseFilters, getEventPropertyFilterQuery } = prisma;
|
||||
const { rawQuery, parseFilters, getPropertyFilterQuery } = prisma;
|
||||
const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters({
|
||||
...filters,
|
||||
websiteId,
|
||||
timezone,
|
||||
});
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters, timezone);
|
||||
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(eventFilters, 'event', timezone);
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
@@ -57,9 +57,9 @@ async function relationalQuery(
|
||||
and event_data.data_key = {{propertyName}}
|
||||
and event_data.data_type = 2
|
||||
${filterQuery}
|
||||
${epfSQL}
|
||||
${pfSQL}
|
||||
`,
|
||||
{ ...queryParams, eventName, propertyName, ...epfParams },
|
||||
{ ...queryParams, eventName, propertyName, ...pfParams },
|
||||
FUNCTION_NAME,
|
||||
);
|
||||
}
|
||||
@@ -72,9 +72,9 @@ async function clickhouseQuery(
|
||||
eventFilters: EventPropertyFilter[] = [],
|
||||
): Promise<EventDataNumericStats[]> {
|
||||
const { timezone = 'UTC' } = filters;
|
||||
const { rawQuery, parseFilters, getEventPropertyFilterQuery } = clickhouse;
|
||||
const { rawQuery, parseFilters, getPropertyFilterQuery } = clickhouse;
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
|
||||
const { sql: epfSQL, params: epfParams } = getEventPropertyFilterQuery(eventFilters, timezone);
|
||||
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(eventFilters, 'event', timezone);
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
@@ -101,9 +101,9 @@ async function clickhouseQuery(
|
||||
and event_data.data_key = {propertyName:String}
|
||||
and event_data.data_type = 2
|
||||
${filterQuery}
|
||||
${epfSQL}
|
||||
${pfSQL}
|
||||
`,
|
||||
{ ...queryParams, eventName, propertyName, ...epfParams },
|
||||
{ ...queryParams, eventName, propertyName, ...pfParams },
|
||||
FUNCTION_NAME,
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user