X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/59ee572e791985a36bdd2015c9b494145109e8ed..c038a5258d5790773ccca89a192c8c2b7dcd86cb:/src/services/api/filter-builder.ts diff --git a/src/services/api/filter-builder.ts b/src/services/api/filter-builder.ts index b5558dbb..e36765ba 100644 --- a/src/services/api/filter-builder.ts +++ b/src/services/api/filter-builder.ts @@ -11,7 +11,7 @@ export function joinFilters(filters0?: string, filters1?: string) { export class FilterBuilder { constructor(private filters = "") { } - public addEqual(field: string, value?: string, resourcePrefix?: string) { + public addEqual(field: string, value?: string | boolean, resourcePrefix?: string) { return this.addCondition(field, "=", value, "", "", resourcePrefix ); } @@ -31,15 +31,35 @@ export class FilterBuilder { return this.addCondition(field, "in", value, "", "", resourcePrefix); } + public addGt(field: string, value?: string, resourcePrefix?: string) { + return this.addCondition(field, ">", value, "", "", resourcePrefix); + } + + public addGte(field: string, value?: string, resourcePrefix?: string) { + return this.addCondition(field, ">=", value, "", "", resourcePrefix); + } + + public addLt(field: string, value?: string, resourcePrefix?: string) { + return this.addCondition(field, "<", value, "", "", resourcePrefix); + } + + public addLte(field: string, value?: string, resourcePrefix?: string) { + return this.addCondition(field, "<=", value, "", "", resourcePrefix); + } + public getFilters() { return this.filters; } - private addCondition(field: string, cond: string, value?: string | string[], prefix: string = "", postfix: string = "", resourcePrefix?: string) { + private addCondition(field: string, cond: string, value?: string | string[] | boolean, prefix: string = "", postfix: string = "", resourcePrefix?: string) { if (value) { - value = typeof value === "string" - ? `"${prefix}${value}${postfix}"` - : `["${value.join(`","`)}"]`; + if (typeof value === "string") { + value = `"${prefix}${value}${postfix}"`; + } else if (Array.isArray(value)) { + value = `["${value.join(`","`)}"]`; + } else { + value = value ? "true" : "false"; + } const resPrefix = resourcePrefix ? _.snakeCase(resourcePrefix) + "."