paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-11-03 03:16:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix some merge errors, integrate permissions for frontend mail

Browse Source
This commit is contained in:
Michael Shamoon
2022-12-05 12:28:44 -08:00
parent b21970fd53
commit 629a5dd61e
3 changed files with 91 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src-ui/src/app/app-routing.module.ts
View File

@@ -158,6 +158,13 @@ const routes: Routes = [
path: 'settings/:section', path: 'settings/:section',
component: SettingsComponent, component: SettingsComponent,
canDeactivate: [DirtyFormGuard], canDeactivate: [DirtyFormGuard],
canActivate: [PermissionsGuard],
data: {
requiredPermission: {
action: PermissionAction.View,
type: PermissionType.UISettings,
},
},
}, },
{ path: 'tasks', component: TasksComponent }, { path: 'tasks', component: TasksComponent },
], ],

140
src-ui/src/app/components/manage/settings/settings.component.html
View File

@@ -1,6 +1,6 @@
<app-page-header title="Settings" i18n-title> <app-page-header title="Settings" i18n-title>
<button class="btn btn-sm btn-outline-primary" (click)="tourService.start()"><ng-container i18n>Start tour</ng-container></button> <button class="btn btn-sm btn-outline-primary" (click)="tourService.start()"><ng-container i18n>Start tour</ng-container></button>
<a class="btn btn-sm btn-primary ms-3" href="admin/" target="_blank"> <a *ifPermissions="{ action: PermissionAction.View, type: PermissionType.Admin }" class="btn btn-sm btn-primary ms-3" href="admin/" target="_blank">
<ng-container i18n>Open Django Admin</ng-container> <ng-container i18n>Open Django Admin</ng-container>
<svg class="sidebaricon ms-1" fill="currentColor"> <svg class="sidebaricon ms-1" fill="currentColor">
<use xlink:href="assets/bootstrap-icons.svg#arrow-up-right"/> <use xlink:href="assets/bootstrap-icons.svg#arrow-up-right"/>
@@ -227,80 +227,84 @@
</ng-template> </ng-template>
</li> </li>
<li [ngbNavItem]="SettingsNavIDs.Mail" (mouseover)="maybeInitializeTab(SettingsNavIDs.Mail)" (focusin)="maybeInitializeTab(SettingsNavIDs.Mail)"> <li *ifPermissions="{ action: PermissionAction.View, type: PermissionType.MailRule }" [ngbNavItem]="SettingsNavIDs.Mail" (mouseover)="maybeInitializeTab(SettingsNavIDs.Mail)" (focusin)="maybeInitializeTab(SettingsNavIDs.Mail)">
<a ngbNavLink i18n>Mail</a> <a ngbNavLink i18n>Mail</a>
<ng-template ngbNavContent> <ng-template ngbNavContent>
<ng-container *ngIf="mailAccounts && mailRules"> <ng-container *ngIf="mailAccounts && mailRules">
<h4> <ng-container *ifPermissions="{ action: PermissionAction.View, type: PermissionType.MailAccount }">
<ng-container i18n>Mail accounts</ng-container> <h4>
<button type="button" class="btn btn-sm btn-primary ms-4" (click)="editMailAccount()"> <ng-container i18n>Mail accounts</ng-container>
<svg class="sidebaricon me-1" fill="currentColor"> <button type="button" class="btn btn-sm btn-primary ms-4" (click)="editMailAccount()">
<use xlink:href="assets/bootstrap-icons.svg#plus-circle" /> <svg class="sidebaricon me-1" fill="currentColor">
</svg> <use xlink:href="assets/bootstrap-icons.svg#plus-circle" />
<ng-container i18n>Add Account</ng-container> </svg>
</button> <ng-container i18n>Add Account</ng-container>
</h4> </button>
<ul class="list-group" formGroupName="mailAccounts"> </h4>
<ul class="list-group" formGroupName="mailAccounts">
<li class="list-group-item"> <li class="list-group-item">
<div class="row"> <div class="row">
<div class="col" i18n>Name</div> <div class="col" i18n>Name</div>
<div class="col" i18n>Server</div> <div class="col" i18n>Server</div>
<div class="col" i18n>Actions</div> <div class="col" i18n>Actions</div>
</div> </div>
</li> </li>
<li *ngFor="let account of mailAccounts" class="list-group-item" [formGroupName]="account.id"> <li *ngFor="let account of mailAccounts" class="list-group-item" [formGroupName]="account.id">
<div class="row"> <div class="row">
<div class="col d-flex align-items-center"><button class="btn btn-link p-0" type="button" (click)="editMailAccount(account)">{{account.name}}</button></div> <div class="col d-flex align-items-center"><button class="btn btn-link p-0" type="button" (click)="editMailAccount(account)">{{account.name}}</button></div>
<div class="col d-flex align-items-center">{{account.imap_server}}</div> <div class="col d-flex align-items-center">{{account.imap_server}}</div>
<div class="col"> <div class="col">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-sm btn-primary" type="button" (click)="editMailAccount(account)" i18n>Edit</button> <button *ifPermissions="{ action: PermissionAction.Change, type: PermissionType.MailAccount }" class="btn btn-sm btn-primary" type="button" (click)="editMailAccount(account)" i18n>Edit</button>
<button class="btn btn-sm btn-outline-danger" type="button" (click)="deleteMailAccount(account)" i18n>Delete</button> <button *ifPermissions="{ action: PermissionAction.Change, type: PermissionType.MailAccount }" class="btn btn-sm btn-outline-danger" type="button" (click)="deleteMailAccount(account)" i18n>Delete</button>
</div>
</div> </div>
</div> </div>
</div> </li>
</li>
<div *ngIf="mailAccounts.length == 0" i18n>No mail accounts defined.</div> <div *ngIf="mailAccounts.length == 0" i18n>No mail accounts defined.</div>
</ul> </ul>
</ng-container>
<h4 class="mt-4"> <ng-container *ifPermissions="{ action: PermissionAction.View, type: PermissionType.MailRule }">
<ng-container i18n>Mail rules</ng-container> <h4 class="mt-4">
<button type="button" class="btn btn-sm btn-primary ms-4" (click)="editMailRule()"> <ng-container i18n>Mail rules</ng-container>
<svg class="sidebaricon me-1" fill="currentColor"> <button type="button" class="btn btn-sm btn-primary ms-4" (click)="editMailRule()">
<use xlink:href="assets/bootstrap-icons.svg#plus-circle" /> <svg class="sidebaricon me-1" fill="currentColor">
</svg> <use xlink:href="assets/bootstrap-icons.svg#plus-circle" />
<ng-container i18n>Add Rule</ng-container> </svg>
</button> <ng-container i18n>Add Rule</ng-container>
</h4> </button>
<ul class="list-group" formGroupName="mailRules"> </h4>
<ul class="list-group" formGroupName="mailRules">
<li class="list-group-item"> <li class="list-group-item">
<div class="row"> <div class="row">
<div class="col" i18n>Name</div> <div class="col" i18n>Name</div>
<div class="col" i18n>Account</div> <div class="col" i18n>Account</div>
<div class="col" i18n>Actions</div> <div class="col" i18n>Actions</div>
</div> </div>
</li> </li>
<li *ngFor="let rule of mailRules" class="list-group-item" [formGroupName]="rule.id"> <li *ngFor="let rule of mailRules" class="list-group-item" [formGroupName]="rule.id">
<div class="row"> <div class="row">
<div class="col d-flex align-items-center"><button class="btn btn-link p-0" type="button" (click)="editMailRule(rule)">{{rule.name}}</button></div> <div class="col d-flex align-items-center"><button class="btn btn-link p-0" type="button" (click)="editMailRule(rule)">{{rule.name}}</button></div>
<div class="col d-flex align-items-center">{{(mailAccountService.getCached(rule.account) | async)?.name}}</div> <div class="col d-flex align-items-center">{{(mailAccountService.getCached(rule.account) | async)?.name}}</div>
<div class="col"> <div class="col">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-sm btn-primary" type="button" (click)="editMailRule(rule)" i18n>Edit</button> <button *ifPermissions="{ action: PermissionAction.Change, type: PermissionType.MailRule }" class="btn btn-sm btn-primary" type="button" (click)="editMailRule(rule)" i18n>Edit</button>
<button class="btn btn-sm btn-outline-danger" type="button" (click)="deleteMailRule(rule)" i18n>Delete</button> <button *ifPermissions="{ action: PermissionAction.Change, type: PermissionType.MailRule }" class="btn btn-sm btn-outline-danger" type="button" (click)="deleteMailRule(rule)" i18n>Delete</button>
</div>
</div> </div>
</div> </div>
</div> </li>
</li>
<div *ngIf="mailRules.length == 0" i18n>No mail rules defined.</div> <div *ngIf="mailRules.length == 0" i18n>No mail rules defined.</div>
</ul> </ul>
</ng-container>
</ng-container> </ng-container>
<div *ngIf="!mailAccounts || !mailRules"> <div *ngIf="!mailAccounts || !mailRules">
@@ -318,7 +322,12 @@
<ng-container *ngIf="users && groups"> <ng-container *ngIf="users && groups">
<h4 class="d-flex"> <h4 class="d-flex">
<ng-container i18n>Users</ng-container> <ng-container i18n>Users</ng-container>
<button type="button" class="btn btn-sm btn-primary ms-4" (click)="editUser()" i18n>Add User</button> <button type="button" class="btn btn-sm btn-primary ms-4" (click)="editUser()">
<svg class="sidebaricon me-1" fill="currentColor">
<use xlink:href="assets/bootstrap-icons.svg#plus-circle" />
</svg>
<ng-container i18n>Add User</ng-container>
</button>
</h4> </h4>
<ul class="list-group" formGroupName="usersGroup"> <ul class="list-group" formGroupName="usersGroup">
@@ -335,7 +344,7 @@
<div class="row"> <div class="row">
<div class="col d-flex align-items-center"><button class="btn btn-link p-0" type="button" (click)="editUser(user)">{{user.username}}</button></div> <div class="col d-flex align-items-center"><button class="btn btn-link p-0" type="button" (click)="editUser(user)">{{user.username}}</button></div>
<div class="col d-flex align-items-center">{{user.first_name}} {{user.last_name}}</div> <div class="col d-flex align-items-center">{{user.first_name}} {{user.last_name}}</div>
<div class="col d-flex align-items-center">{{user.groups}}</div> <div class="col d-flex align-items-center">{{user.groups?.map(getGroupName, this)}}</div>
<div class="col"> <div class="col">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-sm btn-primary" type="button" (click)="editUser(user)" i18n>Edit</button> <button class="btn btn-sm btn-primary" type="button" (click)="editUser(user)" i18n>Edit</button>
@@ -348,7 +357,12 @@
<h4 class="mt-4 d-flex"> <h4 class="mt-4 d-flex">
<ng-container i18n>Groups</ng-container> <ng-container i18n>Groups</ng-container>
<button type="button" class="btn btn-sm btn-primary ms-4" (click)="editGroup()" i18n>Add Group</button> <button type="button" class="btn btn-sm btn-primary ms-4" (click)="editGroup()">
<svg class="sidebaricon me-1" fill="currentColor">
<use xlink:href="assets/bootstrap-icons.svg#plus-circle" />
</svg>
<ng-container i18n>Add Group</ng-container>
</button>
</h4> </h4>
<ul *ngIf="groups.length > 0" class="list-group" formGroupName="groupsGroup"> <ul *ngIf="groups.length > 0" class="list-group" formGroupName="groupsGroup">

10
src-ui/src/app/components/manage/settings/settings.component.ts
View File

@@ -246,14 +246,14 @@ export class SettingsComponent
this.initialize(false) this.initialize(false)
}) })
} else if ( } else if (
(navID == SettingsNavIDs.UsersGroups && !this.users) || navID == SettingsNavIDs.UsersGroups &&
!this.groups (!this.users || !this.groups)
) { ) {
this.usersService.listAll().subscribe((r) => { this.usersService.listAll().subscribe((r) => {
this.users = r.results this.users = r.results
this.groupsService.listAll().subscribe((r) => { this.groupsService.listAll().subscribe((r) => {
this.groups = r.results this.groups = r.results
this.initialize() this.initialize(false)
}) })
}) })
} else if ( } else if (
@@ -724,6 +724,10 @@ export class SettingsComponent
}) })
} }
getGroupName(id: number): string {
return this.groups?.find((g) => g.id === id)?.name ?? ''
}
editMailAccount(account: PaperlessMailAccount) { editMailAccount(account: PaperlessMailAccount) {
const modal = this.modalService.open(MailAccountEditDialogComponent, { const modal = this.modalService.open(MailAccountEditDialogComponent, {
backdrop: 'static', backdrop: 'static',