From fa613cd5fb7968862933c6500e22baa56877f8e9 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 22 May 2023 08:19:49 -0700 Subject: [PATCH] Frontend paginate tasks --- src-ui/messages.xlf | 65 ++++++++++--------- .../manage/tasks/tasks.component.html | 9 ++- .../manage/tasks/tasks.component.ts | 9 ++- 3 files changed, 50 insertions(+), 33 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 7bf6dd6b9..fae98b3c0 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -2767,42 +2767,40 @@ 377 - - Error retrieving suggestions: + + Error retrieving suggestions. src/app/components/document-detail/document-detail.component.ts - 397,399 + 399 Document saved successfully. src/app/components/document-detail/document-detail.component.ts - 509 + 511 src/app/components/document-detail/document-detail.component.ts - 517 + 519 Error saving document src/app/components/document-detail/document-detail.component.ts - 522 + 524 src/app/components/document-detail/document-detail.component.ts - 567 + 569 Confirm delete src/app/components/document-detail/document-detail.component.ts - 596 + 598 src/app/components/manage/management-list/management-list.component.ts @@ -2813,35 +2811,35 @@ Do you really want to delete document ""? src/app/components/document-detail/document-detail.component.ts - 597 + 599 The files for this document will be deleted permanently. This operation cannot be undone. src/app/components/document-detail/document-detail.component.ts - 598 + 600 Delete document src/app/components/document-detail/document-detail.component.ts - 600 + 602 Error deleting document: src/app/components/document-detail/document-detail.component.ts - 620,622 + 622,624 Redo OCR confirm src/app/components/document-detail/document-detail.component.ts - 643 + 645 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -2852,14 +2850,14 @@ This operation will permanently redo OCR for this document. src/app/components/document-detail/document-detail.component.ts - 644 + 646 This operation cannot be undone. src/app/components/document-detail/document-detail.component.ts - 645 + 647 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -2890,7 +2888,7 @@ Proceed src/app/components/document-detail/document-detail.component.ts - 647 + 649 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -2917,7 +2915,7 @@ Redo OCR operation will begin in the background. Close and re-open or reload this document after the operation has completed to see new content. src/app/components/document-detail/document-detail.component.ts - 655 + 657 @@ -2926,7 +2924,7 @@ )"/> src/app/components/document-detail/document-detail.component.ts - 666,668 + 668,670 @@ -4742,7 +4740,7 @@ src/app/components/manage/tasks/tasks.component.ts - 62 + 65 @@ -4752,64 +4750,71 @@ 87 + + {VAR_PLURAL, plural, =1 {One task} other { total tasks}} + + src/app/components/manage/tasks/tasks.component.html + 103 + + Failed  src/app/components/manage/tasks/tasks.component.html - 105 + 110 Complete  src/app/components/manage/tasks/tasks.component.html - 111 + 116 Started  src/app/components/manage/tasks/tasks.component.html - 117 + 122 Queued  src/app/components/manage/tasks/tasks.component.html - 123 + 128 Dismiss selected src/app/components/manage/tasks/tasks.component.ts - 26 + 29 Dismiss all src/app/components/manage/tasks/tasks.component.ts - 27 + 30 src/app/components/manage/tasks/tasks.component.ts - 60 + 63 Confirm Dismiss All src/app/components/manage/tasks/tasks.component.ts - 58 + 61 tasks? src/app/components/manage/tasks/tasks.component.ts - 60 + 63 diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.html b/src-ui/src/app/components/manage/tasks/tasks.component.html index 4ffc5e672..b27275712 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.html +++ b/src-ui/src/app/components/manage/tasks/tasks.component.html @@ -45,7 +45,7 @@ - +
@@ -98,9 +98,14 @@ + +
+
{tasks.length, plural, =1 {One {{this.activeTab}} task} other {{{tasks.length || 0}} total {{this.activeTab}} tasks}}
+ +
-
    +
    • Failed {{tasksService.failedFileTasks.length}} diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.ts b/src-ui/src/app/components/manage/tasks/tasks.component.ts index ab6d3015e..5c89967aa 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.ts +++ b/src-ui/src/app/components/manage/tasks/tasks.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, OnDestroy } from '@angular/core' import { Router } from '@angular/router' -import { NgbModal } from '@ng-bootstrap/ng-bootstrap' +import { NgbModal, NgbNavChangeEvent } from '@ng-bootstrap/ng-bootstrap' import { Subject, first } from 'rxjs' import { PaperlessTask } from 'src/app/data/paperless-task' import { TasksService } from 'src/app/services/tasks.service' @@ -21,6 +21,9 @@ export class TasksComponent private unsubscribeNotifer = new Subject() public expandedTask: number + public pageSize: number = 25 + public page: number = 1 + get dismissButtonText(): string { return this.selectedTasks.size > 0 ? $localize`Dismiss selected` @@ -119,4 +122,8 @@ export class TasksComponent clearSelection() { this.selectedTasks.clear() } + + duringTabChange(navID: number) { + this.page = 1 + } }