Merge branch 'master' of git.ozg-sh.de:mgm/goofy

goofy-client/libs/command-shared/src/lib/command.model.ts

@@ -21,5 +21,6 @@ export interface CommandListResource extends ListResource { }
 export enum CommandStatus {
 	FINISHED = 'FINISHED',
 	PENDING = 'PENDING',
-	REVOKED = 'REVOKED'
+	REVOKED = 'REVOKED',
+	ERROR = 'ERROR'
 }

goofy-client/libs/postfach-shared/src/lib/postfach.model.ts

@@ -9,7 +9,7 @@ export interface PostfachMail {
 	mailBody: string;
 	replyOption: ReplyOption;
 	sentAt: Date;
-	sentSuccessful: Boolean;
+	sentSuccessful: boolean;
 }
 
 export enum Direction {

goofy-client/libs/ui/src/lib/snackbar/snackbar.service.spec.ts

 import { MatSnackBar } from '@angular/material/snack-bar';
-import { CommandResource } from '@goofy-client/command-shared';
+import { CommandResource, CommandStatus } from '@goofy-client/command-shared';
 import { Mock, mock, useFromMock } from '@goofy-client/test-utils';
 import * as faker from 'faker';
 import { createCommandResource } from 'libs/command-shared/test/command';
@@ -50,6 +50,15 @@ describe('SnackBarService', () => {
 
 			expect(service.listenOnAfterDismissed).toHaveBeenCalled();
 		})
+
+		it('should open error snackbar when status is ERROR', () => {
+			const commandWithError = { ...commandResource, status: CommandStatus.ERROR}
+			service.show(commandWithError, message, null);
+
+			expect(snackBar.openFromComponent).toHaveBeenCalledWith(SnackbarErrorComponent, {
+				data: { message }, duration: 10000
+			});
+		});
 	})
 
 	describe('show error', () => {

goofy-client/libs/ui/src/lib/snackbar/snackbar.service.ts

 import { Injectable } from '@angular/core';
 import { MatSnackBar, MatSnackBarRef } from '@angular/material/snack-bar';
-import { CommandResource } from '@goofy-client/command-shared';
+import { CommandResource, CommandStatus } from '@goofy-client/command-shared';
 import { isNil } from 'lodash-es';
 import { Subscription } from 'rxjs';
 import { SnackbarErrorComponent } from './snackbar-error/snackbar-error.component';
@@ -16,7 +16,11 @@ export class SnackBarService {
 	constructor(private snackBar: MatSnackBar) { }
 
 	public show(commandResource: CommandResource, message: string, revokeAction?: () => void): void {
+		if (commandResource.status === CommandStatus.ERROR) {
+			this.showError(message);
+		} else {
 			this.snackBarRef = this.snackBar.openFromComponent(SnackbarComponent, { data: { message, commandResource }, duration: this.durationTime });
+		}
 		this.listenToActions(revokeAction);
 	}