From 86fd1ce5bb2126d1ad47c37876d5b1acbec8354b Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 3 Mar 2023 10:21:08 -0800 Subject: [PATCH] Fix edit dialog error surfacing --- src-ui/messages.xlf | 294 +++++++++--------- .../edit-dialog/edit-dialog.component.ts | 3 +- .../management-list.component.ts | 35 ++- 3 files changed, 177 insertions(+), 155 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 50dc362ee..f7cc20fc3 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -723,7 +723,7 @@ src/app/components/manage/settings/settings.component.ts - 574 + 591 @@ -774,19 +774,19 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 316 + 324 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 356 + 364 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 394 + 402 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 432 + 440 @@ -1146,7 +1146,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.html - 77 + 81 @@ -1462,7 +1462,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.html - 137 + 141 src/app/components/manage/management-list/management-list.component.html @@ -1498,7 +1498,7 @@ src/app/components/manage/management-list/management-list.component.ts - 195 + 213 src/app/components/manage/settings/settings.component.html @@ -1805,7 +1805,7 @@ Not assigned src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts - 261 + 262 Filter drop down element to filter for documents with no correspondent/type/tag assigned @@ -2024,7 +2024,7 @@ Inerhited from group src/app/components/common/permissions-select/permissions-select.component.ts - 59 + 62 @@ -2088,14 +2088,14 @@ Hello , welcome to Paperless-ngx src/app/components/dashboard/dashboard.component.ts - 21 + 36 Welcome to Paperless-ngx src/app/components/dashboard/dashboard.component.ts - 23 + 38 @@ -2121,7 +2121,7 @@ src/app/components/document-list/filter-editor/filter-editor.component.html - 59 + 63 src/app/components/manage/tasks/tasks.component.html @@ -2148,7 +2148,7 @@ src/app/components/document-list/filter-editor/filter-editor.component.ts - 153 + 162 src/app/services/rest/document.service.ts @@ -2242,7 +2242,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 261 + 269 this string is used to separate processing, failed and added on the file upload widget @@ -2349,7 +2349,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.html - 101 + 105 src/app/components/document-list/document-card-large/document-card-large.component.html @@ -2375,7 +2375,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.html - 88 + 92 @@ -2436,7 +2436,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.html - 39 + 40 src/app/components/document-list/document-list.component.html @@ -2444,7 +2444,7 @@ src/app/components/document-list/filter-editor/filter-editor.component.html - 35 + 36 src/app/services/rest/document.service.ts @@ -2459,7 +2459,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.html - 49 + 51 src/app/components/document-list/document-list.component.html @@ -2467,7 +2467,7 @@ src/app/components/document-list/filter-editor/filter-editor.component.html - 42 + 44 src/app/services/rest/document.service.ts @@ -2482,7 +2482,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.html - 59 + 62 src/app/components/document-list/document-list.component.html @@ -2490,7 +2490,7 @@ src/app/components/document-list/filter-editor/filter-editor.component.html - 49 + 52 @@ -2671,7 +2671,7 @@ src/app/components/manage/management-list/management-list.component.ts - 191 + 209 @@ -2710,7 +2710,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 491 + 499 @@ -2728,27 +2728,27 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 454 + 462 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 493 + 501 src/app/components/manage/settings/settings.component.ts - 657 + 674 src/app/components/manage/settings/settings.component.ts - 711 + 728 src/app/components/manage/settings/settings.component.ts - 772 + 789 src/app/components/manage/settings/settings.component.ts - 831 + 848 @@ -2759,23 +2759,23 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 495 + 503 src/app/components/manage/settings/settings.component.ts - 659 + 676 src/app/components/manage/settings/settings.component.ts - 713 + 730 src/app/components/manage/settings/settings.component.ts - 774 + 791 src/app/components/manage/settings/settings.component.ts - 833 + 850 @@ -2823,40 +2823,40 @@ Filter correspondents src/app/components/document-list/bulk-editor/bulk-editor.component.html - 40 + 41 src/app/components/document-list/filter-editor/filter-editor.component.html - 36 + 37 Filter document types src/app/components/document-list/bulk-editor/bulk-editor.component.html - 50 + 52 src/app/components/document-list/filter-editor/filter-editor.component.html - 43 + 45 Filter storage paths src/app/components/document-list/bulk-editor/bulk-editor.component.html - 60 + 63 src/app/components/document-list/filter-editor/filter-editor.component.html - 50 + 53 Actions src/app/components/document-list/bulk-editor/bulk-editor.component.html - 85 + 89 src/app/components/manage/management-list/management-list.component.html @@ -2903,28 +2903,28 @@ Include: src/app/components/document-list/bulk-editor/bulk-editor.component.html - 107 + 111 Archived files src/app/components/document-list/bulk-editor/bulk-editor.component.html - 111,113 + 115,117 Original files src/app/components/document-list/bulk-editor/bulk-editor.component.html - 117,119 + 121,123 Use formatted filename src/app/components/document-list/bulk-editor/bulk-editor.component.html - 124,126 + 128,130 @@ -2933,25 +2933,25 @@ )"/> src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 181,183 + 185,187 "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 253 + 261 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 259 + 267 "" and "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 255 + 263 This is for messages like 'modify "tag1" and "tag2"' @@ -2959,7 +2959,7 @@ and "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 263,265 + 271,273 this is for messages like 'modify "tag1", "tag2" and "tag3"' @@ -2967,14 +2967,14 @@ Confirm tags assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 280 + 288 This operation will add the tag "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 286 + 294 @@ -2983,14 +2983,14 @@ )"/> to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 291,293 + 299,301 This operation will remove the tag "" from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 299 + 307 @@ -2999,7 +2999,7 @@ )"/> from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 304,306 + 312,314 @@ -3010,98 +3010,98 @@ )"/> on selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 308,312 + 316,320 Confirm correspondent assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 349 + 357 This operation will assign the correspondent "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 351 + 359 This operation will remove the correspondent from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 353 + 361 Confirm document type assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 387 + 395 This operation will assign the document type "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 389 + 397 This operation will remove the document type from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 391 + 399 Confirm storage path assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 425 + 433 This operation will assign the storage path "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 427 + 435 This operation will remove the storage path from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 429 + 437 Delete confirm src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 452 + 460 This operation will permanently delete selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 453 + 461 Delete document(s) src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 456 + 464 This operation will permanently redo OCR for selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 492 + 500 @@ -3305,7 +3305,7 @@ src/app/components/document-list/filter-editor/filter-editor.component.ts - 158 + 167 src/app/services/rest/document.service.ts @@ -3320,7 +3320,7 @@ src/app/components/document-list/filter-editor/filter-editor.component.html - 65 + 69 src/app/services/rest/document.service.ts @@ -3352,119 +3352,119 @@ Reset filters src/app/components/document-list/filter-editor/filter-editor.component.html - 78 + 82 Correspondent: src/app/components/document-list/filter-editor/filter-editor.component.ts - 94,96 + 98,100 Without correspondent src/app/components/document-list/filter-editor/filter-editor.component.ts - 98 + 102 Type: src/app/components/document-list/filter-editor/filter-editor.component.ts - 103,105 + 107,109 Without document type src/app/components/document-list/filter-editor/filter-editor.component.ts - 107 + 111 Tag: src/app/components/document-list/filter-editor/filter-editor.component.ts - 111,113 + 115,117 Without any tag src/app/components/document-list/filter-editor/filter-editor.component.ts - 117 + 121 Title: src/app/components/document-list/filter-editor/filter-editor.component.ts - 121 + 125 ASN: src/app/components/document-list/filter-editor/filter-editor.component.ts - 124 + 128 Title & content src/app/components/document-list/filter-editor/filter-editor.component.ts - 156 + 165 Advanced search src/app/components/document-list/filter-editor/filter-editor.component.ts - 161 + 170 More like src/app/components/document-list/filter-editor/filter-editor.component.ts - 167 + 176 equals src/app/components/document-list/filter-editor/filter-editor.component.ts - 186 + 195 is empty src/app/components/document-list/filter-editor/filter-editor.component.ts - 190 + 199 is not empty src/app/components/document-list/filter-editor/filter-editor.component.ts - 194 + 203 greater than src/app/components/document-list/filter-editor/filter-editor.component.ts - 198 + 207 less than src/app/components/document-list/filter-editor/filter-editor.component.ts - 202 + 211 @@ -3677,7 +3677,7 @@ Automatic src/app/components/manage/management-list/management-list.component.ts - 99 + 100 src/app/data/matching-model.ts @@ -3688,53 +3688,61 @@ None src/app/components/manage/management-list/management-list.component.ts - 101 + 102 src/app/data/matching-model.ts 45 + + Error occurred while creating : . + + src/app/components/manage/management-list/management-list.component.ts + 142,144 + + + src/app/components/manage/management-list/management-list.component.ts + 155,157 + + Successfully created . src/app/components/manage/management-list/management-list.component.ts - 141 + 149 - - Error occurred while creating : . + + Error occurred while saving : . src/app/components/manage/management-list/management-list.component.ts - 146,148 + 173,175 + + + src/app/components/manage/management-list/management-list.component.ts + 187,189 Successfully updated . src/app/components/manage/management-list/management-list.component.ts - 164 - - - - Error occurred while saving : . - - src/app/components/manage/management-list/management-list.component.ts - 169,171 + 181 Do you really want to delete the ? src/app/components/manage/management-list/management-list.component.ts - 178 + 196 Associated documents will not be deleted. src/app/components/manage/management-list/management-list.component.ts - 193 + 211 @@ -3743,7 +3751,7 @@ )"/> src/app/components/manage/management-list/management-list.component.ts - 206,208 + 224,226 @@ -4135,49 +4143,49 @@ Saved view "" deleted. src/app/components/manage/settings/settings.component.ts - 461 + 473 Settings saved src/app/components/manage/settings/settings.component.ts - 558 + 575 Settings were saved successfully. src/app/components/manage/settings/settings.component.ts - 559 + 576 Settings were saved successfully. Reload is required to apply some changes. src/app/components/manage/settings/settings.component.ts - 563 + 580 Reload now src/app/components/manage/settings/settings.component.ts - 564 + 581 Use system language src/app/components/manage/settings/settings.component.ts - 582 + 599 Use date format of display language src/app/components/manage/settings/settings.component.ts - 589 + 606 @@ -4186,175 +4194,175 @@ )"/> src/app/components/manage/settings/settings.component.ts - 609,611 + 626,628 Saved user "". src/app/components/manage/settings/settings.component.ts - 636 + 653 Error saving user: . src/app/components/manage/settings/settings.component.ts - 645 + 662 Confirm delete user account src/app/components/manage/settings/settings.component.ts - 655 + 672 This operation will permanently delete this user account. src/app/components/manage/settings/settings.component.ts - 656 + 673 Deleted user src/app/components/manage/settings/settings.component.ts - 665 + 682 Error deleting user: . src/app/components/manage/settings/settings.component.ts - 673 + 690 Saved group "". src/app/components/manage/settings/settings.component.ts - 691 + 708 Error saving group: . src/app/components/manage/settings/settings.component.ts - 699 + 716 Confirm delete user group src/app/components/manage/settings/settings.component.ts - 709 + 726 This operation will permanently delete this user group. src/app/components/manage/settings/settings.component.ts - 710 + 727 Deleted group src/app/components/manage/settings/settings.component.ts - 719 + 736 Error deleting group: . src/app/components/manage/settings/settings.component.ts - 727 + 744 Saved account "". src/app/components/manage/settings/settings.component.ts - 750 + 767 Error saving account: . src/app/components/manage/settings/settings.component.ts - 760 + 777 Confirm delete mail account src/app/components/manage/settings/settings.component.ts - 770 + 787 This operation will permanently delete this mail account. src/app/components/manage/settings/settings.component.ts - 771 + 788 Deleted mail account src/app/components/manage/settings/settings.component.ts - 780 + 797 Error deleting mail account: . src/app/components/manage/settings/settings.component.ts - 789 + 806 Saved rule "". src/app/components/manage/settings/settings.component.ts - 808 + 825 Error saving rule: . src/app/components/manage/settings/settings.component.ts - 819 + 836 Confirm delete mail rule src/app/components/manage/settings/settings.component.ts - 829 + 846 This operation will permanently delete this mail rule. src/app/components/manage/settings/settings.component.ts - 830 + 847 Deleted mail rule src/app/components/manage/settings/settings.component.ts - 839 + 856 Error deleting mail rule: . src/app/components/manage/settings/settings.component.ts - 848 + 865 @@ -5034,28 +5042,28 @@ Connecting... src/app/services/upload-documents.service.ts - 34 + 33 Uploading... src/app/services/upload-documents.service.ts - 46 + 45 Upload complete, waiting... src/app/services/upload-documents.service.ts - 49 + 48 HTTP error: src/app/services/upload-documents.service.ts - 65 + 64 diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts index c83771656..42221dfdd 100644 --- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts @@ -102,6 +102,7 @@ export abstract class EditDialogComponent< } save() { + this.error = null const formValues = Object.assign({}, this.objectForm.value) const permissionsObject: PermissionsFormObject = this.objectForm.get('permissions_form')?.value @@ -131,7 +132,7 @@ export abstract class EditDialogComponent< error: (error) => { this.error = error.error this.networkActive = false - this.succeeded.error(error) + this.succeeded.next(error) }, }) } diff --git a/src-ui/src/app/components/manage/management-list/management-list.component.ts b/src-ui/src/app/components/manage/management-list/management-list.component.ts index 43a31f1ca..65cce3d20 100644 --- a/src-ui/src/app/components/manage/management-list/management-list.component.ts +++ b/src-ui/src/app/components/manage/management-list/management-list.component.ts @@ -28,6 +28,7 @@ import { import { AbstractNameFilterService } from 'src/app/services/rest/abstract-name-filter-service' import { ToastService } from 'src/app/services/toast.service' import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component' +import { EditDialogComponent } from '../../common/edit-dialog/edit-dialog.component' import { ComponentWithPermissions } from '../../with-permissions/with-permissions.component' export interface ManagementListColumn { @@ -136,16 +137,22 @@ export abstract class ManagementListComponent activeModal.componentInstance.dialogMode = 'create' activeModal.componentInstance.succeeded.subscribe({ next: () => { - this.reloadData() - this.toastService.showInfo( - $localize`Successfully created ${this.typeName}.` - ) + if (activeModal.componentInstance.error) { + this.toastService.showInfo( + $localize`Error occurred while creating ${this.typeName} : ${activeModal.componentInstance.error}.` + ) + } else { + this.reloadData() + this.toastService.showInfo( + $localize`Successfully created ${this.typeName}.` + ) + } }, error: (e) => { this.toastService.showInfo( - $localize`Error occurred while creating ${ - this.typeName - } : ${e.toString()}.` + $localize`Error occurred while creating ${this.typeName} : ${ + e.error ?? e.message ?? e.toString() + }.` ) }, }) @@ -159,10 +166,16 @@ export abstract class ManagementListComponent activeModal.componentInstance.dialogMode = 'edit' activeModal.componentInstance.succeeded.subscribe({ next: () => { - this.reloadData() - this.toastService.showInfo( - $localize`Successfully updated ${this.typeName}.` - ) + if (activeModal.componentInstance.error) { + this.toastService.showInfo( + $localize`Error occurred while saving ${this.typeName} : ${activeModal.componentInstance.error}.` + ) + } else { + this.reloadData() + this.toastService.showInfo( + $localize`Successfully updated ${this.typeName}.` + ) + } }, error: (e) => { this.toastService.showInfo(