Add new conditions and concatenation to FilterBuilder

[arvados-workbench2.git] / src / services / collection-service / collection-service.ts

diff --git a/src/services/collection-service/collection-service.ts b/src/services/collection-service/collection-service.ts
index 171cd8565ffc503a2137f56476997356fc1e4b11..8412dea1e5b74becf0eb58f8a45b25e1ba2e8b04 100644 (file)
--- a/src/services/collection-service/collection-service.ts
+++ b/src/services/collection-service/collection-service.ts
@@ -3,9 +3,10 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { serverApi } from "../../common/api/server-api";
-import FilterBuilder, { FilterField } from "../../common/api/filter-builder";
+import FilterBuilder from "../../common/api/filter-builder";
 import { ArvadosResource } from "../response";
 import { Collection } from "../../models/collection";
+import { getResourceKind } from "../../models/resource";
 
 interface CollectionResource extends ArvadosResource {
     name: string;
@@ -31,9 +32,9 @@ export default class CollectionService {
     public getCollectionList = (parentUuid?: string): Promise<Collection[]> => {
         if (parentUuid) {
             const fb = new FilterBuilder();
-            fb.addLike(FilterField.OWNER_UUID, parentUuid);
+            fb.addLike("ownerUuid", parentUuid);
             return serverApi.get<CollectionsResponse>('/collections', { params: {
-                filters: fb.get()
+                filters: fb.serialize()
             }}).then(resp => {
                 const collections = resp.data.items.map(g => ({
                     name: g.name,
@@ -42,7 +43,7 @@ export default class CollectionService {
                     href: g.href,
                     uuid: g.uuid,
                     ownerUuid: g.owner_uuid,
-                    kind: g.kind
+                    kind: getResourceKind(g.kind)
                 } as Collection));
                 return collections;
             });