From: Lucas Di Pentima <lucas@di-pentima.com.ar>
Date: Sat, 21 Dec 2019 20:13:07 +0000 (-0300)
Subject: 15019: Changes joinFilters() to accept variable number of args.
X-Git-Tag: 2.0.0~9^2~8
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/2a1d97be8bff60ef9b51f120b00c285d51a26a1c

15019: Changes joinFilters() to accept variable number of args.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>
---

diff --git a/src/services/api/filter-builder.ts b/src/services/api/filter-builder.ts
index aa0f011b..102ff62c 100644
--- a/src/services/api/filter-builder.ts
+++ b/src/services/api/filter-builder.ts
@@ -2,8 +2,8 @@
 //
 // 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 {
diff --git a/src/services/favorite-service/favorite-service.ts b/src/services/favorite-service/favorite-service.ts
index 8b504c86..90849c8b 100644
--- a/src/services/favorite-service/favorite-service.ts
+++ b/src/services/favorite-service/favorite-service.ts
@@ -53,7 +53,7 @@ export class FavoriteService {
 
         return this.linkService
             .list({
-                filters: joinFilters(filters, listFilters),
+                filters: joinFilters(filters || '', listFilters),
                 limit,
                 offset,
                 order: linkOrder
diff --git a/src/services/project-service/project-service.ts b/src/services/project-service/project-service.ts
index eec5a940..4ae91d4d 100644
--- a/src/services/project-service/project-service.ts
+++ b/src/services/project-service/project-service.ts
@@ -18,7 +18,7 @@ export class ProjectService extends GroupsService<ProjectResource> {
         return super.list({
             ...args,
             filters: joinFilters(
-                args.filters,
+                args.filters || '',
                 new FilterBuilder()
                     .addEqual("group_class", GroupClass.PROJECT)
                     .getFilters()