inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-4838] Upload Dialog - canceling a pending file cancels the file in progress (#5063)

Browse Source 
* add automation id

* call cancel upload api only if file is not pending

* tests

* e2e
This commit is contained in:
Cilibiu Bogdan
2019-09-09 13:23:07 +03:00
committed by Eugenio Romano
parent 4de00fd6ca
commit 5b9f37d01f
4 changed files with 70 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/content-services/upload/components/file-uploading-list.component.ts
View File

@@ -65,7 +65,11 @@ export class FileUploadingListComponent {
* @memberOf FileUploadingListComponent
*/
cancelFile(file: FileModel): void {
this.uploadService.cancelUpload(file);
if (file.status === FileUploadStatus.Pending) {
file.status = FileUploadStatus.Cancelled;
} else {
this.uploadService.cancelUpload(file);
}
}
/**
@@ -161,8 +165,9 @@ export class FileUploadingListComponent {
this.files
.filter(
(item) =>
item.data.entry.id === file.data.entry.id &&
item.options.newVersion
item.options.newVersion &&
item.data.entry.id === file.data.entry.id
)
.map((item) => {
item.status = FileUploadStatus.Deleted;