Fixed downloads not sorting properly

Confirm dialog can now be a selection list
This commit is contained in:
Isaac Abadi
2022-05-21 21:26:25 -04:00
parent 71d5a64272
commit bf64d97b72
6 changed files with 89 additions and 27 deletions

View File

@@ -61,7 +61,7 @@ export class DownloadsComponent implements OnInit, OnDestroy {
3: $localize`Complete`
}
displayedColumns: string[] = ['date', 'title', 'stage', 'subscription', 'progress', 'actions'];
displayedColumns: string[] = ['timestamp_start', 'title', 'step_index', 'sub_name', 'percent_complete', 'actions'];
dataSource = null; // new MatTableDataSource<Download>();
downloads_retrieved = false;
@@ -104,7 +104,6 @@ export class DownloadsComponent implements OnInit, OnDestroy {
getCurrentDownloads(): void {
this.postsService.getCurrentDownloads(this.uids).subscribe(res => {
this.downloads_retrieved = true;
if (res['downloads'] !== null
&& res['downloads'] !== undefined
&& JSON.stringify(this.downloads) !== JSON.stringify(res['downloads'])) {
@@ -114,12 +113,12 @@ export class DownloadsComponent implements OnInit, OnDestroy {
this.dataSource = new MatTableDataSource<Download>(this.downloads);
this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
this.paused_download_exists = this.downloads.find(download => download['paused'] && !download['error']);
this.running_download_exists = this.downloads.find(download => !download['paused'] && !download['finished']);
} else {
// failed to get downloads
}
this.downloads_retrieved = true;
});
}
@@ -134,7 +133,7 @@ export class DownloadsComponent implements OnInit, OnDestroy {
});
dialogRef.afterClosed().subscribe(confirmed => {
if (confirmed) {
this.postsService.clearFinishedDownloads().subscribe(res => {
this.postsService.clearDownloads(true, false, false).subscribe(res => {
if (!res['success']) {
this.postsService.openSnackBar('Failed to clear finished downloads!');
}
@@ -143,6 +142,47 @@ export class DownloadsComponent implements OnInit, OnDestroy {
});
}
clearDownloadsByType(): void {
const clearEmitter = new EventEmitter<boolean>();
const dialogRef = this.dialog.open(ConfirmDialogComponent, {
data: {
dialogType: 'selection_list',
dialogTitle: $localize`Clear downloads`,
dialogText: $localize`Select downloads to clear`,
submitText: $localize`Clear`,
doneEmitter: clearEmitter,
warnSubmitColor: true,
list: [
{
title: $localize`Finished downloads`,
key: 'clear_finished'
},
{
title: $localize`Paused downloads`,
key: 'clear_paused'
},
{
title: $localize`Errored downloads`,
key: 'clear_errors'
}
]
}
});
clearEmitter.subscribe((done: boolean) => {
if (done) {
const selected_items = dialogRef.componentInstance.selected_items;
this.postsService.clearDownloads(selected_items.includes('clear_finished'), selected_items.includes('clear_paused'), selected_items.includes('clear_errors')).subscribe(res => {
if (!res['success']) {
this.postsService.openSnackBar($localize`Failed to clear finished downloads!`);
} else {
this.postsService.openSnackBar($localize`Cleared downloads!`);
dialogRef.close();
}
});
}
});
}
pauseDownload(download_uid: string): void {
this.postsService.pauseDownload(download_uid).subscribe(res => {
if (!res['success']) {