smokephil/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-12-11 17:17:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Improved error notifications

Browse source
This commit is contained in:
shamoon 2023-08-23 23:50:54 -07:00
parent 0ef3a141a8
commit 423e0768f9
14 changed files with 296 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src-ui/src/app/components/manage/management-list/management-list.component.ts
View file

@ -148,8 +148,7 @@ export abstract class ManagementListComponent<T extends ObjectWithId>
activeModal.componentInstance.failed.subscribe((e) => {
this.toastService.showError(
$localize`Error occurred while creating ${this.typeName}.`,
10000,
JSON.stringify(e)
e
)
})
}
@ -169,8 +168,7 @@ export abstract class ManagementListComponent<T extends ObjectWithId>
activeModal.componentInstance.failed.subscribe((e) => {
this.toastService.showError(
$localize`Error occurred while saving ${this.typeName}.`,
10000,
JSON.stringify(e)
e
)
})
}
@ -194,20 +192,19 @@ export abstract class ManagementListComponent<T extends ObjectWithId>
activeModal.componentInstance.btnCaption = $localize`Delete`
activeModal.componentInstance.confirmClicked.subscribe(() => {
activeModal.componentInstance.buttonsEnabled = false
this.service.delete(object).subscribe(
(_) => {
this.service.delete(object).subscribe({
next: () => {
activeModal.close()
this.reloadData()
},
(error) => {
error: (error) => {
activeModal.componentInstance.buttonsEnabled = true
this.toastService.showError(
$localize`Error while deleting element: ${JSON.stringify(
error.error
)}`
$localize`Error while deleting element`,
error
)
}
)
},
})
})
}

66
src-ui/src/app/components/manage/settings/settings.component.ts
View file

@ -276,18 +276,13 @@ export class SettingsComponent
error: (e) => {
this.toastService.showError(
$localize`Error retrieving groups`,
10000,
JSON.stringify(e)
e
)
},
})
},
error: (e) => {
this.toastService.showError(
$localize`Error retrieving users`,
10000,
JSON.stringify(e)
)
this.toastService.showError($localize`Error retrieving users`, e)
},
})
} else if (
@ -312,8 +307,7 @@ export class SettingsComponent
error: (e) => {
this.toastService.showError(
$localize`Error retrieving mail rules`,
10000,
JSON.stringify(e)
e
)
},
})
@ -321,8 +315,7 @@ export class SettingsComponent
error: (e) => {
this.toastService.showError(
$localize`Error retrieving mail accounts`,
10000,
JSON.stringify(e)
e
)
},
})
@ -646,8 +639,7 @@ export class SettingsComponent
error: (error) => {
this.toastService.showError(
$localize`An error occurred while saving settings.`,
10000,
JSON.stringify(error)
error
)
},
})
@ -682,8 +674,7 @@ export class SettingsComponent
(error) => {
this.toastService.showError(
$localize`Error while storing settings on server.`,
10000,
JSON.stringify(error)
error
)
}
)
@ -742,11 +733,7 @@ export class SettingsComponent
modal.componentInstance.failed
.pipe(takeUntil(this.unsubscribeNotifier))
.subscribe((e) => {
this.toastService.showError(
$localize`Error saving user.`,
10000,
JSON.stringify(e)
)
this.toastService.showError($localize`Error saving user.`, e)
})
}
@ -771,11 +758,7 @@ export class SettingsComponent
})
},
error: (e) => {
this.toastService.showError(
$localize`Error deleting user.`,
10000,
JSON.stringify(e)
)
this.toastService.showError($localize`Error deleting user.`, e)
},
})
})
@ -802,11 +785,7 @@ export class SettingsComponent
modal.componentInstance.failed
.pipe(takeUntil(this.unsubscribeNotifier))
.subscribe((e) => {
this.toastService.showError(
$localize`Error saving group.`,
10000,
JSON.stringify(e)
)
this.toastService.showError($localize`Error saving group.`, e)
})
}
@ -831,11 +810,7 @@ export class SettingsComponent
})
},
error: (e) => {
this.toastService.showError(
$localize`Error deleting group.`,
10000,
JSON.stringify(e)
)
this.toastService.showError($localize`Error deleting group.`, e)
},
})
})
@ -869,11 +844,7 @@ export class SettingsComponent
modal.componentInstance.failed
.pipe(takeUntil(this.unsubscribeNotifier))
.subscribe((e) => {
this.toastService.showError(
$localize`Error saving account.`,
10000,
JSON.stringify(e)
)
this.toastService.showError($localize`Error saving account.`, e)
})
}
@ -901,8 +872,7 @@ export class SettingsComponent
error: (e) => {
this.toastService.showError(
$localize`Error deleting mail account.`,
10000,
JSON.stringify(e)
e
)
},
})
@ -932,11 +902,7 @@ export class SettingsComponent
modal.componentInstance.failed
.pipe(takeUntil(this.unsubscribeNotifier))
.subscribe((e) => {
this.toastService.showError(
$localize`Error saving rule.`,
10000,
JSON.stringify(e)
)
this.toastService.showError($localize`Error saving rule.`, e)
})
}
@ -962,11 +928,7 @@ export class SettingsComponent
})
},
error: (e) => {
this.toastService.showError(
$localize`Error deleting mail rule.`,
10000,
JSON.stringify(e)
)
this.toastService.showError($localize`Error deleting mail rule.`, e)
},
})
})