From 065724befb984795d86b22af97fdbdc8cb1d5c1b Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 1 Feb 2025 21:57:57 -0800 Subject: [PATCH] Tweak: more verbose toast messages --- src-ui/messages.xlf | 294 +++++++++--------- .../components/admin/trash/trash.component.ts | 16 +- .../users-groups.component.spec.ts | 6 +- .../users-groups/users-groups.component.ts | 14 +- .../document-detail.component.spec.ts | 17 +- .../document-detail.component.ts | 21 +- .../custom-fields/custom-fields.component.ts | 7 +- .../manage/mail/mail.component.spec.ts | 10 +- .../components/manage/mail/mail.component.ts | 29 +- .../manage/workflows/workflows.component.ts | 18 +- 10 files changed, 248 insertions(+), 184 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 29852f89a..d3c93684b 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -256,7 +256,7 @@ src/app/components/admin/trash/trash.component.ts - 141 + 146 src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html @@ -2014,7 +2014,7 @@ src/app/components/admin/trash/trash.component.ts - 111 + 116 src/app/components/admin/users-groups/users-groups.component.html @@ -2160,7 +2160,7 @@ src/app/components/admin/trash/trash.component.ts - 105 + 110 src/app/components/manage/management-list/management-list.component.ts @@ -2186,7 +2186,7 @@ src/app/components/admin/trash/trash.component.ts - 109 + 114 src/app/components/admin/users-groups/users-groups.component.ts @@ -2194,7 +2194,7 @@ src/app/components/admin/users-groups/users-groups.component.ts - 174 + 177 src/app/components/manage/custom-fields/custom-fields.component.ts @@ -2206,7 +2206,7 @@ src/app/components/manage/mail/mail.component.ts - 286 + 296 src/app/components/manage/management-list/management-list.component.ts @@ -2217,78 +2217,74 @@ 137 - - Document deleted + + Document "" deleted src/app/components/admin/trash/trash.component.ts - 89 + 90 - - Error deleting document + + Error deleting document "" src/app/components/admin/trash/trash.component.ts - 94 - - - src/app/components/document-detail/document-detail.component.ts - 926 + 97 This operation will permanently delete the selected documents. src/app/components/admin/trash/trash.component.ts - 107 + 112 This operation will permanently delete all documents in the trash. src/app/components/admin/trash/trash.component.ts - 108 + 113 Document(s) deleted src/app/components/admin/trash/trash.component.ts - 119 + 124 Error deleting document(s) src/app/components/admin/trash/trash.component.ts - 126 + 131 - - Document restored + + Document "" restored src/app/components/admin/trash/trash.component.ts - 139 + 144 - - Error restoring document + + Error restoring document "" src/app/components/admin/trash/trash.component.ts - 149 + 155 Document(s) restored src/app/components/admin/trash/trash.component.ts - 159 + 167 Error restoring document(s) src/app/components/admin/trash/trash.component.ts - 165 + 173 @@ -2505,23 +2501,23 @@ src/app/components/admin/users-groups/users-groups.component.ts - 176 + 179 src/app/components/document-detail/document-detail.component.ts - 950 + 957 src/app/components/document-detail/document-detail.component.ts - 1303 + 1310 src/app/components/document-detail/document-detail.component.ts - 1342 + 1349 src/app/components/document-detail/document-detail.component.ts - 1383 + 1390 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -2545,7 +2541,7 @@ src/app/components/manage/mail/mail.component.ts - 288 + 298 src/app/components/manage/management-list/management-list.component.ts @@ -2556,60 +2552,60 @@ 139 - - Deleted user + + Deleted user "" src/app/components/admin/users-groups/users-groups.component.ts 132 - - Error deleting user. + + Error deleting user "". src/app/components/admin/users-groups/users-groups.component.ts - 138 + 139 Saved group "". src/app/components/admin/users-groups/users-groups.component.ts - 156 + 159 Error saving group. src/app/components/admin/users-groups/users-groups.component.ts - 164 + 167 Confirm delete user group src/app/components/admin/users-groups/users-groups.component.ts - 172 + 175 This operation will permanently delete this user group. src/app/components/admin/users-groups/users-groups.component.ts - 173 + 176 - - Deleted group + + Deleted group "" src/app/components/admin/users-groups/users-groups.component.ts - 182 + 185 - - Error deleting group. + + Error deleting group "". src/app/components/admin/users-groups/users-groups.component.ts - 188 + 192 @@ -3115,7 +3111,7 @@ src/app/components/document-detail/document-detail.component.ts - 903 + 910 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -6241,7 +6237,7 @@ src/app/components/document-detail/document-detail.component.ts - 1360 + 1367 src/app/guards/dirty-saved-view.guard.ts @@ -6612,40 +6608,43 @@ 660 - - Document saved successfully. + + Document "" saved successfully. src/app/components/document-detail/document-detail.component.ts - 811 + 812 src/app/components/document-detail/document-detail.component.ts - 825 + 828 + + + + Error saving document "" + + src/app/components/document-detail/document-detail.component.ts + 834 Error saving document src/app/components/document-detail/document-detail.component.ts - 829 - - - src/app/components/document-detail/document-detail.component.ts - 872 + 879 Do you really want to move the document "" to the trash? src/app/components/document-detail/document-detail.component.ts - 904 + 911 Documents can be restored prior to permanent deletion. src/app/components/document-detail/document-detail.component.ts - 905 + 912 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -6656,18 +6655,25 @@ Move to trash src/app/components/document-detail/document-detail.component.ts - 907 + 914 src/app/components/document-list/bulk-editor/bulk-editor.component.ts 751 + + Error deleting document + + src/app/components/document-detail/document-detail.component.ts + 933 + + Reprocess confirm src/app/components/document-detail/document-detail.component.ts - 946 + 953 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -6678,77 +6684,77 @@ This operation will permanently recreate the archive file for this document. src/app/components/document-detail/document-detail.component.ts - 947 + 954 The archive file will be re-generated with the current settings. src/app/components/document-detail/document-detail.component.ts - 948 + 955 - - Reprocess operation will begin in the background. Close and re-open or reload this document after the operation has completed to see new content. + + Reprocess operation for "" 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 - 958 + 965 Error executing operation src/app/components/document-detail/document-detail.component.ts - 969 + 976 Error downloading document src/app/components/document-detail/document-detail.component.ts - 1016 + 1023 Page Fit src/app/components/document-detail/document-detail.component.ts - 1088 + 1095 Split confirm src/app/components/document-detail/document-detail.component.ts - 1301 + 1308 This operation will split the selected document(s) into new documents. src/app/components/document-detail/document-detail.component.ts - 1302 + 1309 - - Split operation will begin in the background. + + Split operation for "" will begin in the background. src/app/components/document-detail/document-detail.component.ts - 1318 + 1325 Error executing split operation src/app/components/document-detail/document-detail.component.ts - 1327 + 1334 Rotate confirm src/app/components/document-detail/document-detail.component.ts - 1340 + 1347 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -6759,60 +6765,60 @@ This operation will permanently rotate the original version of the current document. src/app/components/document-detail/document-detail.component.ts - 1341 + 1348 - - Rotation will begin in the background. Close and re-open the document after the operation has completed to see the changes. + + Rotation of "" 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 - 1357 + 1364 Error executing rotate operation src/app/components/document-detail/document-detail.component.ts - 1369 + 1376 Delete pages confirm src/app/components/document-detail/document-detail.component.ts - 1381 + 1388 This operation will permanently delete the selected pages from the original document. src/app/components/document-detail/document-detail.component.ts - 1382 + 1389 - - 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. + + Delete pages operation for "" 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 - 1397 + 1404 Error executing delete pages operation src/app/components/document-detail/document-detail.component.ts - 1406 + 1413 An error occurred loading tiff: src/app/components/document-detail/document-detail.component.ts - 1446 + 1453 src/app/components/document-detail/document-detail.component.ts - 1450 + 1457 @@ -8022,18 +8028,18 @@ 102 - - Deleted field + + Deleted field "" src/app/components/manage/custom-fields/custom-fields.component.ts 111 - - Error deleting field. + + Error deleting field "". src/app/components/manage/custom-fields/custom-fields.component.ts - 117 + 118 @@ -8212,109 +8218,109 @@ 194 - - Deleted mail account + + Deleted mail account "" src/app/components/manage/mail/mail.component.ts - 203 + 204 - - Error deleting mail account. + + Error deleting mail account "". src/app/components/manage/mail/mail.component.ts - 213 + 215 - - Processing mail account - - src/app/components/manage/mail/mail.component.ts - 224 - - - - Error processing mail account + + Processing mail account "" src/app/components/manage/mail/mail.component.ts 227 + + Error processing mail account "") + + src/app/components/manage/mail/mail.component.ts + 232 + + Saved rule "". src/app/components/manage/mail/mail.component.ts - 243 + 250 Error saving rule. src/app/components/manage/mail/mail.component.ts - 254 + 261 Rule "" enabled. src/app/components/manage/mail/mail.component.ts - 270 + 277 Rule "" disabled. src/app/components/manage/mail/mail.component.ts - 271 + 278 - - Error toggling rule. + + Error toggling rule "". src/app/components/manage/mail/mail.component.ts - 275 + 283 Confirm delete mail rule src/app/components/manage/mail/mail.component.ts - 284 + 294 This operation will permanently delete this mail rule. src/app/components/manage/mail/mail.component.ts - 285 + 295 - - Deleted mail rule + + Deleted mail rule "" src/app/components/manage/mail/mail.component.ts - 294 + 305 - - Error deleting mail rule. + + Error deleting mail rule "". src/app/components/manage/mail/mail.component.ts - 303 + 316 Permissions updated src/app/components/manage/mail/mail.component.ts - 325 + 340 Error updating permissions src/app/components/manage/mail/mail.component.ts - 330 + 345 src/app/components/manage/management-list/management-list.component.ts @@ -8650,39 +8656,39 @@ 136 - - Deleted workflow + + Deleted workflow "". src/app/components/manage/workflows/workflows.component.ts - 145 + 146 - - Error deleting workflow. + + Error deleting workflow "". src/app/components/manage/workflows/workflows.component.ts - 150 + 153 - - Enabled workflow + + Enabled workflow "" src/app/components/manage/workflows/workflows.component.ts - 161 + 166 - - Disabled workflow + + Disabled workflow "" src/app/components/manage/workflows/workflows.component.ts - 162 + 167 - - Error toggling workflow. + + Error toggling workflow "". src/app/components/manage/workflows/workflows.component.ts - 168 + 174 diff --git a/src-ui/src/app/components/admin/trash/trash.component.ts b/src-ui/src/app/components/admin/trash/trash.component.ts index fcf43e1c1..1df6ceff4 100644 --- a/src-ui/src/app/components/admin/trash/trash.component.ts +++ b/src-ui/src/app/components/admin/trash/trash.component.ts @@ -86,12 +86,17 @@ export class TrashComponent modal.componentInstance.buttonsEnabled = false this.trashService.emptyTrash([document.id]).subscribe({ next: () => { - this.toastService.showInfo($localize`Document deleted`) + this.toastService.showInfo( + $localize`Document "${document.title}" deleted` + ) modal.close() this.reload() }, error: (err) => { - this.toastService.showError($localize`Error deleting document`, err) + this.toastService.showError( + $localize`Error deleting document "${document.title}"`, + err + ) modal.close() }, }) @@ -136,7 +141,7 @@ export class TrashComponent this.trashService.restoreDocuments([document.id]).subscribe({ next: () => { this.toastService.show({ - content: $localize`Document restored`, + content: $localize`Document "${document.title}" restored`, delay: 5000, actionName: $localize`Open document`, action: () => { @@ -146,7 +151,10 @@ export class TrashComponent this.reload() }, error: (err) => { - this.toastService.showError($localize`Error restoring document`, err) + this.toastService.showError( + $localize`Error restoring document "${document.title}"`, + err + ) }, }) } diff --git a/src-ui/src/app/components/admin/users-groups/users-groups.component.spec.ts b/src-ui/src/app/components/admin/users-groups/users-groups.component.spec.ts index ab739aa54..559b03f51 100644 --- a/src-ui/src/app/components/admin/users-groups/users-groups.component.spec.ts +++ b/src-ui/src/app/components/admin/users-groups/users-groups.component.spec.ts @@ -134,7 +134,7 @@ describe('UsersAndGroupsComponent', () => { deleteSpy.mockReturnValueOnce(of(true)) deleteDialog.confirm() expect(listAllSpy).toHaveBeenCalled() - expect(toastInfoSpy).toHaveBeenCalledWith('Deleted user') + expect(toastInfoSpy).toHaveBeenCalledWith('Deleted user "user1"') }) it('should logout current user if password changed, after delay', fakeAsync(() => { @@ -178,7 +178,7 @@ describe('UsersAndGroupsComponent', () => { completeSetup() let modal: NgbModalRef modalService.activeInstances.subscribe((refs) => (modal = refs[0])) - component.deleteGroup(users[0]) + component.deleteGroup(groups[0]) const deleteDialog = modal.componentInstance as ConfirmDialogComponent const deleteSpy = jest.spyOn(groupService, 'delete') const toastErrorSpy = jest.spyOn(toastService, 'showError') @@ -192,7 +192,7 @@ describe('UsersAndGroupsComponent', () => { deleteSpy.mockReturnValueOnce(of(true)) deleteDialog.confirm() expect(listAllSpy).toHaveBeenCalled() - expect(toastInfoSpy).toHaveBeenCalledWith('Deleted group') + expect(toastInfoSpy).toHaveBeenCalledWith('Deleted group "group1"') }) it('should get group name', () => { diff --git a/src-ui/src/app/components/admin/users-groups/users-groups.component.ts b/src-ui/src/app/components/admin/users-groups/users-groups.component.ts index 41ed58dac..9ed73cde4 100644 --- a/src-ui/src/app/components/admin/users-groups/users-groups.component.ts +++ b/src-ui/src/app/components/admin/users-groups/users-groups.component.ts @@ -129,13 +129,16 @@ export class UsersAndGroupsComponent this.usersService.delete(user).subscribe({ next: () => { modal.close() - this.toastService.showInfo($localize`Deleted user`) + this.toastService.showInfo($localize`Deleted user "${user.username}"`) this.usersService.listAll().subscribe((r) => { this.users = r.results }) }, error: (e) => { - this.toastService.showError($localize`Error deleting user.`, e) + this.toastService.showError( + $localize`Error deleting user "${user.username}".`, + e + ) }, }) }) @@ -179,13 +182,16 @@ export class UsersAndGroupsComponent this.groupsService.delete(group).subscribe({ next: () => { modal.close() - this.toastService.showInfo($localize`Deleted group`) + this.toastService.showInfo($localize`Deleted group "${group.name}"`) this.groupsService.listAll().subscribe((r) => { this.groups = r.results }) }, error: (e) => { - this.toastService.showError($localize`Error deleting group.`, e) + this.toastService.showError( + $localize`Error deleting group "${group.name}".`, + e + ) }, }) }) 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 8b2a84534..229c4fd12 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 @@ -454,7 +454,9 @@ describe('DocumentDetailComponent', () => { component.save(true) expect(updateSpy).toHaveBeenCalled() expect(closeSpy).toHaveBeenCalled() - expect(toastSpy).toHaveBeenCalledWith('Document saved successfully.') + expect(toastSpy).toHaveBeenCalledWith( + 'Document "Doc 3" saved successfully.' + ) }) it('should support save without close and show success toast', () => { @@ -467,7 +469,9 @@ describe('DocumentDetailComponent', () => { component.save() expect(updateSpy).toHaveBeenCalled() expect(closeSpy).not.toHaveBeenCalled() - expect(toastSpy).toHaveBeenCalledWith('Document saved successfully.') + expect(toastSpy).toHaveBeenCalledWith( + 'Document "Doc 3" saved successfully.' + ) }) it('should show toast error on save if error occurs', () => { @@ -482,7 +486,10 @@ describe('DocumentDetailComponent', () => { component.save() expect(updateSpy).toHaveBeenCalled() expect(closeSpy).not.toHaveBeenCalled() - expect(toastSpy).toHaveBeenCalledWith('Error saving document', error) + expect(toastSpy).toHaveBeenCalledWith( + 'Error saving document "Doc 3"', + error + ) }) it('should show error toast on save but close if user can no longer edit', () => { @@ -498,7 +505,9 @@ describe('DocumentDetailComponent', () => { component.save(true) expect(updateSpy).toHaveBeenCalled() expect(closeSpy).toHaveBeenCalled() - expect(toastSpy).toHaveBeenCalledWith('Document saved successfully.') + expect(toastSpy).toHaveBeenCalledWith( + 'Document "Doc 3" saved successfully.' + ) }) it('should allow save and next', () => { 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 0378fbb97..c1a96c168 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 @@ -808,7 +808,9 @@ export class DocumentDetailComponent this.store.next(newValues) this.openDocumentService.setDirty(this.document, false) this.openDocumentService.save() - this.toastService.showInfo($localize`Document saved successfully.`) + this.toastService.showInfo( + $localize`Document "${newValues.title}" saved successfully.` + ) this.networkActive = false this.error = null if (close) { @@ -822,11 +824,16 @@ export class DocumentDetailComponent error: (error) => { this.networkActive = false if (!this.userCanEdit) { - this.toastService.showInfo($localize`Document saved successfully.`) + this.toastService.showInfo( + $localize`Document "${this.document.title}" saved successfully.` + ) close && this.close() } else { this.error = error.error - this.toastService.showError($localize`Error saving document`, error) + this.toastService.showError( + $localize`Error saving document "${this.document.title}"`, + error + ) } }, }) @@ -955,7 +962,7 @@ export class DocumentDetailComponent .subscribe({ next: () => { this.toastService.showInfo( - $localize`Reprocess operation will begin in the background. Close and re-open or reload this document after the operation has completed to see new content.` + $localize`Reprocess operation for "${this.document.title}" will begin in the background. Close and re-open or reload this document after the operation has completed to see new content.` ) if (modal) { modal.close() @@ -1315,7 +1322,7 @@ export class DocumentDetailComponent .subscribe({ next: () => { this.toastService.showInfo( - $localize`Split operation will begin in the background.` + $localize`Split operation for "${this.document.title}" will begin in the background.` ) modal.close() }, @@ -1354,7 +1361,7 @@ export class DocumentDetailComponent .subscribe({ next: () => { this.toastService.show({ - content: $localize`Rotation will begin in the background. Close and re-open the document after the operation has completed to see the changes.`, + content: $localize`Rotation of "${this.document.title}" will begin in the background. Close and re-open the document after the operation has completed to see the changes.`, delay: 8000, action: this.close.bind(this), actionName: $localize`Close`, @@ -1394,7 +1401,7 @@ export class DocumentDetailComponent .subscribe({ next: () => { this.toastService.showInfo( - $localize`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.` + $localize`Delete pages operation for "${this.document.title}" will begin in the background. Close and re-open or reload this document after the operation has completed to see the changes.` ) modal.close() }, diff --git a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.ts b/src-ui/src/app/components/manage/custom-fields/custom-fields.component.ts index 476b09106..9a17a4528 100644 --- a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.ts +++ b/src-ui/src/app/components/manage/custom-fields/custom-fields.component.ts @@ -108,13 +108,16 @@ export class CustomFieldsComponent this.customFieldsService.delete(field).subscribe({ next: () => { modal.close() - this.toastService.showInfo($localize`Deleted field`) + this.toastService.showInfo($localize`Deleted field "${field.name}"`) this.customFieldsService.clearCache() this.settingsService.initializeDisplayFields() this.reload() }, error: (e) => { - this.toastService.showError($localize`Error deleting field.`, e) + this.toastService.showError( + $localize`Error deleting field "${field.name}".`, + e + ) }, }) }) diff --git a/src-ui/src/app/components/manage/mail/mail.component.spec.ts b/src-ui/src/app/components/manage/mail/mail.component.spec.ts index 3ece18061..b9f02343d 100644 --- a/src-ui/src/app/components/manage/mail/mail.component.spec.ts +++ b/src-ui/src/app/components/manage/mail/mail.component.spec.ts @@ -214,7 +214,7 @@ describe('MailComponent', () => { deleteSpy.mockReturnValueOnce(of(true)) deleteDialog.confirm() expect(listAllSpy).toHaveBeenCalled() - expect(toastInfoSpy).toHaveBeenCalledWith('Deleted mail account') + expect(toastInfoSpy).toHaveBeenCalledWith('Deleted mail account "account1"') }) it('should support process mail account, show error if needed', () => { @@ -231,7 +231,9 @@ describe('MailComponent', () => { expect(toastErrorSpy).toHaveBeenCalled() processSpy.mockReturnValueOnce(of(true)) component.processAccount(mailAccounts[0] as MailAccount) - expect(toastInfoSpy).toHaveBeenCalledWith('Processing mail account') + expect(toastInfoSpy).toHaveBeenCalledWith( + 'Processing mail account "account1"' + ) }) it('should support edit / create mail rule, show error if needed', () => { @@ -274,14 +276,14 @@ describe('MailComponent', () => { const toastInfoSpy = jest.spyOn(toastService, 'showInfo') const listAllSpy = jest.spyOn(mailRuleService, 'listAll') deleteSpy.mockReturnValueOnce( - throwError(() => new Error('error deleting mail rule')) + throwError(() => new Error('error deleting mail rule "rule1"')) ) deleteDialog.confirm() expect(toastErrorSpy).toBeCalled() deleteSpy.mockReturnValueOnce(of(true)) deleteDialog.confirm() expect(listAllSpy).toHaveBeenCalled() - expect(toastInfoSpy).toHaveBeenCalledWith('Deleted mail rule') + expect(toastInfoSpy).toHaveBeenCalledWith('Deleted mail rule "rule1"') }) it('should support edit permissions on mail rule objects', () => { diff --git a/src-ui/src/app/components/manage/mail/mail.component.ts b/src-ui/src/app/components/manage/mail/mail.component.ts index b606a33c9..c97d7e893 100644 --- a/src-ui/src/app/components/manage/mail/mail.component.ts +++ b/src-ui/src/app/components/manage/mail/mail.component.ts @@ -200,7 +200,9 @@ export class MailComponent this.mailAccountService.delete(account).subscribe({ next: () => { modal.close() - this.toastService.showInfo($localize`Deleted mail account`) + this.toastService.showInfo( + $localize`Deleted mail account "${account.name}"` + ) this.mailAccountService.clearCache() this.mailAccountService .listAll(null, null, { full_perms: true }) @@ -210,7 +212,7 @@ export class MailComponent }, error: (e) => { this.toastService.showError( - $localize`Error deleting mail account.`, + $localize`Error deleting mail account "${account.name}".`, e ) }, @@ -221,10 +223,15 @@ export class MailComponent processAccount(account: MailAccount) { this.mailAccountService.processAccount(account).subscribe({ next: () => { - this.toastService.showInfo($localize`Processing mail account`) + this.toastService.showInfo( + $localize`Processing mail account "${account.name}"` + ) }, error: (e) => { - this.toastService.showError($localize`Error processing mail account`, e) + this.toastService.showError( + $localize`Error processing mail account "${account.name}")`, + e + ) }, }) } @@ -272,7 +279,10 @@ export class MailComponent ) }, error: (e) => { - this.toastService.showError($localize`Error toggling rule.`, e) + this.toastService.showError( + $localize`Error toggling rule "${rule.name}".`, + e + ) }, }) } @@ -291,7 +301,9 @@ export class MailComponent this.mailRuleService.delete(rule).subscribe({ next: () => { modal.close() - this.toastService.showInfo($localize`Deleted mail rule`) + this.toastService.showInfo( + $localize`Deleted mail rule "${rule.name}"` + ) this.mailRuleService.clearCache() this.mailRuleService .listAll(null, null, { full_perms: true }) @@ -300,7 +312,10 @@ export class MailComponent }) }, error: (e) => { - this.toastService.showError($localize`Error deleting mail rule.`, e) + this.toastService.showError( + $localize`Error deleting mail rule "${rule.name}".`, + e + ) }, }) }) diff --git a/src-ui/src/app/components/manage/workflows/workflows.component.ts b/src-ui/src/app/components/manage/workflows/workflows.component.ts index b1f9ff6d0..edbca44c8 100644 --- a/src-ui/src/app/components/manage/workflows/workflows.component.ts +++ b/src-ui/src/app/components/manage/workflows/workflows.component.ts @@ -142,12 +142,17 @@ export class WorkflowsComponent this.workflowService.delete(workflow).subscribe({ next: () => { modal.close() - this.toastService.showInfo($localize`Deleted workflow`) + this.toastService.showInfo( + $localize`Deleted workflow "${workflow.name}".` + ) this.workflowService.clearCache() this.reload() }, error: (e) => { - this.toastService.showError($localize`Error deleting workflow.`, e) + this.toastService.showError( + $localize`Error deleting workflow "${workflow.name}".`, + e + ) }, }) }) @@ -158,14 +163,17 @@ export class WorkflowsComponent next: () => { this.toastService.showInfo( workflow.enabled - ? $localize`Enabled workflow` - : $localize`Disabled workflow` + ? $localize`Enabled workflow "${workflow.name}"` + : $localize`Disabled workflow "${workflow.name}"` ) this.workflowService.clearCache() this.reload() }, error: (e) => { - this.toastService.showError($localize`Error toggling workflow.`, e) + this.toastService.showError( + $localize`Error toggling workflow "${workflow.name}".`, + e + ) }, }) }