Revert "Merge branch 'feature-frontend-task-queue' of github.com:paperless-ngx/paperless-ngx into feature-frontend-task-queue"

This reverts commit 011164bc32, reversing
changes made to 0a43ce9ced.

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

@@ -1,16 +1,13 @@
 import { HttpClient } from '@angular/common/http'
 import { Injectable } from '@angular/core'
-import { Observable } from 'rxjs'
 import { first, map } from 'rxjs/operators'
-import { PaperlessTask } from 'src/app/data/paperless-task'
+import {
+  PaperlessTask,
+  PaperlessTaskStatus,
+  PaperlessTaskType,
+} from 'src/app/data/paperless-task'
 import { environment } from 'src/environments/environment'
 
-interface TasksAPIResponse {
-  incomplete: Array<PaperlessTask>
-  completed: Array<PaperlessTask>
-  failed: Array<PaperlessTask>
-}
-
 @Injectable({
   providedIn: 'root',
 })
@@ -19,19 +16,26 @@ export class TasksService {
 
   loading: boolean
 
-  private incompleteTasks: PaperlessTask[] = []
-  public get incomplete(): PaperlessTask[] {
-    return this.incompleteTasks
+  private fileTasks: PaperlessTask[] = []
+
+  public get total(): number {
+    return this.fileTasks?.length
   }
 
-  private completedTasks: PaperlessTask[] = []
-  public get completed(): PaperlessTask[] {
-    return this.completedTasks
+  public get incompleteFileTasks(): PaperlessTask[] {
+    return this.fileTasks.filter(
+      (t) => t.status == PaperlessTaskStatus.Incomplete
+    )
   }
 
-  private failedTasks: PaperlessTask[] = []
-  public get failed(): PaperlessTask[] {
-    return this.failedTasks
+  public get completedFileTasks(): PaperlessTask[] {
+    return this.fileTasks.filter(
+      (t) => t.status == PaperlessTaskStatus.Complete
+    )
+  }
+
+  public get failedFileTasks(): PaperlessTask[] {
+    return this.fileTasks.filter((t) => t.status == PaperlessTaskStatus.Failed)
   }
 
   constructor(private http: HttpClient) {}
@@ -40,46 +44,23 @@ export class TasksService {
     this.loading = true
 
     this.http
-      .get<TasksAPIResponse>(`${this.baseUrl}consumption_tasks/`)
+      .get<PaperlessTask[]>(`${this.baseUrl}tasks/`)
       .pipe(first())
       .subscribe((r) => {
-        this.incompleteTasks = r.incomplete
-        this.completedTasks = r.completed
-        this.failedTasks = r.failed
+        this.fileTasks = r.filter((t) => t.type == PaperlessTaskType.File) // they're all File tasks, for now
         this.loading = false
         return true
       })
   }
 
-  // private savedViews: PaperlessSavedView[] = []
-
-  // get allViews() {
-  //   return this.savedViews
-  // }
-
-  // get sidebarViews() {
-  //   return this.savedViews.filter((v) => v.show_in_sidebar)
-  // }
-
-  // get dashboardViews() {
-  //   return this.savedViews.filter((v) => v.show_on_dashboard)
-  // }
-
-  // create(o: PaperlessSavedView) {
-  //   return super.create(o).pipe(tap(() => this.reload()))
-  // }
-
-  // update(o: PaperlessSavedView) {
-  //   return super.update(o).pipe(tap(() => this.reload()))
-  // }
-
-  // patchMany(objects: PaperlessSavedView[]): Observable<PaperlessSavedView[]> {
-  //   return combineLatest(objects.map((o) => super.patch(o))).pipe(
-  //     tap(() => this.reload())
-  //   )
-  // }
-
-  // delete(o: PaperlessSavedView) {
-  //   return super.delete(o).pipe(tap(() => this.reload()))
-  // }
+  public dismissTasks(task_ids: Set<number>) {
+    this.http
+      .post(`${this.baseUrl}acknowledge_tasks/`, {
+        tasks: [...task_ids],
+      })
+      .pipe(first())
+      .subscribe((r) => {
+        this.reload()
+      })
+  }
 }