Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
add normalize filters to clickhouse
Francis Cao146650586b3c
diff --git a/lib/clickhouse.ts b/lib/clickhouse.tsindex 8ce7bc980..bc10a6d4e 100644--- a/lib/clickhouse.ts+++ b/lib/clickhouse.ts@@ -94,13 +94,23 @@ function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {})return query.join('\n');}+function normalizeFilters(filters = {}) {+ return Object.keys(filters).reduce((obj, key) => {+ const value = filters[key];++ obj[key] = value?.value ?? value;++ return obj;+ }, {});+}+async function parseFilters(websiteId: string, filters: QueryFilters = {}, options?: QueryOptions) {const website = await loadWebsite(websiteId);return {filterQuery: getFilterQuery(filters, options),params: {- ...filters,+ ...normalizeFilters(filters),websiteId,startDate: maxDate(filters.startDate, website.resetAt),websiteDomain: website.domain,