projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15019: Changes joinFilters() to accept variable number of args.
[arvados-workbench2.git]
/
src
/
services
/
api
/
filter-builder.ts
diff --git
a/src/services/api/filter-builder.ts
b/src/services/api/filter-builder.ts
index d5903c564b8b5e1a08b1613d5aa8cee77af3453e..102ff62c60e3eb1afc1076bf7ca2d85589e0fe63 100644
(file)
--- a/
src/services/api/filter-builder.ts
+++ b/
src/services/api/filter-builder.ts
@@
-2,8
+2,8
@@
//
// SPDX-License-Identifier: AGPL-3.0
//
// SPDX-License-Identifier: AGPL-3.0
-export function joinFilters(
filters0?: string, filters1?: string
) {
- return
[filters0, filters1]
.filter(s => s).join(",");
+export function joinFilters(
...filters: string[]
) {
+ return
filters
.filter(s => s).join(",");
}
export class FilterBuilder {
}
export class FilterBuilder {
@@
-13,6
+13,10
@@
export class FilterBuilder {
return this.addCondition(field, "=", value, "", "", resourcePrefix);
}
return this.addCondition(field, "=", value, "", "", resourcePrefix);
}
+ public addDistinct(field: string, value?: string | boolean | null, resourcePrefix?: string) {
+ return this.addCondition(field, "!=", value, "", "", resourcePrefix);
+ }
+
public addLike(field: string, value?: string, resourcePrefix?: string) {
return this.addCondition(field, "like", value, "%", "%", resourcePrefix);
}
public addLike(field: string, value?: string, resourcePrefix?: string) {
return this.addCondition(field, "like", value, "%", "%", resourcePrefix);
}