From 9c2991d118f83341e64bc413b48a235fa80f38e2 Mon Sep 17 00:00:00 2001 From: Michal Klobukowski Date: Mon, 10 Dec 2018 16:43:39 +0100 Subject: [PATCH] Add possibility to pass the null value to addEqual condition in FilterBuilder Feature #14505 Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski --- src/services/api/filter-builder.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/services/api/filter-builder.ts b/src/services/api/filter-builder.ts index 08746c81b9..4b3db9fa2b 100644 --- a/src/services/api/filter-builder.ts +++ b/src/services/api/filter-builder.ts @@ -11,8 +11,8 @@ export function joinFilters(filters0?: string, filters1?: string) { export class FilterBuilder { constructor(private filters = "") { } - public addEqual(field: string, value?: string | boolean, resourcePrefix?: string) { - return this.addCondition(field, "=", value, "", "", resourcePrefix ); + public addEqual(field: string, value?: string | boolean | null, resourcePrefix?: string) { + return this.addCondition(field, "=", value, "", "", resourcePrefix); } public addLike(field: string, value?: string, resourcePrefix?: string) { @@ -59,13 +59,13 @@ export class FilterBuilder { return this.filters; } - private addCondition(field: string, cond: string, value?: string | string[] | boolean, prefix: string = "", postfix: string = "", resourcePrefix?: string) { - if (value) { + private addCondition(field: string, cond: string, value?: string | string[] | boolean | null, prefix: string = "", postfix: string = "", resourcePrefix?: string) { + if (value !== undefined) { if (typeof value === "string") { value = `"${prefix}${value}${postfix}"`; } else if (Array.isArray(value)) { value = `["${value.join(`","`)}"]`; - } else { + } else if (value !== null) { value = value ? "true" : "false"; } -- 2.30.2