WIP multi error messages

pull/8/head
FlayInAHook 4 years ago
parent 89089959af
commit 419b0bf70a

@ -66,6 +66,7 @@ import { SelectObjectDialogComponent } from './components/select-object-dialog/s
import { AutocompleteSelectComponent } from './components/autocomplete-select/autocomplete-select.component'; import { AutocompleteSelectComponent } from './components/autocomplete-select/autocomplete-select.component';
import { LendingStationComponent } from './pages/dataPages/lending-station/lending-station.component'; import { LendingStationComponent } from './pages/dataPages/lending-station/lending-station.component';
import { ProfileComponent } from './pages/profile/profile.component'; import { ProfileComponent } from './pages/profile/profile.component';
import { ErrorSnackbarComponent, SnackbarDialog } from './helper/snackbar-ref.component';
@ -96,6 +97,8 @@ import { ProfileComponent } from './pages/profile/profile.component';
AutocompleteSelectComponent, AutocompleteSelectComponent,
LendingStationComponent, LendingStationComponent,
ProfileComponent, ProfileComponent,
ErrorSnackbarComponent,
SnackbarDialog
], ],
imports: [ imports: [
BrowserModule, BrowserModule,

@ -0,0 +1,5 @@
<h1 mat-dialog-title>Dialog with elements</h1>
<div mat-dialog-content>This dialog showcases the title, close, content and actions elements.</div>
<div mat-dialog-actions>
<button mat-button mat-dialog-close>Close</button>
</div>

@ -0,0 +1,35 @@
import { Component, Inject } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
import { MAT_SNACK_BAR_DATA, MatSnackBarRef } from '@angular/material/snack-bar';
@Component({
selector: 'app-error-snackbar',
template: `
<p>{{ data.message }}</p>
<button mat-raised-button
color="accent"
(click)="actionAndDismiss()">{{ data.action }}</button>
`,
})
export class ErrorSnackbarComponent {
constructor(
public snackBarRef: MatSnackBarRef<ErrorSnackbarComponent>,
public dialog: MatDialog,
@Inject(MAT_SNACK_BAR_DATA) public data: any,
) {}
public actionAndDismiss(){
console.log("test");
this.dialog.open(SnackbarDialog);
this.snackBarRef.dismiss()
}
}
@Component({
selector: 'app-snackbar-dialog',
templateUrl: 'snackbar-dialog.html',
})
export class SnackbarDialog {}

@ -39,12 +39,11 @@ export class TokenInterceptor implements HttpInterceptor {
break; break;
default: default:
errorMessage = `${error.error.message}. Error Code: ${error.status}.`; errorMessage = this.serverErrorMessageGenerator(error);
break; break;
} }
} else } else if (error.status === 401) {
if (error.status === 401) {
var urlSplit : string[] = error.url.split("/"); var urlSplit : string[] = error.url.split("/");
if (urlSplit[3] === "users" && urlSplit[5] === "update"){ // Allow user pw updates to be processed correctly if (urlSplit[3] === "users" && urlSplit[5] === "update"){ // Allow user pw updates to be processed correctly
errorMessage = "Das aktuelle Passwort ist inkorrekt."; errorMessage = "Das aktuelle Passwort ist inkorrekt.";
@ -52,14 +51,29 @@ export class TokenInterceptor implements HttpInterceptor {
return this.handle401Error(request, next); return this.handle401Error(request, next);
} }
} else { } else {
errorMessage = `${error.error.message}. Error Code: ${error.status}.`; errorMessage = this.serverErrorMessageGenerator(error);
} }
} }
this.snackBar.openSnackBar(errorMessage, "Ok", true); if (errorMessage === "Viele Fehler sind aufgetreten.") {
this.snackBar.openSnackBar(errorMessage, "Erweitert", true, error.error.errors);
} else {
this.snackBar.openSnackBar(errorMessage, "Ok", true);
}
return throwError(errorMessage); return throwError(errorMessage);
})); }));
} }
private serverErrorMessageGenerator (error: HttpErrorResponse): string {
if (error.error.message === undefined){
return "Viele Fehler sind aufgetreten." // If you change this you have to change it over this aswell
} else {
`${error.error.message}. Fehlercode: ${error.status}.`;
}
}
private addToken(request: HttpRequest<any>, token: string) { private addToken(request: HttpRequest<any>, token: string) {
return request.clone({ return request.clone({
setHeaders: { setHeaders: {

@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import {MatSnackBar} from '@angular/material/snack-bar'; import {MatSnackBar} from '@angular/material/snack-bar';
import { ErrorSnackbarComponent } from '../helper/snackbar-ref.component';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
@ -9,15 +10,26 @@ export class SnackBarService {
constructor(private snackBar : MatSnackBar) { } constructor(private snackBar : MatSnackBar) { }
openSnackBar(message: string, action: string = "", error: boolean = false) { openSnackBar(message: string, action: string = "", error: boolean = false, errorMessageArray: Object[] = undefined) {
if (error){ if (error){
this.snackBar.open(message, action, { if (errorMessageArray === undefined){
duration: 5000, this.snackBar.open(message, action, {
panelClass: ['mat-toolbar', 'mat-warn', 'simple-snack-bar'] duration: 5000,
}); panelClass: ['mat-toolbar', 'mat-warn', 'simple-snack-bar']
});
} else {
this.snackBar.openFromComponent(ErrorSnackbarComponent, {
data: {
"message" : message,
"action" : action,
},
panelClass: ['mat-toolbar', 'mat-warn', 'simple-snack-bar'],
duration: 5000
});
}
} else { } else {
this.snackBar.open(message, action, { this.snackBar.open(message, action, {
duration: 5000, duration: 2000,
panelClass: ['mat-toolbar', 'mat-primary', 'simple-snack-bar'] panelClass: ['mat-toolbar', 'mat-primary', 'simple-snack-bar']
}); });
} }

Loading…
Cancel
Save