Skip to content
Snippets Groups Projects
Commit 303e94de authored by OZGCloud's avatar OZGCloud
Browse files

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

# Conflicts:
#	goofy-client/libs/postfach/src/lib/postfach-page-container/postfach-page/postfach-page.component.spec.ts
parents 8f2b637e b6375716
No related branches found
No related tags found
No related merge requests found
Showing
with 49 additions and 20 deletions
......@@ -10,5 +10,5 @@ export class OutgoingMailComponent {
@Input() postfachMail: PostfachMailResource;
postfachMailLinkRel = PostfachMailLinkRel;
readonly postfachMailLinkRel = PostfachMailLinkRel;
}
<pre>{{ postfachMail | json }}</pre>
<goofy-client-user-profile-in-postfach-mail-container *ngIf="postfachMail | hasLink: postfachMailLinkRel.CREATED_BY"
data-test-id="mail-user-profile"
[postfachMail]="postfachMail">
</goofy-client-user-profile-in-postfach-mail-container>
<div>{{ postfachMail.subject }}</div>
<div>{{ postfachMail.mailBody }}</div>
:host {
display: flex;
flex-direction: column;
width: 100%;
border-bottom: 1px solid rgb(0 0 0 / 8%);
padding: 16px 24px 16px 28px;
}
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { PostfachPageMailComponent } from './postfach-page-mail.component';
import { MockComponent } from 'ng-mocks';
import { UserProfileInPostfachMailContainerComponent } from '@goofy-client/user-profile';
import { HasLinkPipe } from '@goofy-client/tech-shared';
import { createPostfachMailResource } from '../../../../../../../postfach-shared/test/postfach';
describe('PostfachPageMailComponent', () => {
let component: PostfachPageMailComponent;
......@@ -8,7 +12,11 @@ describe('PostfachPageMailComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ PostfachPageMailComponent ]
declarations: [
PostfachPageMailComponent,
MockComponent(UserProfileInPostfachMailContainerComponent),
HasLinkPipe
]
})
.compileComponents();
});
......@@ -16,6 +24,7 @@ describe('PostfachPageMailComponent', () => {
beforeEach(() => {
fixture = TestBed.createComponent(PostfachPageMailComponent);
component = fixture.componentInstance;
component.postfachMail = createPostfachMailResource();
fixture.detectChanges();
});
......
import { Component, Input, OnInit } from '@angular/core';
import { PostfachMailResource } from '@goofy-client/postfach-shared';
import { PostfachMailLinkRel, PostfachMailResource } from '@goofy-client/postfach-shared';
@Component({
selector: 'goofy-client-postfach-page-mail',
......@@ -10,6 +10,8 @@ export class PostfachPageMailComponent implements OnInit {
@Input() postfachMail: PostfachMailResource;
readonly postfachMailLinkRel = PostfachMailLinkRel;
constructor() { }
ngOnInit(): void {
......
<goofy-client-subnavigation></goofy-client-subnavigation>
<goofy-client-subnavigation>
<a routerLink="../" mat-icon-button data-test-id="back-button" class="back-button" aria-label="back button with arrow icon" matTooltip="zurück zur Detailseite">
<mat-icon>arrow_back</mat-icon>
</a>
</goofy-client-subnavigation>
<goofy-client-vorgang-in-postfach-breadcrumb-container></goofy-client-vorgang-in-postfach-breadcrumb-container>
......
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatIcon } from '@angular/material/icon';
import { SubnavigationComponent } from '@goofy-client/ui';
import { VorgangInPostfachBreadcrumbContainerComponent } from '@goofy-client/vorgang-shared';
import { MockComponent } from 'ng-mocks';
......@@ -13,6 +14,7 @@ describe('PostfachPageComponent', () => {
await TestBed.configureTestingModule({
declarations: [
PostfachPageComponent,
MatIcon,
MockComponent(SubnavigationComponent),
MockComponent(PostfachPageMailListComponent),
MockComponent(VorgangInPostfachBreadcrumbContainerComponent)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment