Merge branch 'master' into OZG-2464_Legacy_up-download_code_entfernen

goofy-client/apps/goofy-e2e/src/components/vorgang/vorgang-item.e2e.component.ts

@@ -4,6 +4,7 @@ import { UserProfileE2EComponent } from '../user-profile/user-profile.component.
 export class VorgangListItemE2EComponent {
 
 	private readonly locatorStatus: string = 'status-text';
+	private readonly locatorPostfachStatus: string = 'postfach-status';
 	private readonly locatorWiedervorlageNextFrist: string = 'wiedervorlage-next-frist';
 	private readonly locatorWiedervorlagenList: string = 'wiedervorlagen-list-in-vorgang';
 
@@ -21,6 +22,10 @@ export class VorgangListItemE2EComponent {
 		return this.getRoot().findTestElementWithClass(this.locatorStatus);
 	}
 
+	public getPostfachStatus() {
+		return this.getRoot().findTestElementWithClass(this.locatorPostfachStatus);
+	}
+
 	public getWiedervorlageNextFrist() {
 		return this.getRoot().findTestElementWithClass(this.locatorWiedervorlageNextFrist);
 	}

goofy-client/apps/goofy-e2e/src/fixtures/kommentar/kommentar.json

@@ -2,7 +2,6 @@
 	"createdAt": {
 		"$date": "2021-03-17T08:43:52.741Z"
 	},
-	"createdBy": "",
-	"createdByName": "Karl Kommentar",
+	"createdBy": "Karl Kommentar",
 	"text": "Test text to test the test text test"
 }
\ No newline at end of file

goofy-client/apps/goofy-e2e/src/integration/main-tests/postfach-mail/postfach-mail.e2e-spec.ts

@@ -60,6 +60,12 @@ describe('PostfachMail', () => {
 		dropCollections();
 	})
 
+	describe('mail icon', () => {
+		it('should not be visible', () => {
+			notExist(vorgangList.getListItem(vorgang.name).getPostfachStatus());
+		})
+	})
+
 	describe('navigate to vorgang detail', () => {
 
 		it('should open vorgang detail', () => {
@@ -297,6 +303,12 @@ describe('PostfachMail', () => {
 				exist(vorgangList.getRoot());
 			})
 		})
+
+		describe('mail icon', () => {
+			it('should be visible', () => {
+				exist(vorgangList.getListItem(vorgang.name).getPostfachStatus());
+			})
+		})
 	})
 
 	describe('navigate to vorgang detail', () => {

goofy-client/apps/goofy-e2e/src/model/kommentar.ts

@@ -3,6 +3,5 @@ import { DateE2E } from './util';
 export class KommentarE2E {
 	createdAt: DateE2E;
 	createdBy: string;
-	createdByName: string;
 	text: string;
 }
\ No newline at end of file

goofy-client/apps/goofy-e2e/src/model/vorgang.ts

@@ -36,6 +36,7 @@ export class VorgangE2E {
 	kommentars: KommentarE2E[];
 	assignedTo: ResourceUriE2E;
 	clientAttributes: ClientAttributesE2E;
+	hasPostfachNachricht: boolean;
 }
 
 export class EingangE2E {

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

@@ -3,7 +3,7 @@ import { ListResource } from '@goofy-client/tech-shared';
 import { Resource } from '@ngxp/rest';
 
 export interface Kommentar {
-	createdByName: string;
+	createdBy: string;
 	createdAt: Date;
 	text: string;
 }

goofy-client/libs/kommentar-shared/test/kommentar.ts

@@ -8,7 +8,7 @@ export function createKommentar(): Kommentar {
 	return {
 		text: faker.random.words(10),
 		createdAt: faker.date.past(),
-		createdByName: faker.random.words(2)
+		createdBy: faker.random.words(2)
 	}
 }
 

goofy-client/libs/ui/src/lib/assets/mail.svg

+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 14H4V8l8 5 8-5v10zm-8-7L4 6h16l-8 5z"/></svg>
\ No newline at end of file

goofy-client/libs/ui/src/lib/icon/icon.model.ts

@@ -6,5 +6,6 @@ export enum Icons {
 	no_reply = 'no_reply',
 	assignment_ind =  'assignment_ind',
 	az = 'az',
-	nr = 'nr'
+	nr = 'nr',
+	mail = 'mail'
 }

goofy-client/libs/vorgang-shared-ui/src/index.ts

 export * from './lib/aktenzeichen/aktenzeichen.component';
 export * from './lib/vorgang-in-postfach-breadcrumb-container/vorgang-in-postfach-breadcrumb-container.component';
 export * from './lib/vorgang-nummer/vorgang-nummer.component';
+export * from './lib/vorgang-postfach-status/vorgang-postfach-status.component';
 export * from './lib/vorgang-search-container/vorgang-search-container.component';
 export * from './lib/vorgang-shared-ui.module';
 export * from './lib/vorgang-status-dot/vorgang-status-dot.component';

goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-postfach-status/vorgang-postfach-status.component.html

+<mat-icon *ngIf="vorgang.hasPostfachNachricht === true" data-test-class="postfach-status"
+	svgIcon="mail">
+</mat-icon>
\ No newline at end of file

goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-postfach-status/vorgang-postfach-status.component.spec.ts

+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatIcon } from '@angular/material/icon';
+import { MatIconTestingModule } from '@angular/material/icon/testing';
+import { getElementFromFixture } from '@goofy-client/test-utils';
+import { VorgangResource } from '@goofy-client/vorgang-shared';
+import { getDataTestClassOf } from 'libs/tech-shared/test/data-test';
+import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang';
+import { VorgangPostfachStatusComponent } from './vorgang-postfach-status.component';
+
+
+describe('VorgangPostfachStatusComponent', () => {
+	let component: VorgangPostfachStatusComponent;
+	let fixture: ComponentFixture<VorgangPostfachStatusComponent>;
+
+	const vorgang: VorgangResource = createVorgangResource();
+	const postfachStatus: string = getDataTestClassOf('postfach-status');
+
+	beforeEach(async () => {
+		await TestBed.configureTestingModule({
+			declarations: [
+				MatIcon,
+				VorgangPostfachStatusComponent
+			],
+			imports: [
+				MatIconTestingModule,
+			],
+		}).compileComponents();
+	});
+
+	beforeEach(() => {
+		fixture = TestBed.createComponent(VorgangPostfachStatusComponent);
+		component = fixture.componentInstance;
+		component.vorgang = vorgang;
+		fixture.detectChanges();
+	});
+
+	it('should create', () => {
+		expect(component).toBeTruthy();
+	});
+
+	describe('mail icon', () => {
+		it('should show mail icon', () => {
+			component.vorgang.hasPostfachNachricht = true;
+			fixture.detectChanges();
+
+			const icon: HTMLElement = getElementFromFixture(fixture, postfachStatus);
+
+    		expect(icon).toHaveClass('mat-icon');
+		});
+
+		it('should not show mail icon', () => {
+			component.vorgang.hasPostfachNachricht = false;
+			fixture.detectChanges();
+
+			const icon: HTMLElement = getElementFromFixture(fixture, postfachStatus);
+
+    		expect(icon).toBeNull();
+		});
+	});
+});

goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-postfach-status/vorgang-postfach-status.component.ts

+import { Component, Input } from '@angular/core';
+import { Vorgang } from '@goofy-client/vorgang-shared';
+
+@Component({
+	selector: 'goofy-client-vorgang-postfach-status',
+	templateUrl: './vorgang-postfach-status.component.html',
+	styleUrls: ['./vorgang-postfach-status.component.scss'],
+})
+export class VorgangPostfachStatusComponent {
+
+	@Input() vorgang: Vorgang;
+
+}

goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-shared-ui.module.ts

@@ -14,6 +14,7 @@ import { VorgangSearchClearButtonComponent } from './vorgang-search-container/vo
 import { VorgangSearchComponent } from './vorgang-search-container/vorgang-search/vorgang-search.component';
 import { VorgangStatusDotComponent } from './vorgang-status-dot/vorgang-status-dot.component';
 import { VorgangStatusTextComponent } from './vorgang-status-text/vorgang-status-text.component';
+import { VorgangPostfachStatusComponent } from './vorgang-postfach-status/vorgang-postfach-status.component';
 
 @NgModule({
 	imports: [
@@ -34,6 +35,7 @@ import { VorgangStatusTextComponent } from './vorgang-status-text/vorgang-status
 		VorgangSearchClearButtonComponent,
 		VorgangNummerComponent,
 		VorgangStatusTextComponent,
+		VorgangPostfachStatusComponent,
 	],
 	exports: [
 		VorgangSearchContainerComponent,
@@ -43,6 +45,7 @@ import { VorgangStatusTextComponent } from './vorgang-status-text/vorgang-status
 		VorgangSearchAutocompleteOptionsContentComponent,
 		VorgangNummerComponent,
 		VorgangStatusTextComponent,
-	]
+		VorgangPostfachStatusComponent,
+	],
 })
 export class VorgangSharedUiModule {}

goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-status-dot/vorgang-status-dot.component.scss

@@ -5,7 +5,7 @@
 .dot {
 	border-radius: 50%;
 	background-color: mat.get-color-from-palette($primaryPalette);
-	margin: 0 29px 0 0;
+	margin: 0 1.75rem 0 0;
 	flex-shrink: 0;
 
 	&.angenommen,

goofy-client/libs/vorgang-shared-ui/src/test-setup.ts

 import 'jest-preset-angular/setup-jest';
+import '@testing-library/jest-dom';
 
 import { getTestBed } from '@angular/core/testing';
 import {

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

@@ -8,7 +8,8 @@ export interface Vorgang {
 	nummer: string,
 	createdAt: Date,
 	name: string,
-	nextFrist: Date
+	nextFrist: Date,
+	hasPostfachNachricht: boolean
 }
 
 export interface VorgangWithEingang extends Vorgang {

goofy-client/libs/vorgang-shared/test/vorgang.ts

@@ -10,7 +10,8 @@ export function createVorgang(): Vorgang {
 		status: faker.helpers.arrayElement([VorgangStatus.NEU, VorgangStatus.ABGESCHLOSSEN, VorgangStatus.BESCHIEDEN, VorgangStatus.VERWORFEN]),
 		aktenzeichen: faker.lorem.word(),
 		nummer: faker.lorem.word(),
-		nextFrist: faker.date.future()
+		nextFrist: faker.date.future(),
+		hasPostfachNachricht: faker.datatype.boolean()
 	}
 }
 

goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.html

@@ -10,6 +10,8 @@
 			class="status-text"></goofy-client-vorgang-status-text>
 	</div>
 
+	<goofy-client-vorgang-postfach-status class="postfach-status" [vorgang]="vorgang"></goofy-client-vorgang-postfach-status>
+
 	<div class="aktenzeichen">
 		<mat-icon svgIcon="az"></mat-icon>
 		<span class="ellipsis" goofy-client-aktenzeichen [vorgang]="vorgang"></span>