From 2f6425b7e5f51f300a2f8d1041f593d1d1e4bba9 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 26 Feb 2025 00:12:44 -0800 Subject: [PATCH] Show error on list view save --- src-ui/messages.xlf | 70 +++++++++++-------- .../document-list.component.spec.ts | 26 ++++++- .../document-list/document-list.component.ts | 20 ++++-- 3 files changed, 81 insertions(+), 35 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index ae9abe847..12b0a09a6 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -1736,7 +1736,7 @@ src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts - 83 + 87 src/app/components/document-list/document-list.component.html @@ -2230,7 +2230,7 @@ src/app/components/manage/custom-fields/custom-fields.component.ts - 106 + 108 src/app/components/manage/mail/mail.component.ts @@ -2565,7 +2565,7 @@ src/app/components/manage/custom-fields/custom-fields.component.ts - 108 + 110 src/app/components/manage/mail/mail.component.ts @@ -3322,7 +3322,7 @@ src/app/components/manage/custom-fields/custom-fields.component.ts - 87 + 89 @@ -3333,7 +3333,7 @@ src/app/components/manage/custom-fields/custom-fields.component.ts - 96 + 98 @@ -3543,7 +3543,7 @@ src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts - 79 + 83 src/app/components/document-list/document-list.component.html @@ -4384,7 +4384,7 @@ src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts - 125 + 129 src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.html @@ -4984,11 +4984,18 @@ 72 + + Web UI + + src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts + 76 + + Modified src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts - 87 + 91 src/app/data/document.ts @@ -4999,70 +5006,70 @@ Custom Field src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts - 91 + 95 Consumption Started src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts - 98 + 102 Document Added src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts - 102 + 106 Document Updated src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts - 106 + 110 Scheduled src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts - 110 + 114 Assignment src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts - 117 + 121 Removal src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts - 121 + 125 Webhook src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts - 129 + 133 Create new workflow src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts - 225 + 229 Edit workflow src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts - 229 + 233 @@ -7870,14 +7877,21 @@ View "" saved successfully. src/app/components/document-list/document-list.component.ts - 383 + 384 + + + + Failed to save view "". + + src/app/components/document-list/document-list.component.ts + 390 View "" created successfully. src/app/components/document-list/document-list.component.ts - 426 + 434 @@ -8227,28 +8241,28 @@ Confirm delete field src/app/components/manage/custom-fields/custom-fields.component.ts - 104 + 106 This operation will permanently delete this field. src/app/components/manage/custom-fields/custom-fields.component.ts - 105 + 107 Deleted field "" src/app/components/manage/custom-fields/custom-fields.component.ts - 114 + 116 Error deleting field "". src/app/components/manage/custom-fields/custom-fields.component.ts - 122 + 125 @@ -9726,28 +9740,28 @@ Connecting... src/app/services/upload-documents.service.ts - 42 + 43 Uploading... src/app/services/upload-documents.service.ts - 54 + 55 Upload complete, waiting... src/app/services/upload-documents.service.ts - 57 + 58 HTTP error: src/app/services/upload-documents.service.ts - 70 + 71 diff --git a/src-ui/src/app/components/document-list/document-list.component.spec.ts b/src-ui/src/app/components/document-list/document-list.component.spec.ts index 13a938f59..aae043fdb 100644 --- a/src-ui/src/app/components/document-list/document-list.component.spec.ts +++ b/src-ui/src/app/components/document-list/document-list.component.spec.ts @@ -376,7 +376,7 @@ describe('DocumentListComponent', () => { expect(documentListService.selected.size).toEqual(3) }) - it('should support saving an edited view', () => { + it('should support saving a view', () => { const view: SavedView = { id: 10, name: 'Saved View 10', @@ -414,6 +414,30 @@ describe('DocumentListComponent', () => { ) }) + it('should handle error on view saving', () => { + component.list.activateSavedView({ + id: 10, + name: 'Saved View 10', + sort_field: 'added', + sort_reverse: true, + filter_rules: [ + { + rule_type: FILTER_HAS_TAGS_ANY, + value: '20', + }, + ], + }) + const toastErrorSpy = jest.spyOn(toastService, 'showError') + jest + .spyOn(savedViewService, 'patch') + .mockReturnValueOnce(throwError(() => new Error('Error saving view'))) + component.saveViewConfig() + expect(toastErrorSpy).toHaveBeenCalledWith( + 'Failed to save view "Saved View 10".', + expect.any(Error) + ) + }) + it('should support edited view saving as', () => { const view: SavedView = { id: 10, diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index e1f71edbc..f6b7c181b 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -377,12 +377,20 @@ export class DocumentListComponent this.savedViewService .patch(savedView) .pipe(first()) - .subscribe((view) => { - this.unmodifiedSavedView = view - this.toastService.showInfo( - $localize`View "${this.list.activeSavedViewTitle}" saved successfully.` - ) - this.unmodifiedFilterRules = this.list.filterRules + .subscribe({ + next: (view) => { + this.unmodifiedSavedView = view + this.toastService.showInfo( + $localize`View "${this.list.activeSavedViewTitle}" saved successfully.` + ) + this.unmodifiedFilterRules = this.list.filterRules + }, + error: (err) => { + this.toastService.showError( + $localize`Failed to save view "${this.list.activeSavedViewTitle}".`, + err + ) + }, }) } }