Merge branch 'master' into 13865-repositories

[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 eb48e9dcb02a5e504ee061e9aa66c3854ed636a8..b0d5cb1445db854e8d88d43e10c95a6b59e80569 100644 (file)
--- a/src/services/collection-service/collection-service.ts
+++ b/src/services/collection-service/collection-service.ts
@@ -50,14 +50,18 @@ export class CollectionService extends TrashableResourceService<CollectionResour
         );
     }
 
-    private extendFileURL = (file: CollectionDirectory | CollectionFile) => ({
-        ...file,
-        url: this.webdavClient.defaults.baseURL + file.url + '?api_token=' + this.authService.getApiToken()
-    })
+    private extendFileURL = (file: CollectionDirectory | CollectionFile) => {
+        const baseUrl = this.webdavClient.defaults.baseURL.endsWith('/')
+            ? this.webdavClient.defaults.baseURL.slice(0, -1)
+            : this.webdavClient.defaults.baseURL;
+        return {
+            ...file,
+            url: baseUrl + file.url + '?api_token=' + this.authService.getApiToken()
+        };
+    }
 
     private async uploadFile(collectionUuid: string, file: File, fileId: number, onProgress: UploadProgress = () => { return; }) {
         const fileURL = `c=${collectionUuid}/${file.name}`;
-        const fileContent = await fileToArrayBuffer(file);
         const requestConfig = {
             headers: {
                 'Content-Type': 'text/octet-stream'
@@ -66,27 +70,23 @@ export class CollectionService extends TrashableResourceService<CollectionResour
                 onProgress(fileId, e.loaded, e.total, Date.now());
             }
         };
-        return this.webdavClient.put(fileURL, fileContent, requestConfig);
-
+        return this.webdavClient.upload(fileURL, '', [file], requestConfig);
     }
 
-    // ToDo: add get method
-
     update(uuid: string, data: Partial<CollectionResource>) {
-        if (uuid && data) {
+        if (uuid && data && data.properties) {
             const { properties } = data;
-            if (properties) {
-                const mappedData = {
-                    ...TrashableResourceService.mapKeys(snakeCase)(data),
-                    properties,
-                };
-                return TrashableResourceService
-                    .defaultResponse(
-                        this.serverApi
-                            .put<CollectionResource>(this.resourceType + uuid, mappedData),
-                        this.actions
-                    );
-            }
+            const mappedData = {
+                ...TrashableResourceService.mapKeys(snakeCase)(data),
+                properties,
+            };
+            return TrashableResourceService
+                .defaultResponse(
+                    this.serverApi
+                        .put<CollectionResource>(this.resourceType + uuid, mappedData),
+                    this.actions,
+                    false
+                );
         }
         return TrashableResourceService
             .defaultResponse(