Skip to content
Snippets Groups Projects
Commit 4e87ae8d authored by OZGCloud's avatar OZGCloud
Browse files

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

parents aa76d2d6 5fc725c7
No related branches found
No related tags found
No related merge requests found
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
<div class="section"> <div class="section">
<goofy-client-anhang-list-container [vorgangWithEingang]="vorgangStateResource.resource"></goofy-client-anhang-list-container> <goofy-client-anhang-list-container [vorgangWithEingang]="vorgangStateResource.resource"></goofy-client-anhang-list-container>
<goofy-client-vorgang-forwarding-container [vorgang]="vorgangStateResource.resource"></goofy-client-vorgang-forwarding-container> <goofy-client-vorgang-forwarding-container *ngIf="vorgangStateResource.resource | hasLink: vorgangWithEingangLinkRel.FORWARDING" [vorgang]="vorgangStateResource.resource" data-test-id="forwarding-container-in-vorgang"></goofy-client-vorgang-forwarding-container>
<goofy-client-wiedervorlage-list-in-vorgang-container [vorgang]="vorgangStateResource.resource"></goofy-client-wiedervorlage-list-in-vorgang-container> <goofy-client-wiedervorlage-list-in-vorgang-container *ngIf="vorgangStateResource.resource | hasLink: linkRel.WIEDERVORLAGEN" [vorgang]="vorgangStateResource.resource" data-test-id="wiedervorlagen-container-in-vorgang"></goofy-client-wiedervorlage-list-in-vorgang-container>
<goofy-client-kommentar-list-in-vorgang-container [vorgang]="vorgangStateResource.resource"></goofy-client-kommentar-list-in-vorgang-container> <goofy-client-kommentar-list-in-vorgang-container *ngIf="vorgangStateResource.resource | hasLink: linkRel.KOMMENTARE" [vorgang]="vorgangStateResource.resource" data-test-id="kommentar-container-in-vorgang"></goofy-client-kommentar-list-in-vorgang-container>
</div> </div>
</div> </div>
</ng-container> </ng-container>
\ No newline at end of file
...@@ -2,10 +2,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; ...@@ -2,10 +2,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { VorgangForwardingContainerComponent } from '@goofy-client/forwarding'; import { VorgangForwardingContainerComponent } from '@goofy-client/forwarding';
import { KommentarListInVorgangContainerComponent } from '@goofy-client/kommentar'; import { KommentarListInVorgangContainerComponent } from '@goofy-client/kommentar';
import { AnhangListContainerComponent } from '@goofy-client/ozg-file'; import { AnhangListContainerComponent } from '@goofy-client/ozg-file';
import { createEmptyStateResource, HasLinkPipe, ToEmbeddedResourcesPipe } from '@goofy-client/tech-shared'; import { createEmptyStateResource, createStateResource, HasLinkPipe, ToEmbeddedResourcesPipe } from '@goofy-client/tech-shared';
import { ButtonWithSpinnerComponent, ExpansionPanelComponent } from '@goofy-client/ui'; import { ButtonWithSpinnerComponent, ExpansionPanelComponent } from '@goofy-client/ui';
import { VorgangHeaderLinkRel, VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@goofy-client/vorgang-shared';
import { WiedervorlageListInVorgangContainerComponent } from '@goofy-client/wiedervorlage'; import { WiedervorlageListInVorgangContainerComponent } from '@goofy-client/wiedervorlage';
import { SpinnerComponent } from 'libs/ui/src/lib/ui/spinner/spinner.component'; import { SpinnerComponent } from 'libs/ui/src/lib/ui/spinner/spinner.component';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks'; import { MockComponent } from 'ng-mocks';
import { VorgangDetailAreaComponent } from './vorgang-detail-area.component'; import { VorgangDetailAreaComponent } from './vorgang-detail-area.component';
import { VorgangDetailBodyComponent } from './vorgang-detail-body/vorgang-detail-body.component'; import { VorgangDetailBodyComponent } from './vorgang-detail-body/vorgang-detail-body.component';
...@@ -16,6 +18,12 @@ describe('VorgangDetailAreaComponent', () => { ...@@ -16,6 +18,12 @@ describe('VorgangDetailAreaComponent', () => {
let component: VorgangDetailAreaComponent; let component: VorgangDetailAreaComponent;
let fixture: ComponentFixture<VorgangDetailAreaComponent>; let fixture: ComponentFixture<VorgangDetailAreaComponent>;
const wiedervorlagenContainer: string = '[data-test-id="wiedervorlagen-container-in-vorgang"]';
const kommentarContainer: string = '[data-test-id="kommentar-container-in-vorgang"]';
const forwardingContainer: string = '[data-test-id="forwarding-container-in-vorgang"]';
const vorgang: VorgangWithEingangResource = createVorgangWithEingangResource();
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ declarations: [
...@@ -46,4 +54,67 @@ describe('VorgangDetailAreaComponent', () => { ...@@ -46,4 +54,67 @@ describe('VorgangDetailAreaComponent', () => {
it('should create', () => { it('should create', () => {
expect(component).toBeTruthy(); expect(component).toBeTruthy();
}); });
describe('wiedervorlagen', () => {
it('should be visible', () => {
component.vorgangStateResource = createStateResource(createVorgangWithEingangResource([VorgangHeaderLinkRel.WIEDERVORLAGEN]));
fixture.detectChanges();
const element = fixture.nativeElement.querySelector(wiedervorlagenContainer);
expect(element).toBeInstanceOf(HTMLElement);
})
it('should be hidden', () => {
component.vorgangStateResource = createStateResource(vorgang);
fixture.detectChanges();
const element = fixture.nativeElement.querySelector(wiedervorlagenContainer);
expect(element).not.toBeInstanceOf(HTMLElement);
})
})
describe('kommentare', () => {
it('should be visible', () => {
component.vorgangStateResource = createStateResource(createVorgangWithEingangResource([VorgangHeaderLinkRel.KOMMENTARE]));
fixture.detectChanges();
const element = fixture.nativeElement.querySelector(kommentarContainer);
expect(element).toBeInstanceOf(HTMLElement);
})
it('should be hidden', () => {
component.vorgangStateResource = createStateResource(vorgang);
fixture.detectChanges();
const element = fixture.nativeElement.querySelector(kommentarContainer);
expect(element).not.toBeInstanceOf(HTMLElement);
})
})
describe('forwarding', () => {
it('should be visible', () => {
component.vorgangStateResource = createStateResource(createVorgangWithEingangResource([VorgangWithEingangLinkRel.FORWARDING]));
fixture.detectChanges();
const element = fixture.nativeElement.querySelector(forwardingContainer);
expect(element).toBeInstanceOf(HTMLElement);
})
it('should be hidden', () => {
component.vorgangStateResource = createStateResource(vorgang);
fixture.detectChanges();
const element = fixture.nativeElement.querySelector(forwardingContainer);
expect(element).not.toBeInstanceOf(HTMLElement);
})
})
}); });
import { Component, Input } from '@angular/core'; import { Component, Input } from '@angular/core';
import { StateResource } from '@goofy-client/tech-shared'; import { StateResource } from '@goofy-client/tech-shared';
import { VorgangWithEingangResource } from '@goofy-client/vorgang-shared'; import { VorgangHeaderLinkRel, VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@goofy-client/vorgang-shared';
@Component({ @Component({
selector: 'goofy-client-vorgang-detail-area', selector: 'goofy-client-vorgang-detail-area',
...@@ -10,4 +10,7 @@ import { VorgangWithEingangResource } from '@goofy-client/vorgang-shared'; ...@@ -10,4 +10,7 @@ import { VorgangWithEingangResource } from '@goofy-client/vorgang-shared';
export class VorgangDetailAreaComponent { export class VorgangDetailAreaComponent {
@Input() vorgangStateResource: StateResource<VorgangWithEingangResource>; @Input() vorgangStateResource: StateResource<VorgangWithEingangResource>;
readonly linkRel = VorgangHeaderLinkRel;
readonly vorgangWithEingangLinkRel = VorgangWithEingangLinkRel;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment