paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-25 10:49:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add related_document and direct link from task UI

Browse Source
This commit is contained in:
Michael Shamoon 2022-09-27 20:50:26 -07:00
parent 5162bdd404
commit 4fe37f6aee
4 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src-ui/src/app/components/manage/tasks/tasks.component.html
View File

@ -74,11 +74,18 @@
</button>
</td>
<td scope="row">
<button class="btn btn-sm btn-outline-secondary" (click)="dismissTask(task); $event.stopPropagation();">
<svg class="sidebaricon" fill="currentColor">
<use xlink:href="assets/bootstrap-icons.svg#check"/>
</svg>&nbsp;<ng-container i18n>Dismiss</ng-container>
</button>
<div class="btn-group" role="group">
<button class="btn btn-sm btn-outline-secondary" (click)="dismissTask(task); $event.stopPropagation();">
<svg class="sidebaricon" fill="currentColor">
<use xlink:href="assets/bootstrap-icons.svg#check"/>
</svg>&nbsp;<ng-container i18n>Dismiss</ng-container>
</button>
<button *ngIf="task.related_document" class="btn btn-sm btn-outline-primary" (click)="dismissAndGo(task); $event.stopPropagation();">
<svg class="sidebaricon" fill="currentColor">
<use xlink:href="assets/bootstrap-icons.svg#file-text"/>
</svg>&nbsp;<ng-container i18n>Open Document</ng-container>
</button>
</div>
</td>
</tr>
<tr>

9
src-ui/src/app/components/manage/tasks/tasks.component.ts
View File

@ -1,4 +1,5 @@
import { Component, OnInit, OnDestroy } from '@angular/core'
import { Router } from '@angular/router'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { Subject, first } from 'rxjs'
import { PaperlessTask } from 'src/app/data/paperless-task'
@ -24,7 +25,8 @@ export class TasksComponent implements OnInit, OnDestroy {
constructor(
public tasksService: TasksService,
private modalService: NgbModal
private modalService: NgbModal,
private readonly router: Router
) {}
ngOnInit() {
@ -64,6 +66,11 @@ export class TasksComponent implements OnInit, OnDestroy {
}
}
dismissAndGo(task: PaperlessTask) {
this.dismissTask(task)
this.router.navigate(['documents', task.related_document])
}
expandTask(task: PaperlessTask) {
this.expandedTask = this.expandedTask == task.id ? undefined : task.id
}

2
src-ui/src/app/data/paperless-task.ts
View File

@ -28,4 +28,6 @@ export interface PaperlessTask extends ObjectWithId {
done?: Date
result: string
related_document?: number
}

18
src/documents/serialisers.py
View File

@ -633,6 +633,7 @@ class TasksViewSerializer(serializers.ModelSerializer):
"acknowledged",
"task_name",
"name",
"related_document",
)
type = serializers.SerializerMethodField()
@ -726,6 +727,23 @@ class TasksViewSerializer(serializers.ModelSerializer):
return result
related_document = serializers.SerializerMethodField()
def get_related_document(self, obj):
result = ""
regexp = r"New document id (\d+) created"
if (
hasattr(obj, "attempted_task")
and obj.attempted_task
and obj.attempted_task.status == "SUCCESS"
):
try:
result = re.search(regexp, obj.attempted_task.result).group(1)
except Exception:
pass
return result
class AcknowledgeTasksViewSerializer(serializers.Serializer):