From 623ac441d504c7b75926a65b9455d472e615edd2 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Tue, 17 Jan 2023 10:01:49 -0800
Subject: [PATCH] Allow setting mailrule order from frontend

---
 .../mail-rule-edit-dialog/mail-rule-edit-dialog.component.html  | 1 +
 .../mail-rule-edit-dialog/mail-rule-edit-dialog.component.ts    | 1 +
 src-ui/src/app/data/paperless-mail-rule.ts                      | 2 ++
 src/paperless_mail/views.py                                     | 2 +-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html b/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html
index 64d54a72c..ebb7458e6 100644
--- a/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html
+++ b/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html
@@ -13,6 +13,7 @@
         <app-input-number i18n-title title="Maximum age (days)" formControlName="maximum_age" [showAdd]="false" [error]="error?.maximum_age"></app-input-number>
         <app-input-select i18n-title title="Attachment type" [items]="attachmentTypeOptions" formControlName="attachment_type"></app-input-select>
         <app-input-select i18n-title title="Consumption scope" [items]="consumptionScopeOptions" formControlName="consumption_scope" i18n-hint hint="See docs for .eml processing requirements"></app-input-select>
+        <app-input-number i18n-title title="Rule order" formControlName="order" [showAdd]="false" [error]="error?.order"></app-input-number>
       </div>
       <div class="col">
         <p class="small" i18n>Paperless will only process mails that match <em>all</em> of the filters specified below.</p>
diff --git a/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.ts
index 63699fd66..0a0f2837d 100644
--- a/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.ts
+++ b/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.ts
@@ -153,6 +153,7 @@ export class MailRuleEditDialogComponent extends EditDialogComponent<PaperlessMa
       maximum_age: new FormControl(null),
       attachment_type: new FormControl(MailFilterAttachmentType.Attachments),
       consumption_scope: new FormControl(MailRuleConsumptionScope.Attachments),
+      order: new FormControl(null),
       action: new FormControl(MailAction.MarkRead),
       action_parameter: new FormControl(null),
       assign_title_from: new FormControl(MailMetadataTitleOption.FromSubject),
diff --git a/src-ui/src/app/data/paperless-mail-rule.ts b/src-ui/src/app/data/paperless-mail-rule.ts
index 9f526d404..a9159e005 100644
--- a/src-ui/src/app/data/paperless-mail-rule.ts
+++ b/src-ui/src/app/data/paperless-mail-rule.ts
@@ -36,6 +36,8 @@ export interface PaperlessMailRule extends ObjectWithId {
 
   account: number // PaperlessMailAccount.id
 
+  order: number
+
   folder: string
 
   filter_from: string
diff --git a/src/paperless_mail/views.py b/src/paperless_mail/views.py
index d86240c7c..45fc4197e 100644
--- a/src/paperless_mail/views.py
+++ b/src/paperless_mail/views.py
@@ -27,7 +27,7 @@ class MailAccountViewSet(ModelViewSet):
 class MailRuleViewSet(ModelViewSet):
     model = MailRule
 
-    queryset = MailRule.objects.all().order_by("pk")
+    queryset = MailRule.objects.all().order_by("order")
     serializer_class = MailRuleSerializer
     pagination_class = StandardPagination
     permission_classes = (IsAuthenticated,)