📈 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
[selfhosted] search support
Blue Mouse16e19c713069
diff --git a/apps/selfhosted/src/common/utils.ts b/apps/selfhosted/src/common/utils.tsindex 60483e34e..af030b49f 100644--- a/apps/selfhosted/src/common/utils.ts+++ b/apps/selfhosted/src/common/utils.ts@@ -148,8 +148,27 @@ const createFunnelClickhouse = async (funnel: Partial<Funnel>) => {return clickhouse.query(query, paramsData).toPromise()}-const getProjectsClickhouse = async (id = null) => {+const getProjectsClickhouse = async (id = null, search: string = null) => {if (!id) {+ if (search) {+ const paramsData = {+ params: {+ search: `%${search}%`,+ },+ }++ const query = `+ SELECT+ *+ FROM project+ WHERE+ name ILIKE {search:String} OR+ id ILIKE {search:String}+ ORDER BY created ASC`++ return clickhouse.query(query, paramsData).toPromise()+ }+const query = 'SELECT * FROM project ORDER BY created ASC;'return clickhouse.query(query).toPromise()}diff --git a/apps/selfhosted/src/project/project.controller.ts b/apps/selfhosted/src/project/project.controller.tsindex 7c7088f63..f4ca62f20 100644--- a/apps/selfhosted/src/project/project.controller.ts+++ b/apps/selfhosted/src/project/project.controller.ts@@ -76,18 +76,18 @@ export class ProjectController {@Get('/')@ApiQuery({ name: 'take', required: false })@ApiQuery({ name: 'skip', required: false })- @ApiQuery({ name: 'isCaptcha', required: false, type: Boolean })- @ApiQuery({ name: 'relatedonly', required: false, type: Boolean })+ @ApiQuery({ name: 'search', required: false, type: String })@ApiResponse({ status: 200, type: [Project] })@Auth([UserType.CUSTOMER, UserType.ADMIN], true)async get(@CurrentUserId() userId: string,@Query('take') take: number | undefined,@Query('skip') skip: number | undefined,+ @Query('search') search: string | undefined,): Promise<Pagination<Project> | Project[] | object> {this.logger.log({ userId, take, skip }, 'GET /project')- const chResults = await getProjectsClickhouse()+ const chResults = await getProjectsClickhouse(null, search)const formatted = _map(chResults, this.projectService.formatFromClickhouse)const pidsWithData =