From 928580bf4fe9955b3cac22c5493520f3ed11ba9d Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 5 Aug 2024 16:45:48 -0700 Subject: [PATCH] Fix: disable inline create buttons if insufficient permissions (#7401) --- src-ui/messages.xlf | 64 +++++++++---------- .../common/input/tags/tags.component.html | 2 +- .../common/input/tags/tags.component.ts | 3 + .../document-detail.component.html | 8 +-- .../document-detail.component.scss | 4 -- .../document-detail.component.spec.ts | 16 +++++ .../document-detail.component.ts | 25 ++++++++ 7 files changed, 81 insertions(+), 41 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 8e9778929..d5ae2afe8 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -2229,7 +2229,7 @@ src/app/components/document-detail/document-detail.component.ts - 799 + 824 @@ -2506,19 +2506,19 @@ src/app/components/document-detail/document-detail.component.ts - 823 + 848 src/app/components/document-detail/document-detail.component.ts - 1114 + 1139 src/app/components/document-detail/document-detail.component.ts - 1152 + 1177 src/app/components/document-detail/document-detail.component.ts - 1193 + 1218 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -3101,7 +3101,7 @@ src/app/components/document-detail/document-detail.component.ts - 776 + 801 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -5735,7 +5735,7 @@ src/app/components/document-detail/document-detail.component.ts - 1170 + 1195 src/app/guards/dirty-saved-view.guard.ts @@ -6092,36 +6092,36 @@ Document saved successfully. src/app/components/document-detail/document-detail.component.ts - 690 + 715 src/app/components/document-detail/document-detail.component.ts - 704 + 729 Error saving document src/app/components/document-detail/document-detail.component.ts - 708 + 733 src/app/components/document-detail/document-detail.component.ts - 749 + 774 Do you really want to move the document "" to the trash? src/app/components/document-detail/document-detail.component.ts - 777 + 802 Documents can be restored prior to permanent deletion. src/app/components/document-detail/document-detail.component.ts - 778 + 803 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -6132,7 +6132,7 @@ Move to trash src/app/components/document-detail/document-detail.component.ts - 780 + 805 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -6143,7 +6143,7 @@ Reprocess confirm src/app/components/document-detail/document-detail.component.ts - 819 + 844 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -6154,70 +6154,70 @@ This operation will permanently recreate the archive file for this document. src/app/components/document-detail/document-detail.component.ts - 820 + 845 The archive file will be re-generated with the current settings. src/app/components/document-detail/document-detail.component.ts - 821 + 846 Reprocess operation will begin in the background. Close and re-open or reload this document after the operation has completed to see new content. src/app/components/document-detail/document-detail.component.ts - 831 + 856 Error executing operation src/app/components/document-detail/document-detail.component.ts - 842 + 867 Page Fit src/app/components/document-detail/document-detail.component.ts - 911 + 936 Split confirm src/app/components/document-detail/document-detail.component.ts - 1112 + 1137 This operation will split the selected document(s) into new documents. src/app/components/document-detail/document-detail.component.ts - 1113 + 1138 Split operation will begin in the background. src/app/components/document-detail/document-detail.component.ts - 1129 + 1154 Error executing split operation src/app/components/document-detail/document-detail.component.ts - 1138 + 1163 Rotate confirm src/app/components/document-detail/document-detail.component.ts - 1150 + 1175 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -6228,49 +6228,49 @@ This operation will permanently rotate the original version of the current document. src/app/components/document-detail/document-detail.component.ts - 1151 + 1176 Rotation will begin in the background. Close and re-open the document after the operation has completed to see the changes. src/app/components/document-detail/document-detail.component.ts - 1167 + 1192 Error executing rotate operation src/app/components/document-detail/document-detail.component.ts - 1179 + 1204 Delete pages confirm src/app/components/document-detail/document-detail.component.ts - 1191 + 1216 This operation will permanently delete the selected pages from the original document. src/app/components/document-detail/document-detail.component.ts - 1192 + 1217 Delete pages operation will begin in the background. Close and re-open or reload this document after the operation has completed to see the changes. src/app/components/document-detail/document-detail.component.ts - 1207 + 1232 Error executing delete pages operation src/app/components/document-detail/document-detail.component.ts - 1216 + 1241 diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html index c7516a838..d5d5c4a7d 100644 --- a/src-ui/src/app/components/common/input/tags/tags.component.html +++ b/src-ui/src/app/components/common/input/tags/tags.component.html @@ -32,7 +32,7 @@ - @if (allowCreate) { + @if (allowCreate && !hideAddButton) { diff --git a/src-ui/src/app/components/common/input/tags/tags.component.ts b/src-ui/src/app/components/common/input/tags/tags.component.ts index d5cd70c9a..efbbb9a6e 100644 --- a/src-ui/src/app/components/common/input/tags/tags.component.ts +++ b/src-ui/src/app/components/common/input/tags/tags.component.ts @@ -74,6 +74,9 @@ export class TagsComponent implements OnInit, ControlValueAccessor { @Input() allowCreate: boolean = true + @Input() + hideAddButton: boolean = false + @Input() showFilter: boolean = false diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index d970d93b3..84ab680b1 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -110,12 +110,12 @@ + (createNew)="createCorrespondent($event)" [hideAddButton]="createDisabled(DataType.Correspondent)" [suggestions]="suggestions?.correspondents" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Correspondent }"> + (createNew)="createDocumentType($event)" [hideAddButton]="createDisabled(DataType.DocumentType)" [suggestions]="suggestions?.document_types" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.DocumentType }"> - + (createNew)="createStoragePath($event)" [hideAddButton]="createDisabled(DataType.StoragePath)" [suggestions]="suggestions?.storage_paths" i18n-placeholder placeholder="Default" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.StoragePath }"> + @for (fieldInstance of document?.custom_fields; track fieldInstance.field; let i = $index) {
@switch (getCustomFieldFromInstance(fieldInstance)?.data_type) { diff --git a/src-ui/src/app/components/document-detail/document-detail.component.scss b/src-ui/src/app/components/document-detail/document-detail.component.scss index e5032d3f3..860c5722c 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.scss +++ b/src-ui/src/app/components/document-detail/document-detail.component.scss @@ -19,10 +19,6 @@ --page-border: 0; } -::ng-deep form .ng-select-taggable { - max-width: calc(100% - 90px); // fudge factor for (2x) ng-select button width -} - .btn-group .dropdown-toggle-split { border-top-right-radius: inherit; border-bottom-right-radius: inherit; diff --git a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts index 1a1ba44ad..c9ba5dc6a 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts @@ -1244,4 +1244,20 @@ describe('DocumentDetailComponent', () => { ) fixture.detectChanges() } + + it('createDisabled should return true if the user does not have permission to add the specified data type', () => { + currentUserCan = false + expect(component.createDisabled(DataType.Correspondent)).toBeTruthy() + expect(component.createDisabled(DataType.DocumentType)).toBeTruthy() + expect(component.createDisabled(DataType.StoragePath)).toBeTruthy() + expect(component.createDisabled(DataType.Tag)).toBeTruthy() + }) + + it('createDisabled should return false if the user has permission to add the specified data type', () => { + currentUserCan = true + expect(component.createDisabled(DataType.Correspondent)).toBeFalsy() + expect(component.createDisabled(DataType.DocumentType)).toBeFalsy() + expect(component.createDisabled(DataType.StoragePath)).toBeFalsy() + expect(component.createDisabled(DataType.Tag)).toBeFalsy() + }) }) diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts index d6cbdd57e..c971870da 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.ts @@ -651,6 +651,31 @@ export class DocumentDetailComponent }) } + createDisabled(dataType: DataType) { + switch (dataType) { + case DataType.Correspondent: + return !this.permissionsService.currentUserCan( + PermissionAction.Add, + PermissionType.Correspondent + ) + case DataType.DocumentType: + return !this.permissionsService.currentUserCan( + PermissionAction.Add, + PermissionType.DocumentType + ) + case DataType.StoragePath: + return !this.permissionsService.currentUserCan( + PermissionAction.Add, + PermissionType.StoragePath + ) + case DataType.Tag: + return !this.permissionsService.currentUserCan( + PermissionAction.Add, + PermissionType.Tag + ) + } + } + discard() { this.documentsService .get(this.documentId)