Add convenience create method add handle Resource type in FitlerBuilder

Feature #13703

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --git a/src/common/api/filter-builder.ts b/src/common/api/filter-builder.ts
index 443c763913635c066ffb3f5426e424f997d68a09..cc31f384edd9e8a42021e48f66b509cd5b0dc069 100644 (file)
--- a/src/common/api/filter-builder.ts
+++ b/src/common/api/filter-builder.ts
@@ -2,33 +2,43 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-export enum FilterField {
-    UUID = "uuid",
-    OWNER_UUID = "owner_uuid"
-}
+import * as _ from "lodash";
+import { Resource } from "./common-resource-service";
 
-export default class FilterBuilder {
+export default class FilterBuilder<T extends Resource = Resource> {
     private filters = "";
 
-    private addCondition(field: FilterField, cond: string, value?: string, prefix: string = "", postfix: string = "") {
+    static create<T extends Resource = Resource>() {
+        return new FilterBuilder<T>();
+    }
+
+    private addCondition(field: keyof T, cond: string, value?: string | string[], prefix: string = "", postfix: string = "") {
         if (value) {
-            this.filters += `["${field}","${cond}","${prefix}${value}${postfix}"]`;
+            value = typeof value === "string"
+                ? `"${prefix}${value}${postfix}"`
+                : `["${value.join(`","`)}"]`;
+
+            this.filters += `["${_.snakeCase(field.toString())}","${cond}",${value}]`;
         }
         return this;
     }
 
-    public addEqual(field: FilterField, value?: string) {
+    public addEqual(field: keyof T, value?: string) {
         return this.addCondition(field, "=", value);
     }
 
-    public addLike(field: FilterField, value?: string) {
+    public addLike(field: keyof T, value?: string) {
         return this.addCondition(field, "like", value, "", "%");
     }
 
-    public addILike(field: FilterField, value?: string) {
+    public addILike(field: keyof T, value?: string) {
         return this.addCondition(field, "ilike", value, "", "%");
     }
 
+    public addIsA(field: keyof T, value?: string | string[]) {
+        return this.addCondition(field, "is_a", value);
+    }
+
     public get() {
         return "[" + this.filters + "]";
     }

diff --git a/src/services/collection-service/collection-service.ts b/src/services/collection-service/collection-service.ts
index bc9128171254eebe3b9a42c5cfad5ea86ec56856..8a1d6932481534966771924a0dadc1f1e7af4cf6 100644 (file)
--- a/src/services/collection-service/collection-service.ts
+++ b/src/services/collection-service/collection-service.ts
@@ -3,7 +3,7 @@
 // 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";
@@ -32,7 +32,7 @@ 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()
             }}).then(resp => {