Merge branch '15610-large-collection-perf-fix'

[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 f7955fbae1dbc21feb55be34e64cc8cbd7673c91..90441a645f49d92d622fb0dd689fdaee9604bc51 100644 (file)
--- a/src/services/collection-service/collection-service.ts
+++ b/src/services/collection-service/collection-service.ts
@@ -16,9 +16,14 @@ export type UploadProgress = (fileId: number, loaded: number, total: number, cur
 export class CollectionService extends TrashableResourceService<CollectionResource> {
     constructor(serverApi: AxiosInstance, private webdavClient: WebDAV, private authService: AuthService, actions: ApiActions) {
         super(serverApi, "collections", actions, [
-            'unsignedManifestText',
+            'fileCount',
+            'fileSizeTotal',
+            'replicationConfirmed',
+            'replicationConfirmedAt',
             'storageClassesConfirmed',
-            'storageClassesConfirmedAt'
+            'storageClassesConfirmedAt',
+            'unsignedManifestText',
+            'version',
         ]);
     }
 
@@ -63,7 +68,7 @@ export class CollectionService extends TrashableResourceService<CollectionResour
         const splittedApiToken = apiToken ? apiToken.split('/') : [];
         const userApiToken = `/t=${splittedApiToken[2]}/`;
         const splittedPrevFileUrl = file.url.split('/');
-        const url = `${baseUrl}/${splittedPrevFileUrl[1]}${userApiToken}${splittedPrevFileUrl[2]}`;
+        const url = `${baseUrl}/${splittedPrevFileUrl[1]}${userApiToken}${splittedPrevFileUrl.slice(2).join('/')}`;
         return {
             ...file,
             url