Removed fatal from db error handling & improved web error handling
This commit is contained in:
@@ -1,19 +1,15 @@
|
||||
import { Component, OnDestroy, OnInit } from "@angular/core";
|
||||
import { FormBuilder, FormControl, FormGroup } from "@angular/forms";
|
||||
import { Router } from "@angular/router";
|
||||
import { TranslateService } from "@ngx-translate/core";
|
||||
import { debounceTime, Subject, throwError } from "rxjs";
|
||||
import { ConfirmationDialogService } from "src/app/services/confirmation-dialog/confirmation-dialog.service";
|
||||
import { DataService } from "src/app/services/data/data.service";
|
||||
import { SpinnerService } from "src/app/services/spinner/spinner.service";
|
||||
import { ToastService } from "src/app/services/toast/toast.service";
|
||||
import { Server, ServerFilter } from "../../../../../models/data/server.model";
|
||||
import { catchError, takeUntil } from "rxjs/operators";
|
||||
import { Queries } from "../../../../../models/graphql/queries.model";
|
||||
import { Page } from "../../../../../models/graphql/filter/page.model";
|
||||
import { Sort } from "../../../../../models/graphql/filter/sort.model";
|
||||
import { Query } from "../../../../../models/graphql/query.model";
|
||||
import { SidebarService } from "../../../../../services/sidebar/sidebar.service";
|
||||
import { ServerService } from "../../../../../services/server.service";
|
||||
|
||||
@Component({
|
||||
@@ -47,7 +43,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
|
||||
private spinnerService: SpinnerService,
|
||||
private fb: FormBuilder,
|
||||
private router: Router,
|
||||
private serverService: ServerService,
|
||||
private serverService: ServerService
|
||||
) {
|
||||
}
|
||||
|
||||
|
@@ -11,13 +11,14 @@ export class ErrorHandlerService implements ErrorHandler {
|
||||
|
||||
constructor(
|
||||
private auth: AuthService,
|
||||
private toast: ToastService,
|
||||
) { }
|
||||
private toast: ToastService
|
||||
) {
|
||||
}
|
||||
|
||||
handleError(error: HttpErrorResponse): Observable<never> {
|
||||
if (error && error.error) {
|
||||
let message = 'Unbekannter Fehler';
|
||||
let header = 'Fehler';
|
||||
let message = "Unbekannter Fehler";
|
||||
let header = "Fehler";
|
||||
const errorDto: ErrorDTO = error.error;
|
||||
|
||||
if (errorDto.errorCode === ServiceErrorCode.Unauthorized) {
|
||||
@@ -26,7 +27,7 @@ export class ErrorHandlerService implements ErrorHandler {
|
||||
}
|
||||
|
||||
if (errorDto.errorCode !== undefined) {
|
||||
header = 'Fehlercode: ' + errorDto.errorCode;
|
||||
header = "Fehlercode: " + errorDto.errorCode;
|
||||
}
|
||||
|
||||
if (errorDto.message) {
|
||||
@@ -37,6 +38,7 @@ export class ErrorHandlerService implements ErrorHandler {
|
||||
|
||||
this.toast.error(header, message);
|
||||
} else {
|
||||
this.toast.error("ERROR", error.message);
|
||||
console.error(error.message);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user