From 201b3d38be842da01b40157b775a3218f7b31e6b Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Mon, 3 Feb 2025 19:38:43 +0100
Subject: [PATCH] OZG-7474 adjust linkRel: forwarding -> forwardByEmail
---
.../src/lib/forwarding.repository.spec.ts | 6 ++----
.../src/lib/forwarding.repository.ts | 4 ++--
.../vorgang-forwarding-container.component.html | 10 ++--------
...rgang-forwarding-container.component.spec.ts | 15 +++++----------
.../vorgang-forwarding-container.component.ts | 17 ++++++-----------
.../vorgang-detail-area.component.html | 2 +-
.../vorgang-detail-area.component.spec.ts | 2 +-
.../vorgang-shared/src/lib/vorgang.linkrel.ts | 2 +-
8 files changed, 20 insertions(+), 38 deletions(-)
diff --git a/alfa-client/libs/forwarding-shared/src/lib/forwarding.repository.spec.ts b/alfa-client/libs/forwarding-shared/src/lib/forwarding.repository.spec.ts
index f675f96336..34a7bd065f 100644
--- a/alfa-client/libs/forwarding-shared/src/lib/forwarding.repository.spec.ts
+++ b/alfa-client/libs/forwarding-shared/src/lib/forwarding.repository.spec.ts
@@ -43,9 +43,7 @@ describe('ForwardingRepository', () => {
});
describe('getForwardings', () => {
- const vorgang: VorgangWithEingangResource = createVorgangWithEingangResource([
- VorgangWithEingangLinkRel.FORWARDING,
- ]);
+ const vorgang: VorgangWithEingangResource = createVorgangWithEingangResource([VorgangWithEingangLinkRel.FORWARD_BY_EMAIL]);
const commandList: ForwardingListResource = createForwardingListResource();
beforeEach(() => {
@@ -61,7 +59,7 @@ describe('ForwardingRepository', () => {
it('should call resourceWrapper', () => {
repository.getForwardings(vorgang);
- expect(resourceWrapper.get).toHaveBeenCalledWith(VorgangWithEingangLinkRel.FORWARDING);
+ expect(resourceWrapper.get).toHaveBeenCalledWith(VorgangWithEingangLinkRel.FORWARD_BY_EMAIL);
});
it('should return result', () => {
diff --git a/alfa-client/libs/forwarding-shared/src/lib/forwarding.repository.ts b/alfa-client/libs/forwarding-shared/src/lib/forwarding.repository.ts
index 33d6a4d7a9..a83ca3536d 100644
--- a/alfa-client/libs/forwarding-shared/src/lib/forwarding.repository.ts
+++ b/alfa-client/libs/forwarding-shared/src/lib/forwarding.repository.ts
@@ -21,8 +21,8 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { Injectable } from '@angular/core';
import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { Injectable } from '@angular/core';
import { ResourceFactory } from '@ngxp/rest';
import { Observable } from 'rxjs';
import { ForwardingListResource } from './forwarding.model';
@@ -32,6 +32,6 @@ export class ForwardingRepository {
constructor(private resourceFactory: ResourceFactory) {}
public getForwardings(vorgang: VorgangWithEingangResource): Observable<ForwardingListResource> {
- return this.resourceFactory.from(vorgang).get(VorgangWithEingangLinkRel.FORWARDING);
+ return this.resourceFactory.from(vorgang).get(VorgangWithEingangLinkRel.FORWARD_BY_EMAIL);
}
}
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.html b/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.html
index 435e66f601..2698ddc7e7 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.html
+++ b/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.html
@@ -23,20 +23,14 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
-<ng-container
- *ngIf="
- (vorgang | hasLink: vorgangLinkRel.FORWARD) || (vorgang | hasLink: vorgangLinkRel.FORWARDING)
- "
->
+<ng-container *ngIf="(vorgang | hasLink: vorgangLinkRel.FORWARD) || (vorgang | hasLink: vorgangLinkRel.FORWARD_BY_EMAIL)">
<ozgcloud-expansion-panel
headline="Vorgang weiterleiten"
data-test-id="forwarding"
*ngIf="forwardingStateResources$ | async as forwardingStateResources"
>
<ozgcloud-spinner [stateResource]="forwardingStateResources">
- <alfa-vorgang-forwarding-info-list
- [forwardingList]="forwardingStateResources"
- ></alfa-vorgang-forwarding-info-list>
+ <alfa-vorgang-forwarding-info-list [forwardingList]="forwardingStateResources"></alfa-vorgang-forwarding-info-list>
</ozgcloud-spinner>
<alfa-vorgang-forward-formular
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.spec.ts b/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.spec.ts
index 33d4a94562..25691e2e36 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.spec.ts
@@ -21,18 +21,15 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { UntypedFormBuilder } from '@angular/forms';
import { ForwardingService } from '@alfa-client/forwarding-shared';
import { createStateResource, HasLinkPipe } from '@alfa-client/tech-shared';
import { mock } from '@alfa-client/test-utils';
import { ExpansionPanelComponent, SpinnerComponent } from '@alfa-client/ui';
import { VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { UntypedFormBuilder } from '@angular/forms';
import { createCommandResource } from 'libs/command-shared/test/command';
-import {
- createVorgangForwardRequest,
- createVorgangWithEingangResource,
-} from 'libs/vorgang-shared/test/vorgang';
+import { createVorgangForwardRequest, createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
import { VorgangForwardFormService } from './vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice';
@@ -127,7 +124,7 @@ describe('VorgangForwardingContainerComponent', () => {
});
it('should call service get forward commands', () => {
- component.vorgang = createVorgangWithEingangResource([VorgangWithEingangLinkRel.FORWARDING]);
+ component.vorgang = createVorgangWithEingangResource([VorgangWithEingangLinkRel.FORWARD_BY_EMAIL]);
fixture.detectChanges();
component.getForwardings();
@@ -150,9 +147,7 @@ describe('VorgangForwardingContainerComponent', () => {
describe('forwarding', () => {
describe('on forwarding link', () => {
it('should show if exists', () => {
- component.vorgang = createVorgangWithEingangResource([
- VorgangWithEingangLinkRel.FORWARDING,
- ]);
+ component.vorgang = createVorgangWithEingangResource([VorgangWithEingangLinkRel.FORWARD_BY_EMAIL]);
fixture.detectChanges();
const element = fixture.nativeElement.querySelector(forwarding);
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.ts b/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.ts
index e9aedf3441..9613957552 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.ts
@@ -21,11 +21,11 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { Component, Input, OnChanges } from '@angular/core';
import { CommandResource } from '@alfa-client/command-shared';
import { ForwardingListResource, ForwardingService } from '@alfa-client/forwarding-shared';
import { createEmptyStateResource, StateResource } from '@alfa-client/tech-shared';
import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { Component, Input, OnChanges } from '@angular/core';
import { hasLink } from '@ngxp/rest';
import { CommandLinkRel } from 'libs/command-shared/src/lib/command.linkrel';
import { Observable, of } from 'rxjs';
@@ -40,12 +40,9 @@ import { VorgangForwardFormService } from './vorgang-forward-formular/vorgang-fo
export class VorgangForwardingContainerComponent implements OnChanges {
@Input() public vorgang: VorgangWithEingangResource;
- forwardingStateResources$: Observable<StateResource<ForwardingListResource>> = of(
- createEmptyStateResource<ForwardingListResource>(),
- );
- pendingForwardStateResource$: Observable<StateResource<CommandResource>> = of(
- createEmptyStateResource<CommandResource>(),
- );
+ forwardingStateResources$: Observable<StateResource<ForwardingListResource>> =
+ of(createEmptyStateResource<ForwardingListResource>());
+ pendingForwardStateResource$: Observable<StateResource<CommandResource>> = of(createEmptyStateResource<CommandResource>());
readonly linkRel = CommandLinkRel;
readonly vorgangLinkRel = VorgangWithEingangLinkRel;
@@ -67,7 +64,7 @@ export class VorgangForwardingContainerComponent implements OnChanges {
}
getForwardings(): void {
- if (hasLink(this.vorgang, VorgangWithEingangLinkRel.FORWARDING)) {
+ if (hasLink(this.vorgang, VorgangWithEingangLinkRel.FORWARD_BY_EMAIL)) {
this.forwardingStateResources$ = this.forwardingService.getForwardings(this.vorgang);
}
}
@@ -77,8 +74,6 @@ export class VorgangForwardingContainerComponent implements OnChanges {
}
submit(): void {
- this.pendingForwardStateResource$ = <Observable<StateResource<CommandResource>>>(
- this.formService.submit()
- );
+ this.pendingForwardStateResource$ = <Observable<StateResource<CommandResource>>>this.formService.submit();
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
index 9c2c2212dc..bc73d5f4c8 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.html
@@ -58,7 +58,7 @@
</div>
<div class="two-column">
- <div class="section" *ngIf="vorgangResource | hasLink: vorgangWithEingangLinkRel.FORWARDING">
+ <div class="section" *ngIf="vorgangResource | hasLink: vorgangWithEingangLinkRel.FORWARD_BY_EMAIL">
<alfa-vorgang-forwarding-container
[vorgang]="vorgangResource"
data-test-id="forwarding-container-in-vorgang"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.spec.ts
index 523eb42b38..79d55a0dd7 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.spec.ts
@@ -192,7 +192,7 @@ describe('VorgangDetailAreaComponent', () => {
describe('forwarding', () => {
it('should be visible', () => {
component.vorgangStateResource = createStateResource(
- createVorgangWithEingangResource([VorgangWithEingangLinkRel.FORWARDING]),
+ createVorgangWithEingangResource([VorgangWithEingangLinkRel.FORWARD_BY_EMAIL]),
);
fixture.detectChanges();
diff --git a/alfa-client/libs/vorgang-shared/src/lib/vorgang.linkrel.ts b/alfa-client/libs/vorgang-shared/src/lib/vorgang.linkrel.ts
index f36fa5e7f8..81efa35cbd 100644
--- a/alfa-client/libs/vorgang-shared/src/lib/vorgang.linkrel.ts
+++ b/alfa-client/libs/vorgang-shared/src/lib/vorgang.linkrel.ts
@@ -49,7 +49,7 @@ export enum VorgangWithEingangLinkRel {
ATTACHMENTS = 'attachments',
FORWARD = 'forward',
- FORWARDING = 'forwarding',
+ FORWARD_BY_EMAIL = 'forwardByEmail',
FORWARD_BY_OZGCLOUD = 'forwardByOzgCloud',
PENDING_COMMANDS = 'pending-commands',
ASSIGN = 'assign',
--
GitLab