X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3f7e1a8afad27920adf8f03ce82eeb1ae58aa84f..2a7fd99c212c33a1ec9911f8529fa5afc59a7bb2:/src/services/api/filter-builder.ts diff --git a/src/services/api/filter-builder.ts b/src/services/api/filter-builder.ts index da67935a1e..bb97665a8c 100644 --- a/src/services/api/filter-builder.ts +++ b/src/services/api/filter-builder.ts @@ -64,7 +64,7 @@ export class FilterBuilder { return this.addCondition("properties." + field, "exists", false, "", "", resourcePrefix); } - public addFullTextSearch(value: string) { + public addFullTextSearch(value: string, table?: string) { const regex = /"[^"]*"/; const matches: any[] = []; @@ -76,10 +76,15 @@ export class FilterBuilder { match = value.match(regex); } + let searchIn = 'any'; + if (table) { + searchIn = table + ".any"; + } + const terms = value.trim().split(/(\s+)/).concat(matches); terms.forEach(term => { if (term !== " ") { - this.addCondition("any", "ilike", term, "%", "%"); + this.addCondition(searchIn, "ilike", term, "%", "%"); } }); return this;