📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
added filters to user flow
Blue Mouse7139cbb8b4b4
diff --git a/src/analytics/analytics.controller.ts b/src/analytics/analytics.controller.tsindex 224644d37..30fc779c0 100644--- a/src/analytics/analytics.controller.ts+++ b/src/analytics/analytics.controller.ts@@ -345,19 +345,10 @@ export class AnalyticsController {)}- let appliedFilters = filters-- if (filters) {- try {- appliedFilters = JSON.parse(filters)- // eslint-disable-next-line no-empty- } catch {}- }-if (isCaptcha) {return {...result,- appliedFilters,+ appliedFilters: parsedFilters,}}@@ -369,7 +360,7 @@ export class AnalyticsController {return {...result,customs,- appliedFilters,+ appliedFilters: parsedFilters,}}@@ -395,7 +386,7 @@ export class AnalyticsController {}this.analyticsService.validateTimebucket(timeBucket)- const [filtersQuery, filtersParams] = this.analyticsService.getFiltersQuery(+ const [filtersQuery, filtersParams, parsedFilters] = this.analyticsService.getFiltersQuery(filters,DataType.ANALYTICS,)@@ -437,18 +428,10 @@ export class AnalyticsController {timezone,customEVFilterApplied,)- let appliedFilters = filters-- if (filters) {- try {- appliedFilters = JSON.parse(filters)- // eslint-disable-next-line no-empty- } catch {}- }return {...result,- appliedFilters,+ appliedFilters: parsedFilters,}}@@ -474,7 +457,7 @@ export class AnalyticsController {}this.analyticsService.validateTimebucket(timeBucket)- const [filtersQuery, filtersParams] = this.analyticsService.getFiltersQuery(+ const [filtersQuery, filtersParams, parsedFilters] = this.analyticsService.getFiltersQuery(filters,DataType.PERFORMANCE,)@@ -508,18 +491,9 @@ export class AnalyticsController {timezone,)- let appliedFilters = filters-- if (filters) {- try {- appliedFilters = JSON.parse(filters)- // eslint-disable-next-line no-empty- } catch {}- }-return {...result,- appliedFilters,+ appliedFilters: parsedFilters,}}@@ -545,7 +519,7 @@ export class AnalyticsController {}this.analyticsService.validateTimebucket(timeBucket)- const [filtersQuery, filtersParams] = this.analyticsService.getFiltersQuery(+ const [filtersQuery, filtersParams, parsedFilters] = this.analyticsService.getFiltersQuery(filters,DataType.PERFORMANCE,)@@ -576,18 +550,9 @@ export class AnalyticsController {timezone,)- let appliedFilters = filters-- if (filters) {- try {- appliedFilters = JSON.parse(filters)- // eslint-disable-next-line no-empty- } catch {}- }-return {chart,- appliedFilters,+ appliedFilters: parsedFilters,}}@@ -606,7 +571,14 @@ export class AnalyticsController {@Query() data: GetUserFlowDTO,@CurrentUserId() uid: string,): Promise<IUserFlow> {- const { pid, period, from, to, timezone = DEFAULT_TIMEZONE } = data+ const {+ pid,+ period,+ from,+ to,+ timezone = DEFAULT_TIMEZONE,+ filters,+ } = datathis.analyticsService.validatePID(pid)if (!_isEmpty(period)) {@@ -623,13 +595,22 @@ export class AnalyticsController {timezone,)+ const [filtersQuery, filtersParams, parsedFilters] = this.analyticsService.getFiltersQuery(+ filters,+ DataType.ANALYTICS,+ )+const params = {pid,groupFrom,groupTo,+ ...filtersParams,}- return this.analyticsService.getUserFlow(params)+ return {+ ...this.analyticsService.getUserFlow(params, filtersQuery),+ appliedFilters: parsedFilters,+ }}@Get('birdseye')@@ -1064,7 +1045,7 @@ export class AnalyticsController {}this.analyticsService.validateTimebucket(timeBucket)- const [filtersQuery, filtersParams] = this.analyticsService.getFiltersQuery(+ const [filtersQuery, filtersParams, parsedFilters] = this.analyticsService.getFiltersQuery(filters,DataType.ANALYTICS,)@@ -1087,17 +1068,6 @@ export class AnalyticsController {},}- // let result: object | void-- let appliedFilters = filters-- if (filters) {- try {- appliedFilters = JSON.parse(filters)- // eslint-disable-next-line no-empty- } catch {}- }-const result: any = await this.analyticsService.groupCustomEVByTimeBucket(timeBucket,groupFrom,@@ -1128,7 +1098,7 @@ export class AnalyticsController {return {...result,- appliedFilters,+ appliedFilters: parsedFilters,}}}diff --git a/src/analytics/analytics.service.ts b/src/analytics/analytics.service.tsindex d3e4ab0c3..ed39b1e5b 100644--- a/src/analytics/analytics.service.ts+++ b/src/analytics/analytics.service.ts@@ -494,7 +494,7 @@ export class AnalyticsService {return { nodes, links }}- async getUserFlow(params: unknown): Promise<IUserFlow> {+ async getUserFlow(params: unknown, filtersQuery: string): Promise<IUserFlow> {const query = `SELECTpg AS source,@@ -505,6 +505,7 @@ export class AnalyticsService {pid = {pid:FixedString(12)}AND created BETWEEN {groupFrom:String} AND {groupTo:String}AND pg != prev+ ${filtersQuery}GROUP BYpg,prevdiff --git a/src/analytics/dto/getUserFlow.dto.ts b/src/analytics/dto/getUserFlow.dto.tsindex 121aa0613..63fd88641 100644--- a/src/analytics/dto/getUserFlow.dto.ts+++ b/src/analytics/dto/getUserFlow.dto.ts@@ -22,4 +22,10 @@ export class GetUserFlowDTO {default: DEFAULT_TIMEZONE,})timezone: string++ @ApiProperty({+ description:+ 'A stringified array of properties to filter [{ column, filter, isExclusive }]',+ })+ filters: string}