X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/400481f862c9de54569daabf9de167601dc887bc..a48138fa7227595bba0db267a4c37832cba9afa2:/src/services/collection-service/collection-service-files-response.ts

diff --git a/src/services/collection-service/collection-service-files-response.ts b/src/services/collection-service/collection-service-files-response.ts
index a4b527a2..619a4fc7 100644
--- a/src/services/collection-service/collection-service-files-response.ts
+++ b/src/services/collection-service/collection-service-files-response.ts
@@ -26,7 +26,7 @@ export const sortFilesTree = (tree: Tree<CollectionDirectory | CollectionFile>)
 };
 
 export const extractFilesData = (document: Document) => {
-    const collectionUrlPrefix = /\/c=([0-9a-zA-Z\-]*)/;
+    const collectionUrlPrefix = /\/c=([^\/]*)/;
     return Array
         .from(document.getElementsByTagName('D:response'))
         .slice(1) // omit first element which is collection itself
@@ -46,7 +46,7 @@ export const extractFilesData = (document: Document) => {
                 url,
                 id: [
                     collectionUuid ? collectionUuid : '',
-                    directory ? '/' + directory : '',
+                    directory ? '/' + directory.replace(/^\//, '') : '',
                     '/' + name
                 ].join(''),
                 name,