From 258064b3390091d91b99b2d14551668b1a2aa9ad Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Sun, 19 Jan 2025 08:50:26 -0800
Subject: [PATCH 1/4] Fix: better reflect some mail account / rule permissions
 in UI (#8812)

---
 .../components/manage/mail/mail.component.html   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src-ui/src/app/components/manage/mail/mail.component.html b/src-ui/src/app/components/manage/mail/mail.component.html
index fc786840c..16e8e88fb 100644
--- a/src-ui/src/app/components/manage/mail/mail.component.html
+++ b/src-ui/src/app/components/manage/mail/mail.component.html
@@ -45,7 +45,7 @@
       <li class="list-group-item">
         <div class="row fade" [class.show]="showAccounts">
           <div class="col d-flex align-items-center">
-            <button class="btn btn-link p-0 text-start" type="button" (click)="editMailAccount(account)" [disabled]="!permissionsService.currentUserCan(PermissionAction.Change, PermissionType.MailAccount)">
+            <button class="btn btn-link p-0 text-start" type="button" (click)="editMailAccount(account)" [disabled]="!permissionsService.currentUserCan(PermissionAction.Change, PermissionType.MailAccount) || !userCanEdit(account)">
               {{account.name}}@switch (account.account_type) {
                 @case (MailAccountType.IMAP) {<i-bs name="envelope-at-fill" class="ms-2"></i-bs>}
                 @case (MailAccountType.Gmail_OAuth) {<i-bs name="google" class="ms-2"></i-bs>}
@@ -62,10 +62,10 @@
                   <i-bs name="three-dots-vertical"></i-bs>
                 </button>
                 <div ngbDropdownMenu aria-labelledby="actionsMenuMobile">
-                  <button (click)="editMailAccount(account)" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.MailAccount }" ngbDropdownItem i18n>Edit</button>
+                  <button (click)="editMailAccount(account)" [disabled]="!userCanEdit(account)" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.MailAccount }" ngbDropdownItem i18n>Edit</button>
                   <button (click)="editPermissions(account)" *pngxIfOwner="account" ngbDropdownItem i18n>Permissions</button>
-                  <button (click)="deleteMailAccount(account)" *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.MailAccount }" ngbDropdownItem i18n>Delete</button>
-                  <button (click)="processAccount(account)" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.MailAccount }" ngbDropdownItem i18n>Process Mail</button>
+                  <button (click)="deleteMailAccount(account)" [disabled]="!userIsOwner(account)" *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.MailAccount }" ngbDropdownItem i18n>Delete</button>
+                  <button (click)="processAccount(account)" [disabled]="!userIsOwner(account)" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.MailAccount }" ngbDropdownItem i18n>Process Mail</button>
                 </div>
               </div>
             </div>
@@ -82,7 +82,7 @@
                 </button>
               </div>
               <div class="btn-group">
-                <button *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.MailAccount }" class="btn btn-sm btn-outline-secondary" type="button" (click)="processAccount(account)">
+                <button *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.MailAccount }" [disabled]="!userIsOwner(account)" class="btn btn-sm btn-outline-secondary" type="button" (click)="processAccount(account)">
                   <i-bs width="1em" height="1em" name="arrow-clockwise"></i-bs>&nbsp;<ng-container i18n>Process Mail</ng-container>
                 </button>
               </div>
@@ -126,7 +126,7 @@
     @for (rule of mailRules; track rule) {
       <li class="list-group-item">
         <div class="row fade" [class.show]="showRules">
-          <div class="col d-flex align-items-center"><button class="btn btn-link p-0 text-start" type="button" (click)="editMailRule(rule)" [disabled]="!permissionsService.currentUserCan(PermissionAction.Change, PermissionType.MailRule)">{{rule.name}}</button></div>
+          <div class="col d-flex align-items-center"><button class="btn btn-link p-0 text-start" type="button" (click)="editMailRule(rule)" [disabled]="!permissionsService.currentUserCan(PermissionAction.Change, PermissionType.MailRule) || !userCanEdit(rule)">{{rule.name}}</button></div>
           <div class="col d-flex align-items-center d-none d-sm-flex">{{rule.order}}</div>
           <div class="col d-flex align-items-center">{{(mailAccountService.getCached(rule.account) | async)?.name}}</div>
           <div class="col d-flex align-items-center d-none d-sm-flex">
@@ -144,9 +144,9 @@
                   <i-bs name="three-dots-vertical"></i-bs>
                 </button>
                 <div ngbDropdownMenu aria-labelledby="actionsMenuMobile">
-                  <button (click)="editMailRule(rule)" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.MailRule }" ngbDropdownItem i18n>Edit</button>
+                  <button (click)="editMailRule(rule)" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.MailRule }" [disabled]="!userCanEdit(rule)" ngbDropdownItem i18n>Edit</button>
                   <button (click)="editPermissions(rule)" *pngxIfOwner="rule" ngbDropdownItem i18n>Permissions</button>
-                  <button (click)="deleteMailRule(rule)" *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.MailRule }" ngbDropdownItem i18n>Delete</button>
+                  <button (click)="deleteMailRule(rule)" *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.MailRule }" [disabled]="!userIsOwner(rule)" ngbDropdownItem i18n>Delete</button>
                   <button (click)="copyMailRule(rule)" *pngxIfPermissions="{ action: PermissionAction.Add, type: PermissionType.MailRule }" ngbDropdownItem i18n>Copy</button>
                 </div>
               </div>

From 0f863ab3785f16462dd0ed69416dd4e019546275 Mon Sep 17 00:00:00 2001
From: Thomas Hess <tux12345@justmail.de>
Date: Sun, 19 Jan 2025 19:04:55 +0100
Subject: [PATCH 2/4] Documentation: fix error in storage paths example in
 advanced_usage.md (#8817)

---
 docs/advanced_usage.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/advanced_usage.md b/docs/advanced_usage.md
index 76e33b3f1..f7b31c919 100644
--- a/docs/advanced_usage.md
+++ b/docs/advanced_usage.md
@@ -476,7 +476,7 @@ a document with an ASN of 355 would be placed in `somepath/asn-201-400/asn-3xx/T
 /{{ title }}
 ```
 
-For a PDF document, it would result in `pdfs/Title.pdf`, but for a PNG document, the path would be `pngs/Title.pdf`.
+For a PDF document, it would result in `pdfs/Title.pdf`, but for a PNG document, the path would be `pngs/Title.png`.
 
 To use custom fields:
 

From 01207a284d37cf841270c18ab9f61ac748b036f2 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Sun, 19 Jan 2025 10:37:31 -0800
Subject: [PATCH 3/4] Fix: import router module to not found component (#8821)

---
 src-ui/src/app/components/not-found/not-found.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/not-found/not-found.component.ts b/src-ui/src/app/components/not-found/not-found.component.ts
index dc381d265..44cd103ec 100644
--- a/src-ui/src/app/components/not-found/not-found.component.ts
+++ b/src-ui/src/app/components/not-found/not-found.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core'
+import { RouterModule } from '@angular/router'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { LogoComponent } from '../common/logo/logo.component'
 
@@ -6,7 +7,7 @@ import { LogoComponent } from '../common/logo/logo.component'
   selector: 'pngx-not-found',
   templateUrl: './not-found.component.html',
   styleUrls: ['./not-found.component.scss'],
-  imports: [LogoComponent, NgxBootstrapIconsModule],
+  imports: [LogoComponent, NgxBootstrapIconsModule, RouterModule],
 })
 export class NotFoundComponent {
   constructor() {}

From e1dde85c59cd9a2d3f03429d93442e0d24b9e728 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Sun, 19 Jan 2025 10:46:57 -0800
Subject: [PATCH 4/4] Fix failing test

---
 .../src/app/components/not-found/not-found.component.spec.ts   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src-ui/src/app/components/not-found/not-found.component.spec.ts b/src-ui/src/app/components/not-found/not-found.component.spec.ts
index 58861da44..219c6c1f9 100644
--- a/src-ui/src/app/components/not-found/not-found.component.spec.ts
+++ b/src-ui/src/app/components/not-found/not-found.component.spec.ts
@@ -2,7 +2,9 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { By } from '@angular/platform-browser'
+import { RouterModule } from '@angular/router'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
+import { routes } from 'src/app/app-routing.module'
 import { LogoComponent } from '../common/logo/logo.component'
 import { NotFoundComponent } from './not-found.component'
 
@@ -16,6 +18,7 @@ describe('NotFoundComponent', () => {
         NgxBootstrapIconsModule.pick(allIcons),
         NotFoundComponent,
         LogoComponent,
+        RouterModule.forRoot(routes),
       ],
       providers: [
         provideHttpClient(withInterceptorsFromDi()),