diff --git a/src-ui/src/app/components/admin/tasks/tasks.component.html b/src-ui/src/app/components/admin/tasks/tasks.component.html
index 418dfa8fa..934e9007f 100644
--- a/src-ui/src/app/components/admin/tasks/tasks.component.html
+++ b/src-ui/src/app/components/admin/tasks/tasks.component.html
@@ -76,33 +76,27 @@
- | {{ task.task_file_name }} |
+ {{ task.input_data?.filename }} |
{{ task.date_created | customDate:'short' }} |
@if (activeTab !== 'started' && activeTab !== 'queued') {
- @if (task.result?.length > 50) {
+ @if (task.result_message?.length > 50) {
- {{ task.result | slice:0:50 }}…
+ {{ task.result_message | slice:0:50 }}…
}
- @if (task.result?.length <= 50) {
- {{ task.result }}
+ @if (task.result_message?.length <= 50) {
+ {{ task.result_message }}
}
- {{ task.result | slice:0:300 }}@if (task.result.length > 300) {
+ {{ task.result_message | slice:0:300 }}@if (task.result_message.length > 300) {
…
}
- @if (task.result?.length > 300) {
+ @if (task.result_message?.length > 300) {
(click for full output)
}
- @if (task.duplicate_documents?.length > 0) {
-
-
- Duplicate(s) detected
-
- }
|
}
@@ -116,7 +110,7 @@
Dismiss
- @if (task.related_document) {
+ @if (task.related_document_ids?.[0]) {
@@ -127,7 +121,7 @@
- {{ task.result }}
+ {{ task.result_message }}
|
}
diff --git a/src-ui/src/app/components/admin/tasks/tasks.component.spec.ts b/src-ui/src/app/components/admin/tasks/tasks.component.spec.ts
index 1a085150e..4c85c939e 100644
--- a/src-ui/src/app/components/admin/tasks/tasks.component.spec.ts
+++ b/src-ui/src/app/components/admin/tasks/tasks.component.spec.ts
@@ -20,8 +20,8 @@ import { throwError } from 'rxjs'
import { routes } from 'src/app/app-routing.module'
import {
PaperlessTask,
- PaperlessTaskName,
PaperlessTaskStatus,
+ PaperlessTaskTriggerSource,
PaperlessTaskType,
} from 'src/app/data/paperless-task'
import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
@@ -39,81 +39,100 @@ const tasks: PaperlessTask[] = [
{
id: 467,
task_id: '11ca1a5b-9f81-442c-b2c8-7e4ae53657f1',
- task_file_name: 'test.pdf',
+ input_data: { filename: 'test.pdf' },
date_created: new Date('2023-03-01T10:26:03.093116Z'),
date_done: new Date('2023-03-01T10:26:07.223048Z'),
- type: PaperlessTaskType.Auto,
- task_name: PaperlessTaskName.ConsumeFile,
- status: PaperlessTaskStatus.Failed,
- result: 'test.pd: Not consuming test.pdf: It is a duplicate of test (#100)',
+ task_type: PaperlessTaskType.ConsumeFile,
+ task_type_display: 'Consume File',
+ trigger_source: PaperlessTaskTriggerSource.FolderConsume,
+ trigger_source_display: 'Folder Consume',
+ status: PaperlessTaskStatus.Failure,
+ status_display: 'Failure',
+ result_message:
+ 'test.pd: Not consuming test.pdf: It is a duplicate of test (#100)',
acknowledged: false,
- related_document: null,
+ related_document_ids: [],
},
{
id: 466,
task_id: '10ca1a5b-3c08-442c-b2c8-7e4ae53657f1',
- task_file_name: '191092.pdf',
+ input_data: { filename: '191092.pdf' },
date_created: new Date('2023-03-01T09:26:03.093116Z'),
date_done: new Date('2023-03-01T09:26:07.223048Z'),
- type: PaperlessTaskType.Auto,
- task_name: PaperlessTaskName.ConsumeFile,
- status: PaperlessTaskStatus.Failed,
- result:
+ task_type: PaperlessTaskType.ConsumeFile,
+ task_type_display: 'Consume File',
+ trigger_source: PaperlessTaskTriggerSource.FolderConsume,
+ trigger_source_display: 'Folder Consume',
+ status: PaperlessTaskStatus.Failure,
+ status_display: 'Failure',
+ result_message:
'191092.pd: Not consuming 191092.pdf: It is a duplicate of 191092 (#311)',
acknowledged: false,
- related_document: null,
+ related_document_ids: [],
},
{
id: 465,
task_id: '3612d477-bb04-44e3-985b-ac580dd496d8',
- task_file_name: 'Scan Jun 6, 2023 at 3.19 PM.pdf',
+ input_data: { filename: 'Scan Jun 6, 2023 at 3.19 PM.pdf' },
date_created: new Date('2023-06-06T15:22:05.722323-07:00'),
date_done: new Date('2023-06-06T15:22:14.564305-07:00'),
- type: PaperlessTaskType.Auto,
- task_name: PaperlessTaskName.ConsumeFile,
+ task_type: PaperlessTaskType.ConsumeFile,
+ task_type_display: 'Consume File',
+ trigger_source: PaperlessTaskTriggerSource.FolderConsume,
+ trigger_source_display: 'Folder Consume',
status: PaperlessTaskStatus.Pending,
- result: null,
+ status_display: 'Pending',
+ result_message: null,
acknowledged: false,
- related_document: null,
+ related_document_ids: [],
},
{
id: 464,
task_id: '2eac4716-2aa6-4dcd-9953-264e11656d7e',
- task_file_name: 'paperless-mail-l4dkg8ir',
+ input_data: { filename: 'paperless-mail-l4dkg8ir' },
date_created: new Date('2023-06-04T11:24:32.898089-07:00'),
date_done: new Date('2023-06-04T11:24:44.678605-07:00'),
- type: PaperlessTaskType.Auto,
- task_name: PaperlessTaskName.ConsumeFile,
- status: PaperlessTaskStatus.Complete,
- result: 'Success. New document id 422 created',
+ task_type: PaperlessTaskType.ConsumeFile,
+ task_type_display: 'Consume File',
+ trigger_source: PaperlessTaskTriggerSource.EmailConsume,
+ trigger_source_display: 'Email Consume',
+ status: PaperlessTaskStatus.Success,
+ status_display: 'Success',
+ result_message: 'Success. New document id 422 created',
acknowledged: false,
- related_document: 422,
+ related_document_ids: [422],
},
{
id: 463,
task_id: '28125528-1575-4d6b-99e6-168906e8fa5c',
- task_file_name: 'onlinePaymentSummary.pdf',
+ input_data: { filename: 'onlinePaymentSummary.pdf' },
date_created: new Date('2023-06-01T13:49:51.631305-07:00'),
date_done: new Date('2023-06-01T13:49:54.190220-07:00'),
- type: PaperlessTaskType.Auto,
- task_name: PaperlessTaskName.ConsumeFile,
- status: PaperlessTaskStatus.Complete,
- result: 'Success. New document id 421 created',
+ task_type: PaperlessTaskType.ConsumeFile,
+ task_type_display: 'Consume File',
+ trigger_source: PaperlessTaskTriggerSource.FolderConsume,
+ trigger_source_display: 'Folder Consume',
+ status: PaperlessTaskStatus.Success,
+ status_display: 'Success',
+ result_message: 'Success. New document id 421 created',
acknowledged: false,
- related_document: 421,
+ related_document_ids: [421],
},
{
id: 462,
task_id: 'a5b9ca47-0c8e-490f-a04c-6db5d5fc09e5',
- task_file_name: 'paperless-mail-_rrpmqk6',
+ input_data: { filename: 'paperless-mail-_rrpmqk6' },
date_created: new Date('2023-06-07T02:54:35.694916Z'),
date_done: null,
- type: PaperlessTaskType.Auto,
- task_name: PaperlessTaskName.ConsumeFile,
+ task_type: PaperlessTaskType.ConsumeFile,
+ task_type_display: 'Consume File',
+ trigger_source: PaperlessTaskTriggerSource.EmailConsume,
+ trigger_source_display: 'Email Consume',
status: PaperlessTaskStatus.Started,
- result: null,
+ status_display: 'Started',
+ result_message: null,
acknowledged: false,
- related_document: null,
+ related_document_ids: [],
},
]
@@ -167,7 +186,7 @@ describe('TasksComponent', () => {
fixture.detectChanges()
httpTestingController
.expectOne(
- `${environment.apiBaseUrl}tasks/?task_name=consume_file&acknowledged=false`
+ `${environment.apiBaseUrl}tasks/?task_type=consume_file&acknowledged=false`
)
.flush(tasks)
})
@@ -176,7 +195,7 @@ describe('TasksComponent', () => {
const tabButtons = fixture.debugElement.queryAll(By.directive(NgbNavItem))
let currentTasksLength = tasks.filter(
- (t) => t.status === PaperlessTaskStatus.Failed
+ (t) => t.status === PaperlessTaskStatus.Failure
).length
component.activeTab = TaskTab.Failed
fixture.detectChanges()
@@ -188,7 +207,7 @@ describe('TasksComponent', () => {
).toHaveLength(currentTasksLength + 1)
currentTasksLength = tasks.filter(
- (t) => t.status === PaperlessTaskStatus.Complete
+ (t) => t.status === PaperlessTaskStatus.Success
).length
component.activeTab = TaskTab.Completed
fixture.detectChanges()
@@ -308,7 +327,7 @@ describe('TasksComponent', () => {
expect(component.selectedTasks).toEqual(
new Set(
tasks
- .filter((t) => t.status === PaperlessTaskStatus.Failed)
+ .filter((t) => t.status === PaperlessTaskStatus.Failure)
.map((t) => t.id)
)
)
@@ -322,7 +341,7 @@ describe('TasksComponent', () => {
component.dismissAndGo(tasks[3])
expect(routerSpy).toHaveBeenCalledWith([
'documents',
- tasks[3].related_document,
+ tasks[3].related_document_ids?.[0],
])
})
diff --git a/src-ui/src/app/components/admin/tasks/tasks.component.ts b/src-ui/src/app/components/admin/tasks/tasks.component.ts
index 6f144c58c..decba1eb8 100644
--- a/src-ui/src/app/components/admin/tasks/tasks.component.ts
+++ b/src-ui/src/app/components/admin/tasks/tasks.component.ts
@@ -175,7 +175,7 @@ export class TasksComponent
dismissAndGo(task: PaperlessTask) {
this.dismissTask(task)
- this.router.navigate(['documents', task.related_document])
+ this.router.navigate(['documents', task.related_document_ids?.[0]])
}
expandTask(task: PaperlessTask) {
@@ -207,11 +207,13 @@ export class TasksComponent
if (this._filterText.length) {
tasks = tasks.filter((t) => {
if (this.filterTargetID == TaskFilterTargetID.Name) {
- return t.task_file_name
- .toLowerCase()
+ return (t.input_data?.filename as string)
+ ?.toLowerCase()
.includes(this._filterText.toLowerCase())
} else if (this.filterTargetID == TaskFilterTargetID.Result) {
- return t.result.toLowerCase().includes(this._filterText.toLowerCase())
+ return t.result_message
+ ?.toLowerCase()
+ .includes(this._filterText.toLowerCase())
}
})
}
diff --git a/src-ui/src/app/components/common/dates-dropdown/dates-dropdown.component.html b/src-ui/src/app/components/common/dates-dropdown/dates-dropdown.component.html
index 7b1963bf3..fb4df4ea1 100644
--- a/src-ui/src/app/components/common/dates-dropdown/dates-dropdown.component.html
+++ b/src-ui/src/app/components/common/dates-dropdown/dates-dropdown.component.html
@@ -86,7 +86,7 @@
@if (addedRelativeDate) {
-
+
}
diff --git a/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.html b/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.html
index 636e574f5..2e30a5a24 100644
--- a/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.html
+++ b/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.html
@@ -168,16 +168,6 @@
}
- @if (currentUserIsSuperUser) {
- @if (isRunning(PaperlessTaskName.IndexOptimize)) {
-
- } @else {
-
- }
- }
@if (status.tasks.index_status === 'OK') {
@@ -203,10 +193,10 @@
}
@if (currentUserIsSuperUser) {
- @if (isRunning(PaperlessTaskName.TrainClassifier)) {
+ @if (isRunning(PaperlessTaskType.TrainClassifier)) {
} @else {
-
@if (currentUserIsSuperUser) {
- @if (isRunning(PaperlessTaskName.SanityCheck)) {
+ @if (isRunning(PaperlessTaskType.SanityCheck)) {
} @else {
-
@if (currentUserIsSuperUser) {
- @if (isRunning(PaperlessTaskName.LLMIndexUpdate)) {
+ @if (isRunning(PaperlessTaskType.LlmIndex)) {
} @else {
- |