From c289439cab255b23ca284d9b44c611eee843cde8 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Tue, 27 Sep 2022 17:56:04 -0700
Subject: [PATCH] Fix tab ids & date parsing

---
 .../app/components/manage/tasks/tasks.component.html   |  2 +-
 .../src/app/components/manage/tasks/tasks.component.ts | 10 +++++-----
 src-ui/src/app/data/paperless-task.ts                  |  2 +-
 src-ui/src/app/services/tasks.service.ts               |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

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 91dad4ec8..e12c1651a 100644
--- a/src-ui/src/app/components/manage/tasks/tasks.component.html
+++ b/src-ui/src/app/components/manage/tasks/tasks.component.html
@@ -54,7 +54,7 @@
           </div>
         </th>
         <td class="overflow-auto">{{ task.name }}</td>
-        <td class="d-none d-lg-table-cell">{{ task.created | customDate:'short' }}</td>
+        <td class="d-none d-lg-table-cell">{{ task.date_created | customDate:'short' }}</td>
         <td class="d-none d-lg-table-cell" *ngIf="activeTab != 'started' && activeTab != 'queued'">
           <div *ngIf="task.result.length > 50" class="result" (click)="expandTask(task); $event.stopPropagation();"
             [ngbPopover]="resultPopover" popoverClass="shadow small mobile" triggers="mouseenter:mouseleave" container="body">
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 791e41c3e..1f896e07e 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 { NgbModal } from '@ng-bootstrap/ng-bootstrap'
-import { takeUntil, Subject, first } from 'rxjs'
+import { Subject, first } from 'rxjs'
 import { PaperlessTask } from 'src/app/data/paperless-task'
 import { TasksService } from 'src/app/services/tasks.service'
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
@@ -77,16 +77,16 @@ export class TasksComponent implements OnInit, OnDestroy {
   get currentTasks(): PaperlessTask[] {
     let tasks: PaperlessTask[]
     switch (this.activeTab) {
-      case 'PENDING':
+      case 'queued':
         tasks = this.tasksService.queuedFileTasks
         break
-      case 'STARTED':
+      case 'started':
         tasks = this.tasksService.startedFileTasks
         break
-      case 'SUCCESS':
+      case 'completed':
         tasks = this.tasksService.completedFileTasks
         break
-      case 'FAILURE':
+      case 'failed':
         tasks = this.tasksService.failedFileTasks
         break
       default:
diff --git a/src-ui/src/app/data/paperless-task.ts b/src-ui/src/app/data/paperless-task.ts
index 12928aaa1..f2259080e 100644
--- a/src-ui/src/app/data/paperless-task.ts
+++ b/src-ui/src/app/data/paperless-task.ts
@@ -23,7 +23,7 @@ export interface PaperlessTask extends ObjectWithId {
 
   name: string
 
-  created: Date
+  date_created: Date
 
   done?: Date
 
diff --git a/src-ui/src/app/services/tasks.service.ts b/src-ui/src/app/services/tasks.service.ts
index d34172b7a..4607128a1 100644
--- a/src-ui/src/app/services/tasks.service.ts
+++ b/src-ui/src/app/services/tasks.service.ts
@@ -1,6 +1,6 @@
 import { HttpClient } from '@angular/common/http'
 import { Injectable } from '@angular/core'
-import { first, map } from 'rxjs/operators'
+import { first } from 'rxjs/operators'
 import {
   PaperlessTask,
   PaperlessTaskStatus,