From: Lucas Di Pentima <lucas.dipentima@curii.com>
Date: Mon, 9 May 2022 22:50:44 +0000 (-0300)
Subject: 16115: Fixes filter building for list equality comparison.
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/d918b7408326b3d1193fc49c8049b5dbbc93a767

16115: Fixes filter building for list equality comparison.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>
---

diff --git a/src/services/api-client-authorization-service/api-client-authorization-service.test.ts b/src/services/api-client-authorization-service/api-client-authorization-service.test.ts
index 31fa046ea0..3a271f5396 100644
--- a/src/services/api-client-authorization-service/api-client-authorization-service.test.ts
+++ b/src/services/api-client-authorization-service/api-client-authorization-service.test.ts
@@ -55,11 +55,11 @@ describe('ApiClientAuthorizationService', () => {
             await apiClientAuthorizationService.listCollectionSharingTokens(uuid);
             expect(serverApi.get).toHaveBeenCalledWith(
                 `/api_client_authorizations`, {params: {
-                    filters: '[["scopes","=","' + JSON.stringify([
+                    filters: JSON.stringify([["scopes","=",[
                         `GET /arvados/v1/collections/${uuid}`,
                         `GET /arvados/v1/collections/${uuid}/`,
-                        `GET /arvados/v1/keep_services/accessible`,
-                    ]) + '"]]',
+                        'GET /arvados/v1/keep_services/accessible',
+                    ]]]),
                     select: undefined,
                 }}
             );
diff --git a/src/services/api-client-authorization-service/api-client-authorization-service.ts b/src/services/api-client-authorization-service/api-client-authorization-service.ts
index 012fdb15c9..7c985dbba8 100644
--- a/src/services/api-client-authorization-service/api-client-authorization-service.ts
+++ b/src/services/api-client-authorization-service/api-client-authorization-service.ts
@@ -33,11 +33,11 @@ export class ApiClientAuthorizationService extends CommonService<ApiClientAuthor
         }
         return this.list({
             filters: new FilterBuilder()
-                .addEqual("scopes", JSON.stringify([
+                .addEqual("scopes", [
                     `GET /arvados/v1/collections/${uuid}`,
                     `GET /arvados/v1/collections/${uuid}/`,
-                    "GET /arvados/v1/keep_services/accessible",
-                ])).getFilters()
+                    "GET /arvados/v1/keep_services/accessible"
+                ]).getFilters()
         });
     }
 }
\ No newline at end of file
diff --git a/src/services/api/filter-builder.ts b/src/services/api/filter-builder.ts
index d1a4fd08b6..4809e7a80c 100644
--- a/src/services/api/filter-builder.ts
+++ b/src/services/api/filter-builder.ts
@@ -9,7 +9,7 @@ export function joinFilters(...filters: string[]) {
 export class FilterBuilder {
     constructor(private filters = "") { }
 
-    public addEqual(field: string, value?: string | boolean | null, resourcePrefix?: string) {
+    public addEqual(field: string, value?: string | string[] | boolean | null, resourcePrefix?: string) {
         return this.addCondition(field, "=", value, "", "", resourcePrefix);
     }