projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18169-cancel-button-not-working' into main
[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 9fd8a13511ff850b26f9a40af01336616c2340e2..48e797c500e8b7e3dade9fc15727773176805773 100644
(file)
--- a/
src/services/collection-service/collection-service.ts
+++ b/
src/services/collection-service/collection-service.ts
@@
-2,15
+2,15
@@
//
// SPDX-License-Identifier: AGPL-3.0
//
// SPDX-License-Identifier: AGPL-3.0
-import { CollectionResource } from "
~/
models/collection";
+import { CollectionResource } from "models/collection";
import { AxiosInstance } from "axios";
import { AxiosInstance } from "axios";
-import { CollectionFile, CollectionDirectory } from "
~/
models/collection-file";
-import { WebDAV } from "
~/
common/webdav";
+import { CollectionFile, CollectionDirectory } from "models/collection-file";
+import { WebDAV } from "common/webdav";
import { AuthService } from "../auth-service/auth-service";
import { extractFilesData } from "./collection-service-files-response";
import { AuthService } from "../auth-service/auth-service";
import { extractFilesData } from "./collection-service-files-response";
-import { TrashableResourceService } from "
~/
services/common-service/trashable-resource-service";
-import { ApiActions } from "
~/
services/api/api-actions";
-import { customEncodeURI } from "
~/
common/url";
+import { TrashableResourceService } from "services/common-service/trashable-resource-service";
+import { ApiActions } from "services/api/api-actions";
+import { customEncodeURI } from "common/url";
export type UploadProgress = (fileId: number, loaded: number, total: number, currentTime: number) => void;
export type UploadProgress = (fileId: number, loaded: number, total: number, currentTime: number) => void;
@@
-33,7
+33,8
@@
export class CollectionService extends TrashableResourceService<CollectionResour
}
update(uuid: string, data: Partial<CollectionResource>) {
}
update(uuid: string, data: Partial<CollectionResource>) {
- return super.update(uuid, { ...data, preserveVersion: true });
+ const select = [...Object.keys(data), 'version', 'modifiedAt'];
+ return super.update(uuid, { ...data, preserveVersion: true }, select);
}
async files(uuid: string) {
}
async files(uuid: string) {
@@
-107,7
+108,7
@@
export class CollectionService extends TrashableResourceService<CollectionResour
},
onUploadProgress: (e: ProgressEvent) => {
onProgress(fileId, e.loaded, e.total, Date.now());
},
onUploadProgress: (e: ProgressEvent) => {
onProgress(fileId, e.loaded, e.total, Date.now());
- }
+ }
,
};
return this.webdavClient.upload(fileURL, [file], requestConfig);
}
};
return this.webdavClient.upload(fileURL, [file], requestConfig);
}