projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16812: Cleared token code
[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 6eb9b5ba664f15892d570206051a93803050987b..0aa0aa84de4f476866c60cccb68b5dc2acc9bcb9 100644
(file)
--- a/
src/services/collection-service/collection-service.ts
+++ b/
src/services/collection-service/collection-service.ts
@@
-15,7
+15,16
@@
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) {
export class CollectionService extends TrashableResourceService<CollectionResource> {
constructor(serverApi: AxiosInstance, private webdavClient: WebDAV, private authService: AuthService, actions: ApiActions) {
- super(serverApi, "collections", actions);
+ super(serverApi, "collections", actions, [
+ 'fileCount',
+ 'fileSizeTotal',
+ 'replicationConfirmed',
+ 'replicationConfirmedAt',
+ 'storageClassesConfirmed',
+ 'storageClassesConfirmedAt',
+ 'unsignedManifestText',
+ 'version',
+ ]);
}
async files(uuid: string) {
}
async files(uuid: string) {
@@
-56,10
+65,10
@@
export class CollectionService extends TrashableResourceService<CollectionResour
? this.webdavClient.defaults.baseURL.slice(0, -1)
: this.webdavClient.defaults.baseURL;
const apiToken = this.authService.getApiToken();
? this.webdavClient.defaults.baseURL.slice(0, -1)
: this.webdavClient.defaults.baseURL;
const apiToken = this.authService.getApiToken();
- const
splittedApiToken = apiToken ? apiToken.split('/') : []
;
- const userApiToken = `/t=${
splittedApiToken[2]
}/`;
+ const
encodedApiToken = apiToken ? encodeURI(apiToken) : ''
;
+ const userApiToken = `/t=${
encodedApiToken
}/`;
const splittedPrevFileUrl = file.url.split('/');
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
return {
...file,
url