[ARVADOS-WORKBENCH2] updated: 1.2.0-118-g57a762c

[Git user]

Summary of changes:
 src/services/collection-service/collection-service.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

       via  57a762c6148cfee04635bdb06627b92e65ff3348 (commit)
       via  fdc1e3360333480c1325e69f59156e2c0ab4fe30 (commit)
      from  8583d365a7b7fb2d58fc486cbbfbf0ec952a8498 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 57a762c6148cfee04635bdb06627b92e65ff3348
Merge: 8583d36 fdc1e33
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Tue Aug 21 16:23:46 2018 +0200

    Merge branch '13898-fix-bad-url-in-collecions-service'
    
    refs #13898
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>


commit fdc1e3360333480c1325e69f59156e2c0ab4fe30
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Tue Aug 21 16:22:42 2018 +0200

    Remove unnecesary slashes from urls
    
    Feature #13898
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/services/collection-service/collection-service.ts b/src/services/collection-service/collection-service.ts
index 1c62ec5..c0d61bd 100644
--- a/src/services/collection-service/collection-service.ts
+++ b/src/services/collection-service/collection-service.ts
@@ -20,7 +20,7 @@ export class CollectionService extends CommonResourceService<CollectionResource>
     }
 
     async files(uuid: string) {
-        const request = await this.webdavClient.propfind(`/c=${uuid}`);
+        const request = await this.webdavClient.propfind(`c=${uuid}`);
         if (request.responseXML != null) {
             const filesTree = parseFilesResponse(request.responseXML);
             return mapTreeValues(this.extendFileURL)(filesTree);
@@ -30,7 +30,7 @@ export class CollectionService extends CommonResourceService<CollectionResource>
 
     async deleteFiles(collectionUuid: string, filePaths: string[]) {
         for (const path of filePaths) {
-            await this.webdavClient.delete(`/c=${collectionUuid}${path}`);
+            await this.webdavClient.delete(`c=${collectionUuid}${path}`);
         }
     }
 
@@ -43,8 +43,8 @@ export class CollectionService extends CommonResourceService<CollectionResource>
 
     moveFile(collectionUuid: string, oldPath: string, newPath: string) {
         return this.webdavClient.move(
-            `/c=${collectionUuid}${oldPath}`,
-            `/c=${collectionUuid}${encodeURI(newPath)}`
+            `c=${collectionUuid}${oldPath}`,
+            `c=${collectionUuid}${encodeURI(newPath)}`
         );
     }
 
@@ -54,7 +54,7 @@ export class CollectionService extends CommonResourceService<CollectionResource>
     })
 
     private async uploadFile(collectionUuid: string, file: File, fileId: number, onProgress: UploadProgress = () => { return; }) {
-        const fileURL = `/c=${collectionUuid}/${file.name}`;
+        const fileURL = `c=${collectionUuid}/${file.name}`;
         const fileContent = await fileToArrayBuffer(file);
         const requestConfig = {
             headers: {

-----------------------------------------------------------------------


hooks/post-receive
--