From b0462bb88a89a78a8ed2b161d8dd7562d9ca28fa Mon Sep 17 00:00:00 2001 From: Michal Klobukowski Date: Mon, 13 Aug 2018 14:03:57 +0200 Subject: [PATCH] Name hardcoded values Feature #13990 Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski --- src/services/collection-service/collection-service.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/services/collection-service/collection-service.ts b/src/services/collection-service/collection-service.ts index 4bb93a4a62..8cf515c978 100644 --- a/src/services/collection-service/collection-service.ts +++ b/src/services/collection-service/collection-service.ts @@ -47,6 +47,7 @@ export class CollectionService extends CommonResourceService } extractFilesData(document: Document) { + const collectionUrlPrefix = /\/c=[0-9a-zA-Z\-]*/; return Array .from(document.getElementsByTagName('D:response')) .slice(1) // omit first element which is collection itself @@ -54,7 +55,10 @@ export class CollectionService extends CommonResourceService const name = getTagValue(element, 'D:displayname', ''); const size = parseInt(getTagValue(element, 'D:getcontentlength', '0'), 10); const pathname = getTagValue(element, 'D:href', ''); - const directory = pathname && pathname.replace(/\/c=[0-9a-zA-Z\-]*/, '').replace(`/${name || ''}`, ''); + const nameSuffix = `/${name || ''}`; + const directory = pathname + .replace(collectionUrlPrefix, '') + .replace(nameSuffix, ''); const href = this.webdavClient.defaults.baseURL + pathname + '?api_token=' + this.authService.getApiToken(); const data = { -- 2.30.2