paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-07-28 18:24:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update frontend for reworked tasks api endpoint

Browse Source
This commit is contained in:
Michael Shamoon
2022-05-23 15:38:53 -07:00
parent 0a06c291e2
commit aa999b34e2
4 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src-ui/src/app/components/manage/tasks/tasks.component.html
View File

@@ -18,7 +18,7 @@
</div>
</app-page-header>
<ng-container *ngIf="!tasksService.completed && tasksService.loading">
<ng-container *ngIf="!tasksService.completedFileTasks && tasksService.loading">
<div class="spinner-border spinner-border-sm fw-normal ms-2 me-auto" role="status"></div>
<div class="visually-hidden" i18n>Loading...</div>
</ng-container>
@@ -62,21 +62,21 @@
<ul ngbNav #nav="ngbNav" [(activeId)]="activeTab" class="nav-tabs">
<li ngbNavItem="incomplete">
<a ngbNavLink i18n>Incomplete&nbsp;<span class="badge bg-secondary ms-1">{{tasksService.incomplete.length}}</span></a>
<a ngbNavLink i18n>Incomplete&nbsp;<span class="badge bg-secondary ms-1">{{tasksService.incompleteFileTasks.length}}</span></a>
<ng-template ngbNavContent>
<ng-container [ngTemplateOutlet]="tasksTemplate" [ngTemplateOutletContext]="{tasks:tasksService.incomplete}"></ng-container>
<ng-container [ngTemplateOutlet]="tasksTemplate" [ngTemplateOutletContext]="{tasks:tasksService.incompleteFileTasks}"></ng-container>
</ng-template>
</li>
<li ngbNavItem="completed">
<a ngbNavLink i18n>Completed&nbsp;<span class="badge bg-secondary ms-1">{{tasksService.completed.length}}</span></a>
<a ngbNavLink i18n>Completed&nbsp;<span class="badge bg-secondary ms-1">{{tasksService.completedFileTasks.length}}</span></a>
<ng-template ngbNavContent>
<ng-container [ngTemplateOutlet]="tasksTemplate" [ngTemplateOutletContext]="{tasks:tasksService.completed}"></ng-container>
<ng-container [ngTemplateOutlet]="tasksTemplate" [ngTemplateOutletContext]="{tasks:tasksService.completedFileTasks}"></ng-container>
</ng-template>
</li>
<li ngbNavItem="failed">
<a ngbNavLink i18n>Failed&nbsp;<span class="badge bg-secondary ms-1">{{tasksService.failed.length}}</span></a>
<a ngbNavLink i18n>Failed&nbsp;<span class="badge bg-secondary ms-1">{{tasksService.failedFileTasks.length}}</span></a>
<ng-template ngbNavContent>
<ng-container [ngTemplateOutlet]="tasksTemplate" [ngTemplateOutletContext]="{tasks:tasksService.failed}"></ng-container>
<ng-container [ngTemplateOutlet]="tasksTemplate" [ngTemplateOutletContext]="{tasks:tasksService.failedFileTasks}"></ng-container>
</ng-template>
</li>
</ul>

13
src-ui/src/app/components/manage/tasks/tasks.component.ts
View File

@@ -34,9 +34,10 @@ export class TasksComponent implements OnInit, OnDestroy {
}
dismissTasks(task: PaperlessTask = undefined) {
this.tasksService.dismissTasks(
task ? new Set([task.id]) : this.selectedTasks
)
let tasks = task ? new Set([task.id]) : this.selectedTasks
if (this.selectedTasks.size == 0)
tasks = new Set(this.currentTasks.map((t) => t.id))
this.tasksService.dismissTasks(tasks)
}
toggleSelected(task: PaperlessTask) {
@@ -49,13 +50,13 @@ export class TasksComponent implements OnInit, OnDestroy {
let tasks: PaperlessTask[]
switch (this.activeTab) {
case 'incomplete':
tasks = this.tasksService.incomplete
tasks = this.tasksService.incompleteFileTasks
break
case 'completed':
tasks = this.tasksService.completed
tasks = this.tasksService.completedFileTasks
break
case 'failed':
tasks = this.tasksService.failed
tasks = this.tasksService.failedFileTasks
break
default:
break