watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-08 22:57:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Allow filter search for country and region.

Browse source
This commit is contained in:
Mike Cao 2024-11-27 23:43:28 -08:00
parent 2ed7628997
commit a18d1a923c
5 changed files with 55 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/lib/clickhouse.ts
View file

@ -68,6 +68,10 @@ function getDateSQL(field: string, unit: string, timezone?: string) {
return `toDateTime(date_trunc('${unit}', ${field}))`;
}
function getSearchSQL(column: string, param: string = 'search'): string {
return `and positionCaseInsensitive(${column}, {${param}:String}) > 0`;
}
function mapFilter(column: string, operator: string, name: string, type: string = 'String') {
const value = `{${name}:${type}}`;
@ -229,6 +233,7 @@ export default {
connect,
getDateStringSQL,
getDateSQL,
getSearchSQL,
getFilterQuery,
getUTCString,
parseFilters,

4
src/lib/prisma.ts
View file

@ -119,11 +119,11 @@ function getTimestampDiffSQL(field1: string, field2: string): string {
}
}
function getSearchSQL(column: string): string {
function getSearchSQL(column: string, param: string = 'search'): string {
const db = getDatabaseType();
const like = db === POSTGRESQL ? 'ilike' : 'like';
return `and ${column} ${like} {{search}}`;
return `and ${column} ${like} {{${param}}`;
}
function mapFilter(column: string, operator: string, name: string, type: string = '') {