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 39825c0e3eb8ae661212161325f7673df7cb095b..3956fb7390983824a402456abc2144850b85cda2 100644 (file)
--- a/src/common/api/common-resource-service.ts
+++ b/src/common/api/common-resource-service.ts
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as _ from "lodash";
-import FilterBuilder from "./filter-builder";
-import OrderBuilder from "./order-builder";
+import { FilterBuilder } from "./filter-builder";
+import { OrderBuilder } from "./order-builder";
 import { AxiosInstance, AxiosPromise } from "axios";
 import { Resource } from "../../models/resource";
 
@@ -31,7 +31,7 @@ export interface Errors {
     errorToken: string;
 }
 
-export default class CommonResourceService<T extends Resource> {
+export class CommonResourceService<T extends Resource> {
 
     static mapResponseKeys = (response: any): Promise<any> =>
         CommonResourceService.mapKeys(_.camelCase)(response.data)
@@ -103,6 +103,5 @@ export default class CommonResourceService<T extends Resource> {
     update(uuid: string) {
         throw new Error("Not implemented");
     }
-
 }