From 59e359ff98a77d9686262f10ab1b36b8a96fd9a5 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 11 Nov 2022 14:32:18 -0800 Subject: [PATCH] Refactor permissions check code Directly check permissions and no subscription (uisettings is always initialized on frontend startup) update permission directive to accept single string add explicit management permission name --- src-ui/src/app/app.component.ts | 20 +++------ .../app-frame/app-frame.component.html | 26 +++++------ .../dashboard/dashboard.component.html | 2 +- .../saved-view-widget.component.html | 4 +- .../upload-file-widget.component.html | 4 +- .../document-comments.component.html | 4 +- .../document-detail.component.html | 4 +- .../document-detail.component.ts | 10 ++--- .../bulk-editor/bulk-editor.component.html | 4 +- .../document-card-large.component.html | 2 +- .../document-card-small.component.html | 2 +- .../document-list.component.html | 6 +-- .../correspondent-list.component.ts | 1 + .../document-type-list.component.ts | 1 + .../management-list.component.html | 14 +++--- .../management-list.component.ts | 7 +-- .../manage/settings/settings.component.html | 4 +- .../storage-path-list.component.ts | 1 + .../manage/tag-list/tag-list.component.ts | 1 + .../manage/tasks/tasks.component.html | 6 +-- .../if-permissions.directive.spec.ts | 9 ---- .../directives/if-permissions.directive.ts | 43 +++++-------------- .../app/directives/sortable.directive.spec.ts | 8 ---- src-ui/src/app/guards/auth.gard.ts | 6 +-- src-ui/src/app/services/settings.service.ts | 10 ++--- 25 files changed, 74 insertions(+), 125 deletions(-) delete mode 100644 src-ui/src/app/directives/if-permissions.directive.spec.ts delete mode 100644 src-ui/src/app/directives/sortable.directive.spec.ts diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts index 8973d54e5..b07b0f35f 100644 --- a/src-ui/src/app/app.component.ts +++ b/src-ui/src/app/app.component.ts @@ -74,12 +74,7 @@ export class AppComponent implements OnInit, OnDestroy { if ( this.showNotification(SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS) ) { - // TODO - Is this the only way to allow/disallow from permissions? - var canOpenDocuments = false - this.settings.permissions().subscribe((perm) => { - canOpenDocuments = perm.includes('documents.view_document') - }) - if (canOpenDocuments) + if (this.settings.currentUserCan('documents.view_document')) { this.toastService.show({ title: $localize`Document added`, delay: 10000, @@ -89,12 +84,13 @@ export class AppComponent implements OnInit, OnDestroy { this.router.navigate(['documents', status.documentId]) }, }) - else + } else { this.toastService.show({ title: $localize`Document added`, delay: 10000, content: $localize`Document ${status.filename} was added to paperless.`, }) + } } }) @@ -211,12 +207,10 @@ export class AppComponent implements OnInit, OnDestroy { } public get dragDropEnabled(): boolean { - // TODO - Is this the only way to allow/disallow from permissions? - var canAddDocuments = false - this.settings.permissions().subscribe((perm) => { - canAddDocuments = perm.includes('documents.add_document') - }) - return !this.router.url.includes('dashboard') && canAddDocuments + return ( + !this.router.url.includes('dashboard') && + this.settings.currentUserCan('documents.add_document') + ) } public fileOver() { diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index 57f730104..6ad83c9da 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -10,7 +10,7 @@ Paperless-ngx -
+
@@ -39,7 +39,7 @@

Logged in as {{this.settingsService.displayName}}

- + Settings @@ -72,7 +72,7 @@  Dashboard -
  • +
  • @@ -80,7 +80,7 @@
    • -
    +
    Saved views @@ -96,7 +96,7 @@
    -
    +
    Open documents
    @@ -127,35 +127,35 @@ Manage