merge conflicts

[arvados-workbench2.git] / src / common / api / common-resource-service.ts

diff --git a/src/common/api/common-resource-service.ts b/src/common/api/common-resource-service.ts
index e49d2a0b2dfb1b865496ed3ff9acc70727ad1a4d..3956fb7390983824a402456abc2144850b85cda2 100644 (file)
--- a/src/common/api/common-resource-service.ts
+++ b/src/common/api/common-resource-service.ts
@@ -3,25 +3,14 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as _ from "lodash";
-import FilterBuilder from "./filter-builder";
-import OrderBuilder from "./order-builder";
-import { AxiosInstance } from "axios";
-
-export interface Resource {
-    uuid: string;
-    ownerUuid: string;
-    createdAt: string;
-    modifiedByClientUuid: string;
-    modifiedByUserUuid: string;
-    modifiedAt: string;
-    href: string;
-    kind: string;
-    etag: string;
-}
+import { FilterBuilder } from "./filter-builder";
+import { OrderBuilder } from "./order-builder";
+import { AxiosInstance, AxiosPromise } from "axios";
+import { Resource } from "../../models/resource";
 
 export interface ListArguments {
-    limit: number;
-    offset: number;
+    limit?: number;
+    offset?: number;
     filters?: FilterBuilder;
     order?: OrderBuilder;
     select?: string[];
@@ -37,10 +26,12 @@ export interface ListResults<T> {
     itemsAvailable: number;
 }
 
-export default class CommonResourceService<T extends Resource> {
+export interface Errors {
+    errors: string[];
+    errorToken: string;
+}
 
-    serverApi: AxiosInstance;
-    resourceType: string;
+export class CommonResourceService<T extends Resource> {
 
     static mapResponseKeys = (response: any): Promise<any> =>
         CommonResourceService.mapKeys(_.camelCase)(response.data)
@@ -63,44 +54,54 @@ export default class CommonResourceService<T extends Resource> {
             }
         }
 
+    static defaultResponse<R>(promise: AxiosPromise<R>): Promise<R> {
+        return promise
+            .then(CommonResourceService.mapResponseKeys)
+            .catch(({ response }) => Promise.reject<Errors>(CommonResourceService.mapResponseKeys(response)));
+    }
+
+    protected serverApi: AxiosInstance;
+    protected resourceType: string;
+
     constructor(serverApi: AxiosInstance, resourceType: string) {
         this.serverApi = serverApi;
-        this.resourceType = "/" + resourceType;
+        this.resourceType = '/' + resourceType + '/';
     }
 
-    create() {
-        throw new Error("Not implemented");
+    create(data: Partial<T>) {
+        return CommonResourceService.defaultResponse(
+            this.serverApi
+                .post<T>(this.resourceType, CommonResourceService.mapKeys(_.snakeCase)(data)));
     }
 
     delete(uuid: string): Promise<T> {
-        return this.serverApi
-            .delete(this.resourceType + "/" + uuid)
-            .then(CommonResourceService.mapResponseKeys);
+        return CommonResourceService.defaultResponse(
+            this.serverApi
+                .delete(this.resourceType + uuid));
     }
 
     get(uuid: string) {
-        return this.serverApi
-            .get<T>(this.resourceType + "/" + uuid)
-            .then(CommonResourceService.mapResponseKeys);
+        return CommonResourceService.defaultResponse(
+            this.serverApi
+                .get<T>(this.resourceType + uuid));
     }
 
-    list(args: ListArguments): Promise<ListResults<T>> {
+    list(args: ListArguments = {}): Promise<ListResults<T>> {
         const { filters, order, ...other } = args;
         const params = {
             ...other,
-            filters: filters ? filters.get() : undefined,
-            order: order ? order.get() : undefined
+            filters: filters ? filters.serialize() : undefined,
+            order: order ? order.getOrder() : undefined
         };
-        return this.serverApi
-            .get(this.resourceType, {
-                params: CommonResourceService.mapKeys(_.snakeCase)(params)
-            })
-            .then(CommonResourceService.mapResponseKeys);
+        return CommonResourceService.defaultResponse(
+            this.serverApi
+                .get(this.resourceType, {
+                    params: CommonResourceService.mapKeys(_.snakeCase)(params)
+                }));
     }
 
     update(uuid: string) {
         throw new Error("Not implemented");
     }
-
 }