Refactor permissions API endpoints, UI group permissions

src-ui/src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component.html

@@ -11,11 +11,19 @@
     <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match" [error]="error?.match"></app-input-text>
     <app-input-check *ngIf="patternRequired" i18n-title title="Case insensitive" formControlName="is_insensitive" novalidate></app-input-check>
 
-    <div *ifOwner="object?.owner">
+    <div *ifOwner="object">
       <h5 i18n>Permissions</h5>
       <div formGroupName="set_permissions">
-        <app-share-user type="view" formControlName="view"></app-share-user>
-        <app-share-user type="change" formControlName="change"></app-share-user>
+        <h6 i18n>View</h6>
+        <div formGroupName="view">
+          <app-permissions-user type="view" formControlName="users"></app-permissions-user>
+          <app-permissions-group type="view" formControlName="groups"></app-permissions-group>
+        </div>
+        <h6 i18n>Edit</h6>
+        <div formGroupName="change">
+          <app-permissions-user type="change" formControlName="users"></app-permissions-user>
+          <app-permissions-group type="change" formControlName="groups"></app-permissions-group>
+        </div>
       </div>
     </div>
 

src-ui/src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component.ts

@@ -31,8 +31,14 @@ export class CorrespondentEditDialogComponent extends EditDialogComponent<Paperl
       match: new FormControl(''),
       is_insensitive: new FormControl(true),
       set_permissions: new FormGroup({
-        view: new FormControl(null),
-        change: new FormControl(null),
+        view: new FormGroup({
+          users: new FormControl(null),
+          groups: new FormControl(null),
+        }),
+        change: new FormGroup({
+          users: new FormControl(null),
+          groups: new FormControl(null),
+        }),
       }),
     })
   }

src-ui/src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.html

@@ -11,11 +11,19 @@
       <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match" [error]="error?.match"></app-input-text>
       <app-input-check *ngIf="patternRequired" i18n-title title="Case insensitive" formControlName="is_insensitive"></app-input-check>
 
-      <div *ifOwner="object?.owner">
+      <div *ifOwner="object">
         <h5 i18n>Permissions</h5>
         <div formGroupName="set_permissions">
-          <app-share-user type="view" formControlName="view"></app-share-user>
-          <app-share-user type="change" formControlName="change"></app-share-user>
+          <h6 i18n>View</h6>
+          <div formGroupName="view">
+            <app-permissions-user type="view" formControlName="users"></app-permissions-user>
+            <app-permissions-group type="view" formControlName="groups"></app-permissions-group>
+          </div>
+          <h6 i18n>Edit</h6>
+          <div formGroupName="change">
+            <app-permissions-user type="change" formControlName="users"></app-permissions-user>
+            <app-permissions-group type="change" formControlName="groups"></app-permissions-group>
+          </div>
         </div>
       </div>
 

src-ui/src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.ts

@@ -31,8 +31,14 @@ export class DocumentTypeEditDialogComponent extends EditDialogComponent<Paperle
       match: new FormControl(''),
       is_insensitive: new FormControl(true),
       set_permissions: new FormGroup({
-        view: new FormControl(null),
-        change: new FormControl(null),
+        view: new FormGroup({
+          users: new FormControl(null),
+          groups: new FormControl(null),
+        }),
+        change: new FormGroup({
+          users: new FormControl(null),
+          groups: new FormControl(null),
+        }),
       }),
     })
   }

src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts

@@ -39,14 +39,7 @@ export abstract class EditDialogComponent<
   ngOnInit(): void {
     if (this.object != null) {
       if (this.object['permissions']) {
-        this.object['set_permissions'] = {
-          view: (this.object as ObjectWithPermissions).permissions
-            .filter((p) => (p[1] as string).includes('view'))
-            .map((p) => p[0]),
-          change: (this.object as ObjectWithPermissions).permissions
-            .filter((p) => (p[1] as string).includes('change'))
-            .map((p) => p[0]),
-        }
+        this.object['set_permissions'] = this.object['permissions']
       }
       this.objectForm.patchValue(this.object)
     }

src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html

@@ -16,11 +16,19 @@
     <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match" [error]="error?.match"></app-input-text>
     <app-input-check *ngIf="patternRequired" i18n-title title="Case insensitive" formControlName="is_insensitive"></app-input-check>
 
-    <div *ifOwner="object?.owner">
+    <div *ifOwner="object">
       <h5 i18n>Permissions</h5>
       <div formGroupName="set_permissions">
-        <app-share-user type="view" formControlName="view"></app-share-user>
-        <app-share-user type="change" formControlName="change"></app-share-user>
+        <h6 i18n>View</h6>
+        <div formGroupName="view">
+          <app-permissions-user type="view" formControlName="users"></app-permissions-user>
+          <app-permissions-group type="view" formControlName="groups"></app-permissions-group>
+        </div>
+        <h6 i18n>Edit</h6>
+        <div formGroupName="change">
+          <app-permissions-user type="change" formControlName="users"></app-permissions-user>
+          <app-permissions-group type="change" formControlName="groups"></app-permissions-group>
+        </div>
       </div>
     </div>
 

src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.ts

@@ -42,8 +42,14 @@ export class StoragePathEditDialogComponent extends EditDialogComponent<Paperles
       match: new FormControl(''),
       is_insensitive: new FormControl(true),
       set_permissions: new FormGroup({
-        view: new FormControl(null),
-        change: new FormControl(null),
+        view: new FormGroup({
+          users: new FormControl(null),
+          groups: new FormControl(null),
+        }),
+        change: new FormGroup({
+          users: new FormControl(null),
+          groups: new FormControl(null),
+        }),
       }),
     })
   }

src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.html

@@ -14,11 +14,19 @@
       <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match" [error]="error?.match"></app-input-text>
       <app-input-check *ngIf="patternRequired" i18n-title title="Case insensitive" formControlName="is_insensitive"></app-input-check>
 
-      <div *ifOwner="object?.owner">
+      <div *ifOwner="object">
         <h5 i18n>Permissions</h5>
         <div formGroupName="set_permissions">
-          <app-share-user type="view" formControlName="view"></app-share-user>
-          <app-share-user type="change" formControlName="change"></app-share-user>
+          <h6 i18n>View</h6>
+          <div formGroupName="view">
+            <app-permissions-user type="view" formControlName="users"></app-permissions-user>
+            <app-permissions-group type="view" formControlName="groups"></app-permissions-group>
+          </div>
+          <h6 i18n>Edit</h6>
+          <div formGroupName="change">
+            <app-permissions-user type="change" formControlName="users"></app-permissions-user>
+            <app-permissions-group type="change" formControlName="groups"></app-permissions-group>
+          </div>
         </div>
       </div>
 

src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.ts

@@ -34,8 +34,14 @@ export class TagEditDialogComponent extends EditDialogComponent<PaperlessTag> {
       match: new FormControl(''),
       is_insensitive: new FormControl(true),
       set_permissions: new FormGroup({
-        view: new FormControl(null),
-        change: new FormControl(null),
+        view: new FormGroup({
+          users: new FormControl(null),
+          groups: new FormControl(null),
+        }),
+        change: new FormGroup({
+          users: new FormControl(null),
+          groups: new FormControl(null),
+        }),
       }),
     })
   }

src-ui/src/app/components/common/input/permissions-group/permissions-group.component.html

@@ -0,0 +1,15 @@
+<div class="mb-3 paperless-input-select">
+    <label class="form-label" [for]="inputId">{{title}}</label>
+      <div>
+        <ng-select name="inputId" [(ngModel)]="value"
+          [disabled]="disabled"
+          clearable="true"
+          [items]="groups"
+          multiple="true"
+          bindLabel="name"
+          bindValue="id"
+          (change)="onChange(value)">
+        </ng-select>
+      </div>
+    <small *ngIf="hint" class="form-text text-muted">{{hint}}</small>
+  </div>

src-ui/src/app/components/common/input/permissions-group/permissions-group.component.ts

@@ -0,0 +1,48 @@
+import { Component, forwardRef, Input, OnInit } from '@angular/core'
+import { NG_VALUE_ACCESSOR } from '@angular/forms'
+import { first } from 'rxjs/operators'
+import { PaperlessGroup } from 'src/app/data/paperless-group'
+import { GroupService } from 'src/app/services/rest/group.service'
+import { SettingsService } from 'src/app/services/settings.service'
+import { AbstractInputComponent } from '../abstract-input'
+
+@Component({
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => PermissionsGroupComponent),
+      multi: true,
+    },
+  ],
+  selector: 'app-permissions-group',
+  templateUrl: './permissions-group.component.html',
+  styleUrls: ['./permissions-group.component.scss'],
+})
+export class PermissionsGroupComponent
+  extends AbstractInputComponent<PaperlessGroup>
+  implements OnInit
+{
+  groups: PaperlessGroup[]
+
+  @Input()
+  type: string
+
+  constructor(groupService: GroupService, settings: SettingsService) {
+    super()
+    groupService
+      .listAll()
+      .pipe(first())
+      .subscribe((result) => (this.groups = result.results))
+  }
+
+  ngOnInit(): void {
+    if (this.type == 'view') {
+      this.title = $localize`Groups can view`
+    } else if (this.type == 'change') {
+      this.title = $localize`Groups can edit`
+      this.hint = $localize`Edit permissions also grant viewing permissions`
+    }
+
+    super.ngOnInit()
+  }
+}

src-ui/src/app/components/common/input/permissions-user/permissions-user.component.ts

@@ -3,21 +3,22 @@ import { NG_VALUE_ACCESSOR } from '@angular/forms'
 import { first } from 'rxjs/operators'
 import { PaperlessUser } from 'src/app/data/paperless-user'
 import { UserService } from 'src/app/services/rest/user.service'
+import { SettingsService } from 'src/app/services/settings.service'
 import { AbstractInputComponent } from '../abstract-input'
 
 @Component({
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
-      useExisting: forwardRef(() => ShareUserComponent),
+      useExisting: forwardRef(() => PermissionsUserComponent),
       multi: true,
     },
   ],
-  selector: 'app-share-user',
-  templateUrl: './share-user.component.html',
-  styleUrls: ['./share-user.component.scss'],
+  selector: 'app-permissions-user',
+  templateUrl: './permissions-user.component.html',
+  styleUrls: ['./permissions-user.component.scss'],
 })
-export class ShareUserComponent
+export class PermissionsUserComponent
   extends AbstractInputComponent<PaperlessUser>
   implements OnInit
 {
@@ -26,12 +27,17 @@ export class ShareUserComponent
   @Input()
   type: string
 
-  constructor(userService: UserService) {
+  constructor(userService: UserService, settings: SettingsService) {
     super()
     userService
       .listAll()
       .pipe(first())
-      .subscribe((result) => (this.users = result.results))
+      .subscribe(
+        (result) =>
+          (this.users = result.results.filter(
+            (u) => u.id !== settings.currentUser.id
+          ))
+      )
   }
 
   ngOnInit(): void {

src-ui/src/app/components/common/permissions-select/permissions-select.component.ts

@@ -156,18 +156,18 @@ export class PermissionsSelectComponent
     if (this._inheritedPermissions.length == 0) return false
     else if (actionKey) {
       return this._inheritedPermissions.includes(
-        this.permissionsService.getPermissionCode({
-          action: PermissionAction[actionKey],
-          type: PermissionType[typeKey],
-        })
+        this.permissionsService.getPermissionCode(
+          PermissionAction[actionKey],
+          PermissionType[typeKey]
+        )
       )
     } else {
       return Object.values(PermissionAction).every((action) => {
         return this._inheritedPermissions.includes(
-          this.permissionsService.getPermissionCode({
-            action: action as PermissionAction,
-            type: PermissionType[typeKey],
-          })
+          this.permissionsService.getPermissionCode(
+            action as PermissionAction,
+            PermissionType[typeKey]
+          )
         )
       })
     }