Get all tasks, update these tests first

src-ui/src/app/services/tasks.service.spec.ts

@@ -5,7 +5,11 @@ import {
 } from '@angular/common/http/testing'
 import { TestBed } from '@angular/core/testing'
 import { environment } from 'src/environments/environment'
-import { PaperlessTaskStatus, PaperlessTaskType } from '../data/paperless-task'
+import {
+  PaperlessTaskStatus,
+  PaperlessTaskTriggerSource,
+  PaperlessTaskType,
+} from '../data/paperless-task'
 import { TasksService } from './tasks.service'
 
 describe('TasksService', () => {
@@ -33,7 +37,7 @@ describe('TasksService', () => {
   it('calls tasks api endpoint on reload', () => {
     tasksService.reload()
     const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}tasks/?task_type=consume_file&acknowledged=false`
+      `${environment.apiBaseUrl}tasks/?acknowledged=false`
     )
     expect(req.request.method).toEqual('GET')
   })
@@ -42,7 +46,7 @@ describe('TasksService', () => {
     tasksService.loading = true
     tasksService.reload()
     httpTestingController.expectNone(
-      `${environment.apiBaseUrl}tasks/?task_type=consume_file&acknowledged=false`
+      `${environment.apiBaseUrl}tasks/?acknowledged=false`
     )
   })
 
@@ -58,17 +62,16 @@ describe('TasksService', () => {
     req.flush([])
     // reload is then called
     httpTestingController
-      .expectOne(
-        `${environment.apiBaseUrl}tasks/?task_type=consume_file&acknowledged=false`
-      )
+      .expectOne(`${environment.apiBaseUrl}tasks/?acknowledged=false`)
       .flush([])
   })
 
-  it('sorts tasks returned from api', () => {
+  it('groups mixed task types by status when reloading', () => {
     expect(tasksService.total).toEqual(0)
     const mockTasks = [
       {
         task_type: PaperlessTaskType.ConsumeFile,
+        trigger_source: PaperlessTaskTriggerSource.FolderConsume,
         status: PaperlessTaskStatus.Success,
         acknowledged: false,
         task_id: '1234',
@@ -77,38 +80,42 @@ describe('TasksService', () => {
         related_document_ids: [],
       },
       {
-        task_type: PaperlessTaskType.ConsumeFile,
+        task_type: PaperlessTaskType.SanityCheck,
+        trigger_source: PaperlessTaskTriggerSource.System,
         status: PaperlessTaskStatus.Failure,
         acknowledged: false,
         task_id: '1235',
-        input_data: { filename: 'file2.pdf' },
+        input_data: {},
         date_created: new Date(),
         related_document_ids: [],
       },
       {
-        task_type: PaperlessTaskType.ConsumeFile,
+        task_type: PaperlessTaskType.MailFetch,
+        trigger_source: PaperlessTaskTriggerSource.Scheduled,
         status: PaperlessTaskStatus.Pending,
         acknowledged: false,
         task_id: '1236',
-        input_data: { filename: 'file3.pdf' },
+        input_data: {},
         date_created: new Date(),
         related_document_ids: [],
       },
       {
-        task_type: PaperlessTaskType.ConsumeFile,
+        task_type: PaperlessTaskType.LlmIndex,
+        trigger_source: PaperlessTaskTriggerSource.WebUI,
         status: PaperlessTaskStatus.Started,
         acknowledged: false,
         task_id: '1237',
-        input_data: { filename: 'file4.pdf' },
+        input_data: {},
         date_created: new Date(),
         related_document_ids: [],
       },
       {
-        task_type: PaperlessTaskType.ConsumeFile,
+        task_type: PaperlessTaskType.EmptyTrash,
+        trigger_source: PaperlessTaskTriggerSource.Manual,
         status: PaperlessTaskStatus.Success,
         acknowledged: false,
         task_id: '1238',
-        input_data: { filename: 'file5.pdf' },
+        input_data: {},
         date_created: new Date(),
         related_document_ids: [],
       },
@@ -117,7 +124,7 @@ describe('TasksService', () => {
     tasksService.reload()
 
     const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}tasks/?task_type=consume_file&acknowledged=false`
+      `${environment.apiBaseUrl}tasks/?acknowledged=false`
     )
 
     req.flush(mockTasks)

src-ui/src/app/services/tasks.service.ts

@@ -62,7 +62,7 @@ export class TasksService {
 
     this.http
       .get<PaperlessTask[]>(
-        `${this.baseUrl}${this.endpoint}/?task_type=${PaperlessTaskType.ConsumeFile}&acknowledged=false`
+        `${this.baseUrl}${this.endpoint}/?acknowledged=false`
       )
       .pipe(takeUntil(this.unsubscribeNotifer), first())
       .subscribe((r) => {