From 511c6ddbcf457a462dd6d7dbbcdbcd12a3acdf2f Mon Sep 17 00:00:00 2001
From: sebo <sebastian.bergandy@external.mgm-cp.com>
Date: Mon, 10 Mar 2025 08:22:55 +0100
Subject: [PATCH] OZG-725 rename components to by-email pattern
Sub task: OZG-7892
---
...vorgang-formular-buttons.e2e.components.ts | 2 +-
alfa-client/libs/forwarding/src/index.ts | 4 +-
...orwarding-button-container.component.html} | 4 +-
...arding-button-container.component.spec.ts} | 16 ++++----
.../forwarding-button-container.component.ts} | 6 +--
...warding-by-email-container.component.html} | 6 +--
...warding-by-email-container.component.scss} | 0
...ding-by-email-container.component.spec.ts} | 26 ++++++-------
...orwarding-by-email-container.component.ts} | 14 +++----
.../forwarding-by-email-form.component.html} | 0
.../forwarding-by-email-form.component.scss} | 0
...orwarding-by-email-form.component.spec.ts} | 22 +++++------
.../forwarding-by-email-form.component.ts} | 23 +++++-------
.../forwarding-by-email-form.service.ts} | 8 ++--
.../forwarding-by-email.formservice.spec.ts} | 10 ++---
...rwarding-by-email-formular.component.html} | 4 +-
...rwarding-by-email-formular.component.scss} | 0
...rding-by-email-formular.component.spec.ts} | 18 ++++-----
...forwarding-by-email-formular.component.ts} | 10 ++---
...warding-by-email-info-list.component.html} | 4 +-
...warding-by-email-info-list.component.scss} | 0
...ding-by-email-info-list.component.spec.ts} | 20 ++++------
...orwarding-by-email-info-list.component.ts} | 10 ++---
.../forwarding-by-email-info.component.html} | 4 +-
.../forwarding-by-email-info.component.scss} | 0
...orwarding-by-email-info.component.spec.ts} | 20 +++++-----
.../forwarding-by-email-info.component.ts} | 10 ++---
...-email-zustellen-container.component.html} | 0
...-email-zustellen-container.component.scss} | 0
...ail-zustellen-container.component.spec.ts} | 22 +++++------
...by-email-zustellen-container.component.ts} | 26 +++++--------
.../forwarding-button.component.html | 2 +-
.../forwarding/src/lib/forwarding.module.ts | 37 ++++++++-----------
...rgang-detail-action-buttons.component.html | 2 +-
...ng-detail-action-buttons.component.spec.ts | 15 ++------
.../vorgang-detail-area.component.html | 4 +-
.../vorgang-detail-area.component.spec.ts | 6 +--
...ang-detail-formular-buttons.component.html | 2 +-
...-detail-formular-buttons.component.spec.ts | 15 ++------
.../src/lib/vorgang-detail.module.ts | 28 ++------------
40 files changed, 172 insertions(+), 228 deletions(-)
rename alfa-client/libs/forwarding/src/lib/{forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.html => forwarding-button-container/forwarding-button-container.component.html} (84%)
rename alfa-client/libs/forwarding/src/lib/{forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.spec.ts => forwarding-button-container/forwarding-button-container.component.spec.ts} (79%)
rename alfa-client/libs/forwarding/src/lib/{forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.ts => forwarding-button-container/forwarding-button-container.component.ts} (84%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forwarding-container.component.html => forwarding-by-email-container/forwarding-by-email-container.component.html} (88%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.scss => forwarding-by-email-container/forwarding-by-email-container.component.scss} (100%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forwarding-container.component.spec.ts => forwarding-by-email-container/forwarding-by-email-container.component.spec.ts} (84%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forwarding-container.component.ts => forwarding-by-email-container/forwarding-by-email-container.component.ts} (84%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html => forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.html} (100%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.scss => forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.scss} (100%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts => forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.spec.ts} (83%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.ts => forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.ts} (78%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.ts => forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.service.ts} (88%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.spec.ts => forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email.formservice.spec.ts} (89%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.html => forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.html} (95%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forwarding-container.component.scss => forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.scss} (100%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.spec.ts => forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.spec.ts} (81%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.ts => forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.ts} (88%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.html => forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.html} (94%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.scss => forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.scss} (100%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.spec.ts => forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.spec.ts} (72%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.ts => forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.ts} (85%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.html => forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.html} (95%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.scss => forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.scss} (100%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.spec.ts => forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.spec.ts} (86%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.ts => forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.ts} (85%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.html => forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.html} (100%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.scss => forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.scss} (100%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.spec.ts => forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.spec.ts} (89%)
rename alfa-client/libs/forwarding/src/lib/{vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.ts => forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.ts} (76%)
diff --git a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components.ts b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components.ts
index b91293c81d..eb3c618504 100644
--- a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components.ts
+++ b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components.ts
@@ -25,7 +25,7 @@ export class VorgangFormularButtonsE2EComponent {
private readonly abschliessenButton: string = 'abschliessen-button';
private readonly annehmenButton: string = 'annehmen-button';
private readonly bearbeitenButton: string = 'bearbeiten-button';
- private readonly forwardButton: string = 'forward-by-ozgcloud-button';
+ private readonly forwardButton: string = 'forwarding-button';
private readonly bescheidenButton: string = 'bescheiden-button';
private readonly endgueltigLoeschenButton: string = 'endgueltig-loeschen-button';
private readonly loeschAnforderungZuruecknehmenButton: string = 'loesch-anforderung-zuruecknehmen-button';
diff --git a/alfa-client/libs/forwarding/src/index.ts b/alfa-client/libs/forwarding/src/index.ts
index 24d937c340..49ebdccb49 100644
--- a/alfa-client/libs/forwarding/src/index.ts
+++ b/alfa-client/libs/forwarding/src/index.ts
@@ -21,6 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-export * from './lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component';
+export * from './lib/forwarding-button-container/forwarding-button-container.component';
+export * from './lib/forwarding-by-email-container/forwarding-by-email-container.component';
export * from './lib/forwarding.module';
-export * from './lib/vorgang-forwarding-container/vorgang-forwarding-container.component';
diff --git a/alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html
similarity index 84%
rename from alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html
index 13e96065df..bdf8537e74 100644
--- a/alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.html
@@ -5,12 +5,12 @@
tooltipAriaType="aria-labelledby"
variant="ghost"
size="fit"
- dataTestId="forward-by-ozgcloud-icon-button"
+ dataTestId="forwarding-icon-button"
>
<ods-forward-vorgang-icon icon class="fill-text" />
</ods-open-dialog-button>
} @else {
- <ods-open-dialog-button label="Weiterleiten" variant="outline" dataTestId="forward-by-ozgcloud-button">
+ <ods-open-dialog-button label="Weiterleiten" variant="outline" dataTestId="forwarding-button">
<ods-forward-vorgang-icon icon class="fill-primary" />
</ods-open-dialog-button>
}
diff --git a/alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.spec.ts
similarity index 79%
rename from alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.spec.ts
index a5bb372815..64f911229d 100644
--- a/alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.spec.ts
@@ -7,18 +7,18 @@ import { ForwardVorgangIconComponent, TooltipDirective } from '@ods/system';
import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent, MockDirective } from 'ng-mocks';
-import { ForwardByOzgcloudButtonContainerComponent } from './forward-by-ozgcloud-button-container.component';
+import { ForwardingButtonContainerComponent } from './forwarding-button-container.component';
-describe('ForwardByOzgcloudButtonContainerComponent', () => {
- let component: ForwardByOzgcloudButtonContainerComponent;
- let fixture: ComponentFixture<ForwardByOzgcloudButtonContainerComponent>;
+describe('ForwardingButtonContainerComponent', () => {
+ let component: ForwardingButtonContainerComponent;
+ let fixture: ComponentFixture<ForwardingButtonContainerComponent>;
- const iconButton: string = getDataTestIdAttributeOf('forward-by-ozgcloud-icon-button');
- const button: string = getDataTestIdAttributeOf('forward-by-ozgcloud-button');
+ const iconButton: string = getDataTestIdAttributeOf('forwarding-icon-button');
+ const button: string = getDataTestIdAttributeOf('forwarding-button');
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [ForwardByOzgcloudButtonContainerComponent, HasLinkPipe],
+ imports: [ForwardingButtonContainerComponent, HasLinkPipe],
declarations: [
MockComponent(OpenDialogButtonComponent),
MockComponent(ForwardVorgangIconComponent),
@@ -26,7 +26,7 @@ describe('ForwardByOzgcloudButtonContainerComponent', () => {
],
}).compileComponents();
- fixture = TestBed.createComponent(ForwardByOzgcloudButtonContainerComponent);
+ fixture = TestBed.createComponent(ForwardingButtonContainerComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.ts
similarity index 84%
rename from alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.ts
index 0cf9083577..0f6d13f6a5 100644
--- a/alfa-client/libs/forwarding/src/lib/forward-by-ozgcloud-button-container/forward-by-ozgcloud-button-container.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-button-container/forwarding-button-container.component.ts
@@ -8,14 +8,14 @@ import { ForwardVorgangIconComponent, TooltipDirective } from '@ods/system';
import { ForwardingDialogContainerComponent } from '../forwarding-dialog-container/forwarding-dialog-container.component';
@Component({
- selector: 'alfa-forward-by-ozgcloud-button-container',
+ selector: 'alfa-forwarding-button-container',
standalone: true,
imports: [CommonModule, ForwardVorgangIconComponent, TooltipDirective, HasLinkPipe, OpenDialogButtonComponent],
- templateUrl: './forward-by-ozgcloud-button-container.component.html',
+ templateUrl: './forwarding-button-container.component.html',
providers: [{ provide: DIALOG_COMPONENT, useValue: ForwardingDialogContainerComponent }],
styles: [':host {@apply empty:hidden}'],
})
-export class ForwardByOzgcloudButtonContainerComponent {
+export class ForwardingButtonContainerComponent {
@Input() vorgangWithEingang: VorgangWithEingangResource;
@Input() showAsIconButton: boolean = false;
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.html
similarity index 88%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.html
index 2698ddc7e7..6f6b5fecf6 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.html
@@ -30,15 +30,15 @@
*ngIf="forwardingStateResources$ | async as forwardingStateResources"
>
<ozgcloud-spinner [stateResource]="forwardingStateResources">
- <alfa-vorgang-forwarding-info-list [forwardingList]="forwardingStateResources"></alfa-vorgang-forwarding-info-list>
+ <alfa-forwarding-by-email-info-list [forwardingList]="forwardingStateResources"></alfa-forwarding-by-email-info-list>
</ozgcloud-spinner>
- <alfa-vorgang-forward-formular
+ <alfa-forward-by-email-formular
data-test-id="forward-formular"
[vorgang]="vorgang"
[pendingForwardCommand]="pendingForwardStateResource$ | async"
(doSubmit)="submit()"
>
- </alfa-vorgang-forward-formular>
+ </alfa-forward-by-email-formular>
</ozgcloud-expansion-panel>
</ng-container>
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.scss b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.scss
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.scss
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.scss
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/forwarding-by-email-container/forwarding-by-email-container.component.spec.ts
similarity index 84%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.spec.ts
index 25691e2e36..a4dd016d06 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.spec.ts
@@ -32,16 +32,16 @@ import { createCommandResource } from 'libs/command-shared/test/command';
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';
-import { VorgangForwardFormularComponent } from './vorgang-forward-formular/vorgang-forward-formular.component';
-import { VorgangForwardingContainerComponent } from './vorgang-forwarding-container.component';
-import { VorgangForwardingInfoListComponent } from './vorgang-forwarding-info-list/vorgang-forwarding-info-list.component';
+import { ForwardingByEmailContainerComponent } from './forwarding-by-email-container.component';
+import { ForwardingByEmailFormService } from './forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.service';
+import { ForwardingByEmailFormularComponent } from './forwarding-by-email-formular/forwarding-by-email-formular.component';
+import { ForwardingByEmailInfoListComponent } from './forwarding-by-email-info-list/forwarding-by-email-info-list.component';
-describe('VorgangForwardingContainerComponent', () => {
- let component: VorgangForwardingContainerComponent;
- let fixture: ComponentFixture<VorgangForwardingContainerComponent>;
+describe('ForwardingByEmailContainerComponent', () => {
+ let component: ForwardingByEmailContainerComponent;
+ let fixture: ComponentFixture<ForwardingByEmailContainerComponent>;
- const formService = mock(VorgangForwardFormService);
+ const formService = mock(ForwardingByEmailFormService);
const service = mock(ForwardingService);
const forwarding: string = '[data-test-id="forwarding"]';
@@ -49,17 +49,17 @@ describe('VorgangForwardingContainerComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [
- VorgangForwardingContainerComponent,
+ ForwardingByEmailContainerComponent,
HasLinkPipe,
MockComponent(SpinnerComponent),
- MockComponent(VorgangForwardingInfoListComponent),
- MockComponent(VorgangForwardFormularComponent),
+ MockComponent(ForwardingByEmailInfoListComponent),
+ MockComponent(ForwardingByEmailFormularComponent),
MockComponent(ExpansionPanelComponent),
],
providers: [
UntypedFormBuilder,
{
- provide: VorgangForwardFormService,
+ provide: ForwardingByEmailFormService,
useValue: formService,
},
{
@@ -71,7 +71,7 @@ describe('VorgangForwardingContainerComponent', () => {
});
beforeEach(() => {
- fixture = TestBed.createComponent(VorgangForwardingContainerComponent);
+ fixture = TestBed.createComponent(ForwardingByEmailContainerComponent);
component = fixture.componentInstance;
component.pendingForwardStateResource$ = of(
createStateResource({
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.ts
similarity index 84%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.ts
index 9613957552..f38fe66d56 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-container.component.ts
@@ -29,15 +29,15 @@ 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';
-import { VorgangForwardFormService } from './vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice';
+import { ForwardingByEmailFormService } from './forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.service';
@Component({
- selector: 'alfa-vorgang-forwarding-container',
- templateUrl: './vorgang-forwarding-container.component.html',
- styleUrls: ['./vorgang-forwarding-container.component.scss'],
- providers: [VorgangForwardFormService],
+ selector: 'alfa-forwarding-by-email-container',
+ templateUrl: './forwarding-by-email-container.component.html',
+ styleUrls: ['./forwarding-by-email-container.component.scss'],
+ providers: [ForwardingByEmailFormService],
})
-export class VorgangForwardingContainerComponent implements OnChanges {
+export class ForwardingByEmailContainerComponent implements OnChanges {
@Input() public vorgang: VorgangWithEingangResource;
forwardingStateResources$: Observable<StateResource<ForwardingListResource>> =
@@ -48,7 +48,7 @@ export class VorgangForwardingContainerComponent implements OnChanges {
readonly vorgangLinkRel = VorgangWithEingangLinkRel;
constructor(
- public formService: VorgangForwardFormService,
+ public formService: ForwardingByEmailFormService,
private forwardingService: ForwardingService,
) {}
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.html
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.html
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.scss b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.scss
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.scss
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.scss
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.spec.ts
similarity index 83%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.spec.ts
index d4de767de8..a7f290dba1 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.spec.ts
@@ -32,26 +32,26 @@ import { MatInputModule } from '@angular/material/input';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
-import { VorgangForwardFormComponent } from './vorgang-forward-form.component';
-import { VorgangForwardFormService } from './vorgang-forward.formservice';
+import { ForwardingByEmailFormComponent } from './forwarding-by-email-form.component';
+import { ForwardingByEmailFormService } from './forwarding-by-email-form.service';
-describe('VorgangForwardFormComponent', () => {
- let component: VorgangForwardFormComponent;
- let fixture: ComponentFixture<VorgangForwardFormComponent>;
+describe('ForwardingByEmailFormComponent', () => {
+ let component: ForwardingByEmailFormComponent;
+ let fixture: ComponentFixture<ForwardingByEmailFormComponent>;
const form: UntypedFormGroup = new UntypedFormGroup({
- [VorgangForwardFormService.FIELD_PASSWORD]: new UntypedFormControl(null),
- [VorgangForwardFormService.FIELD_EMAIL]: new UntypedFormControl(null),
+ [ForwardingByEmailFormService.FIELD_PASSWORD]: new UntypedFormControl(null),
+ [ForwardingByEmailFormService.FIELD_EMAIL]: new UntypedFormControl(null),
});
- const formService = { ...mock(VorgangForwardFormService), form };
+ const formService = { ...mock(ForwardingByEmailFormService), form };
const vorgangWithEingang: VorgangWithEingangResource = createVorgangWithEingangResource();
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [
- VorgangForwardFormComponent,
+ ForwardingByEmailFormComponent,
MatIcon,
MockComponent(OzgcloudStrokedButtonWithSpinnerComponent),
MockComponent(OzgcloudTextEditorComponent),
@@ -59,7 +59,7 @@ describe('VorgangForwardFormComponent', () => {
imports: [MatFormFieldModule, MatInputModule, ReactiveFormsModule, BrowserAnimationsModule],
providers: [
{
- provide: VorgangForwardFormService,
+ provide: ForwardingByEmailFormService,
useValue: formService,
},
],
@@ -67,7 +67,7 @@ describe('VorgangForwardFormComponent', () => {
});
beforeEach(() => {
- fixture = TestBed.createComponent(VorgangForwardFormComponent);
+ fixture = TestBed.createComponent(ForwardingByEmailFormComponent);
component = fixture.componentInstance;
component.vorgang = vorgangWithEingang;
fixture.detectChanges();
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.ts
similarity index 78%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.ts
index 202a4fe83e..62056b7538 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component.ts
@@ -21,28 +21,28 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { UntypedFormGroup } from '@angular/forms';
import { CommandResource } from '@alfa-client/command-shared';
import { StateResource } from '@alfa-client/tech-shared';
import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
import { isNil } from 'lodash-es';
-import { VorgangForwardFormService } from './vorgang-forward.formservice';
+import { ForwardingByEmailFormService } from './forwarding-by-email-form.service';
@Component({
- selector: 'alfa-vorgang-forward-form',
- templateUrl: './vorgang-forward-form.component.html',
- styleUrls: ['./vorgang-forward-form.component.scss'],
+ selector: 'alfa-forward-by-email-form',
+ templateUrl: './forwarding-by-email-form.component.html',
+ styleUrls: ['./forwarding-by-email-form.component.scss'],
})
-export class VorgangForwardFormComponent implements OnChanges {
+export class ForwardingByEmailFormComponent implements OnChanges {
@Input() forwardStateResource: StateResource<CommandResource>;
@Input() vorgang: VorgangWithEingangResource;
@Output('doSubmit') submit: EventEmitter<void> = new EventEmitter();
- readonly formServiceClass = VorgangForwardFormService;
+ readonly formServiceClass = ForwardingByEmailFormService;
- constructor(private formService: VorgangForwardFormService) {}
+ constructor(private formService: ForwardingByEmailFormService) {}
ngOnChanges(changes: SimpleChanges) {
if (changes.vorgang && this.zustaendigeStelleEmailExists()) {
@@ -60,10 +60,7 @@ export class VorgangForwardFormComponent implements OnChanges {
}
patchEmail(): void {
- this.formService.patchField(
- VorgangForwardFormService.FIELD_EMAIL,
- this.vorgang.eingang.zustaendigeStelle.email,
- );
+ this.formService.patchField(ForwardingByEmailFormService.FIELD_EMAIL, this.vorgang.eingang.zustaendigeStelle.email);
}
get form(): UntypedFormGroup {
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.service.ts
similarity index 88%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.service.ts
index 68fc4c4a96..9cbe55ce65 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.service.ts
@@ -30,7 +30,7 @@ import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angul
import { Observable } from 'rxjs';
@Injectable()
-export class VorgangForwardFormService extends AbstractFormService<CommandResource> {
+export class ForwardingByEmailFormService extends AbstractFormService<CommandResource> {
static readonly FIELD_PATH_PREFIX = 'command.redirectRequest';
static readonly FIELD_EMAIL = 'email';
@@ -47,13 +47,13 @@ export class VorgangForwardFormService extends AbstractFormService<CommandResour
protected initForm(): UntypedFormGroup {
return this.formBuilder.group({
- [VorgangForwardFormService.FIELD_EMAIL]: new UntypedFormControl(),
- [VorgangForwardFormService.FIELD_PASSWORD]: new UntypedFormControl(),
+ [ForwardingByEmailFormService.FIELD_EMAIL]: new UntypedFormControl(),
+ [ForwardingByEmailFormService.FIELD_PASSWORD]: new UntypedFormControl(),
});
}
protected getPathPrefix(): string {
- return VorgangForwardFormService.FIELD_PATH_PREFIX;
+ return ForwardingByEmailFormService.FIELD_PATH_PREFIX;
}
public setVorgang(vorgang: VorgangResource): void {
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email.formservice.spec.ts
similarity index 89%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email.formservice.spec.ts
index bdf61274a7..a20bed0488 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email.formservice.spec.ts
@@ -21,15 +21,15 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
import { ForwardingService } from '@alfa-client/forwarding-shared';
import { mock, useFromMock } from '@alfa-client/test-utils';
+import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang';
import { of } from 'rxjs';
-import { VorgangForwardFormService } from './vorgang-forward.formservice';
+import { ForwardingByEmailFormService } from './forwarding-by-email-form.service';
-describe('VorgangForwardFormService', () => {
- let formService: VorgangForwardFormService;
+describe('ForwardingByEmailFormService', () => {
+ let formService: ForwardingByEmailFormService;
let service;
const formBuilder: UntypedFormBuilder = new UntypedFormBuilder();
@@ -37,7 +37,7 @@ describe('VorgangForwardFormService', () => {
beforeEach(() => {
service = mock(ForwardingService);
- formService = new VorgangForwardFormService(formBuilder, useFromMock(service));
+ formService = new ForwardingByEmailFormService(formBuilder, useFromMock(service));
});
it('should create', () => {
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.html
similarity index 95%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.html
index 62c2a5d4b5..b3729e2b1a 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.html
@@ -32,11 +32,11 @@
>
</ozgcloud-spinner>
-<alfa-vorgang-forward-form
+<alfa-forward-by-email-form
*ngIf="vorgang | hasLink: vorgangLinkRel.FORWARD"
data-test-id="forward-form"
[vorgang]="vorgang"
[forwardStateResource]="pendingForwardCommand"
(doSubmit)="submit.emit()"
>
-</alfa-vorgang-forward-form>
+</alfa-forward-by-email-form>
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.scss b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.scss
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-container.component.scss
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.scss
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.spec.ts
similarity index 81%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.spec.ts
index 1ae6e68ebd..cd26ff87ee 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.spec.ts
@@ -21,34 +21,34 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { ComponentFixture, TestBed } from '@angular/core/testing';
import { createEmptyStateResource, HasLinkPipe } from '@alfa-client/tech-shared';
import { SpinnerComponent } from '@alfa-client/ui';
import { VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
-import { VorgangForwardFormComponent } from './vorgang-forward-form/vorgang-forward-form.component';
-import { VorgangForwardFormularComponent } from './vorgang-forward-formular.component';
+import { ForwardingByEmailFormComponent } from './forwarding-by-email-form/forwarding-by-email-form.component';
+import { ForwardingByEmailFormularComponent } from './forwarding-by-email-formular.component';
-describe('VorgangForwardFormularComponent', () => {
- let component: VorgangForwardFormularComponent;
- let fixture: ComponentFixture<VorgangForwardFormularComponent>;
+describe('ForwardingByEmailFormularComponent', () => {
+ let component: ForwardingByEmailFormularComponent;
+ let fixture: ComponentFixture<ForwardingByEmailFormularComponent>;
const forwardFormular: string = '[data-test-id="forward-form"]';
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [
- VorgangForwardFormularComponent,
+ ForwardingByEmailFormularComponent,
HasLinkPipe,
MockComponent(SpinnerComponent),
- MockComponent(VorgangForwardFormComponent),
+ MockComponent(ForwardingByEmailFormComponent),
],
});
});
beforeEach(() => {
- fixture = TestBed.createComponent(VorgangForwardFormularComponent);
+ fixture = TestBed.createComponent(ForwardingByEmailFormularComponent);
component = fixture.componentInstance;
component.pendingForwardCommand = createEmptyStateResource();
fixture.detectChanges();
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.ts
similarity index 88%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.ts
index 087ef0833e..90359c37ba 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component.ts
@@ -21,18 +21,18 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { Component, EventEmitter, Input, Output } from '@angular/core';
import { CommandResource } from '@alfa-client/command-shared';
import { StateResource } from '@alfa-client/tech-shared';
import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
import { CommandLinkRel } from 'libs/command-shared/src/lib/command.linkrel';
@Component({
- selector: 'alfa-vorgang-forward-formular',
- templateUrl: './vorgang-forward-formular.component.html',
- styleUrls: ['./vorgang-forward-formular.component.scss'],
+ selector: 'alfa-forward-by-email-formular',
+ templateUrl: './forwarding-by-email-formular.component.html',
+ styleUrls: ['./forwarding-by-email-formular.component.scss'],
})
-export class VorgangForwardFormularComponent {
+export class ForwardingByEmailFormularComponent {
@Input() public vorgang: VorgangWithEingangResource;
@Input() public pendingForwardCommand: StateResource<CommandResource>;
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.html
similarity index 94%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.html
index a358b03574..cdaf327972 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.html
@@ -23,10 +23,10 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
-<alfa-vorgang-forwarding-info
+<alfa-forwarding-by-email-info
*ngFor="
let forwarding of forwardingList.resource | toEmbeddedResources: listLinkRel.FORWARDING_LIST
"
[forwarding]="forwarding"
>
-</alfa-vorgang-forwarding-info>
+</alfa-forwarding-by-email-info>
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.scss b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.scss
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.scss
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.scss
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.spec.ts
similarity index 72%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.spec.ts
index fcb17963b6..d4bd32a97b 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.spec.ts
@@ -21,29 +21,25 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { ComponentFixture, TestBed } from '@angular/core/testing';
import { createStateResource, ToEmbeddedResourcesPipe } from '@alfa-client/tech-shared';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
import { createCommandListResource } from 'libs/command-shared/test/command';
import { MockComponent } from 'ng-mocks';
-import { VorgangForwardingInfoListComponent } from './vorgang-forwarding-info-list.component';
-import { VorgangForwardingInfoComponent } from './vorgang-forwarding-info/vorgang-forwarding-info.component';
+import { ForwardingByEmailInfoListComponent } from './forwarding-by-email-info-list.component';
+import { ForwardingByEmailInfoComponent } from './forwarding-by-email-info/forwarding-by-email-info.component';
-describe('VorgangForwardingInfoListComponent', () => {
- let component: VorgangForwardingInfoListComponent;
- let fixture: ComponentFixture<VorgangForwardingInfoListComponent>;
+describe('ForwardingByEmailInfoListComponent', () => {
+ let component: ForwardingByEmailInfoListComponent;
+ let fixture: ComponentFixture<ForwardingByEmailInfoListComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [
- VorgangForwardingInfoListComponent,
- MockComponent(VorgangForwardingInfoComponent),
- ToEmbeddedResourcesPipe,
- ],
+ declarations: [ForwardingByEmailInfoListComponent, MockComponent(ForwardingByEmailInfoComponent), ToEmbeddedResourcesPipe],
}).compileComponents();
});
beforeEach(() => {
- fixture = TestBed.createComponent(VorgangForwardingInfoListComponent);
+ fixture = TestBed.createComponent(ForwardingByEmailInfoListComponent);
component = fixture.componentInstance;
component.forwardingList = createStateResource(createCommandListResource());
fixture.detectChanges();
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.ts
similarity index 85%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.ts
index 23c57cf9b9..8cc5127425 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component.ts
@@ -21,17 +21,17 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { Component, Input } from '@angular/core';
import { CommandListResource } from '@alfa-client/command-shared';
import { ForwardingListLinkRel } from '@alfa-client/forwarding-shared';
import { StateResource } from '@alfa-client/tech-shared';
+import { Component, Input } from '@angular/core';
@Component({
- selector: 'alfa-vorgang-forwarding-info-list',
- templateUrl: './vorgang-forwarding-info-list.component.html',
- styleUrls: ['./vorgang-forwarding-info-list.component.scss'],
+ selector: 'alfa-forwarding-by-email-info-list',
+ templateUrl: './forwarding-by-email-info-list.component.html',
+ styleUrls: ['./forwarding-by-email-info-list.component.scss'],
})
-export class VorgangForwardingInfoListComponent {
+export class ForwardingByEmailInfoListComponent {
@Input() public forwardingList: StateResource<CommandListResource>;
readonly listLinkRel = ForwardingListLinkRel;
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.html
similarity index 95%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.html
index e3fe65cb08..add6898369 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.html
@@ -42,7 +42,7 @@
Versendet am {{ forwarding.sentAt | formatDateWithTimePipe }}
</p>
- <alfa-vorgang-forward-zustellen-container
+ <alfa-forward-by-email-zustellen-container
[forwarding]="forwarding"
- ></alfa-vorgang-forward-zustellen-container>
+ ></alfa-forward-by-email-zustellen-container>
</ng-template>
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.scss b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.scss
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.scss
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.scss
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.spec.ts
similarity index 86%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.spec.ts
index 12b90483ae..c42367bfa5 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.spec.ts
@@ -21,6 +21,8 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
+import { ForwardingLinkRel } from '@alfa-client/forwarding-shared';
+import { FormatDateWithTimePipe, HasLinkPipe } from '@alfa-client/tech-shared';
import { registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/de';
import localeDeExtra from '@angular/common/locales/extra/de';
@@ -28,18 +30,16 @@ import { LOCALE_ID } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MAT_DATE_LOCALE } from '@angular/material/core';
import { MatIcon } from '@angular/material/icon';
-import { ForwardingLinkRel } from '@alfa-client/forwarding-shared';
-import { FormatDateWithTimePipe, HasLinkPipe } from '@alfa-client/tech-shared';
import { createForwardingResource } from 'libs/forwarding-shared/test/forwarding';
import { MockComponent } from 'ng-mocks';
-import { VorgangForwardZustellenContainerComponent } from '../../../vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component';
-import { VorgangForwardingInfoComponent } from './vorgang-forwarding-info.component';
+import { ForwardingByEmailZustellenContainerComponent } from '../../../forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component';
+import { ForwardingByEmailInfoComponent } from './forwarding-by-email-info.component';
registerLocaleData(localeDe, 'de', localeDeExtra);
-describe('VorgangForwardingInfoComponent', () => {
- let component: VorgangForwardingInfoComponent;
- let fixture: ComponentFixture<VorgangForwardingInfoComponent>;
+describe('ForwardingByEmailInfoComponent', () => {
+ let component: ForwardingByEmailInfoComponent;
+ let fixture: ComponentFixture<ForwardingByEmailInfoComponent>;
const errorMessage: string = '[data-test-id="forwarding-error-message"]';
const successMessage: string = '[data-test-id="forwarding-success-message"]';
@@ -47,11 +47,11 @@ describe('VorgangForwardingInfoComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [
- VorgangForwardingInfoComponent,
+ ForwardingByEmailInfoComponent,
FormatDateWithTimePipe,
MatIcon,
HasLinkPipe,
- MockComponent(VorgangForwardZustellenContainerComponent),
+ MockComponent(ForwardingByEmailZustellenContainerComponent),
],
providers: [
{ provide: LOCALE_ID, useValue: 'de' },
@@ -61,7 +61,7 @@ describe('VorgangForwardingInfoComponent', () => {
});
beforeEach(() => {
- fixture = TestBed.createComponent(VorgangForwardingInfoComponent);
+ fixture = TestBed.createComponent(ForwardingByEmailInfoComponent);
component = fixture.componentInstance;
component.forwarding = createForwardingResource();
fixture.detectChanges();
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.ts
similarity index 85%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.ts
index 3f4948987d..7c5490bb38 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component.ts
@@ -21,15 +21,15 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { Component, Input } from '@angular/core';
import { ForwardingLinkRel, ForwardingResource } from '@alfa-client/forwarding-shared';
+import { Component, Input } from '@angular/core';
@Component({
- selector: 'alfa-vorgang-forwarding-info',
- templateUrl: './vorgang-forwarding-info.component.html',
- styleUrls: ['./vorgang-forwarding-info.component.scss'],
+ selector: 'alfa-forwarding-by-email-info',
+ templateUrl: './forwarding-by-email-info.component.html',
+ styleUrls: ['./forwarding-by-email-info.component.scss'],
})
-export class VorgangForwardingInfoComponent {
+export class ForwardingByEmailInfoComponent {
@Input() public forwarding: ForwardingResource;
readonly linkRel = ForwardingLinkRel;
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.html
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.html
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.html
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.scss b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.scss
similarity index 100%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.scss
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.scss
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.spec.ts
similarity index 89%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.spec.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.spec.ts
index 46602865be..e28f66a088 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.spec.ts
@@ -21,23 +21,19 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatIcon } from '@angular/material/icon';
-import {
- ForwardingLinkRel,
- ForwardingResource,
- ForwardingService,
-} from '@alfa-client/forwarding-shared';
+import { ForwardingLinkRel, ForwardingResource, ForwardingService } from '@alfa-client/forwarding-shared';
import { HasLinkPipe } from '@alfa-client/tech-shared';
import { mock } from '@alfa-client/test-utils';
import { OzgcloudStrokedButtonWithSpinnerComponent } from '@alfa-client/ui';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatIcon } from '@angular/material/icon';
import { createForwardingResource } from 'libs/forwarding-shared/test/forwarding';
import { MockComponent } from 'ng-mocks';
-import { VorgangForwardZustellenContainerComponent } from './vorgang-forward-zustellen-container.component';
+import { ForwardingByEmailZustellenContainerComponent } from './forwarding-by-email-zustellen-container.component';
-describe('VorgangForwardZustellenContainerComponent', () => {
- let component: VorgangForwardZustellenContainerComponent;
- let fixture: ComponentFixture<VorgangForwardZustellenContainerComponent>;
+describe('ForwardingByEmailZustellenContainerComponent', () => {
+ let component: ForwardingByEmailZustellenContainerComponent;
+ let fixture: ComponentFixture<ForwardingByEmailZustellenContainerComponent>;
const forwarding: ForwardingResource = createForwardingResource();
@@ -53,7 +49,7 @@ describe('VorgangForwardZustellenContainerComponent', () => {
await TestBed.configureTestingModule({
declarations: [
HasLinkPipe,
- VorgangForwardZustellenContainerComponent,
+ ForwardingByEmailZustellenContainerComponent,
MatIcon,
MockComponent(OzgcloudStrokedButtonWithSpinnerComponent),
],
@@ -67,7 +63,7 @@ describe('VorgangForwardZustellenContainerComponent', () => {
});
beforeEach(() => {
- fixture = TestBed.createComponent(VorgangForwardZustellenContainerComponent);
+ fixture = TestBed.createComponent(ForwardingByEmailZustellenContainerComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.ts b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.ts
similarity index 76%
rename from alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.ts
rename to alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.ts
index c7aebc9901..e4d6c197b9 100644
--- a/alfa-client/libs/forwarding/src/lib/vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component.ts
@@ -21,30 +21,24 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { Component, Input } from '@angular/core';
import { CommandResource } from '@alfa-client/command-shared';
-import {
- ForwardingLinkRel,
- ForwardingResource,
- ForwardingService,
-} from '@alfa-client/forwarding-shared';
+import { ForwardingLinkRel, ForwardingResource, ForwardingService } from '@alfa-client/forwarding-shared';
import { createEmptyStateResource, StateResource } from '@alfa-client/tech-shared';
+import { Component, Input } from '@angular/core';
import { Observable, of } from 'rxjs';
@Component({
- selector: 'alfa-vorgang-forward-zustellen-container',
- templateUrl: './vorgang-forward-zustellen-container.component.html',
- styleUrls: ['./vorgang-forward-zustellen-container.component.scss'],
+ selector: 'alfa-forward-by-email-zustellen-container',
+ templateUrl: './forwarding-by-email-zustellen-container.component.html',
+ styleUrls: ['./forwarding-by-email-zustellen-container.component.scss'],
})
-export class VorgangForwardZustellenContainerComponent {
+export class ForwardingByEmailZustellenContainerComponent {
@Input() forwarding: ForwardingResource;
- public markAsSuccessCommandStateResource$: Observable<StateResource<CommandResource>> = of(
- createEmptyStateResource<CommandResource>(),
- );
- public markAsFailCommandStateResource$: Observable<StateResource<CommandResource>> = of(
- createEmptyStateResource<CommandResource>(),
- );
+ public markAsSuccessCommandStateResource$: Observable<StateResource<CommandResource>> =
+ of(createEmptyStateResource<CommandResource>());
+ public markAsFailCommandStateResource$: Observable<StateResource<CommandResource>> =
+ of(createEmptyStateResource<CommandResource>());
readonly linkRel = ForwardingLinkRel;
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
index aa520b8d99..48c6469d8a 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html
@@ -1,3 +1,3 @@
-<ods-button-with-spinner text="Weiterleiten" variant="outline" dataTestId="forward-by-ozgcloud-button">
+<ods-button-with-spinner text="Weiterleiten" variant="outline" dataTestId="forwarding-button">
<ods-forward-vorgang-icon icon class="fill-primary" />
</ods-button-with-spinner>
\ No newline at end of file
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding.module.ts b/alfa-client/libs/forwarding/src/lib/forwarding.module.ts
index 973cf7b7a1..387ac14e53 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding.module.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding.module.ts
@@ -24,22 +24,17 @@
import { CommandSharedModule } from '@alfa-client/command-shared';
import { ForwardingSharedModule } from '@alfa-client/forwarding-shared';
import { FormatDateWithTimePipe, HasLinkPipe, ToEmbeddedResourcesPipe } from '@alfa-client/tech-shared';
-import {
- ExpansionPanelComponent,
- OzgcloudStrokedButtonWithSpinnerComponent,
- OzgcloudTextEditorComponent,
- SpinnerComponent,
-} from '@alfa-client/ui';
+import { ExpansionPanelComponent, OzgcloudStrokedButtonWithSpinnerComponent, OzgcloudTextEditorComponent, SpinnerComponent, } from '@alfa-client/ui';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatIcon } from '@angular/material/icon';
-import { VorgangForwardFormComponent } from './vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component';
-import { VorgangForwardFormularComponent } from './vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component';
-import { VorgangForwardingContainerComponent } from './vorgang-forwarding-container/vorgang-forwarding-container.component';
-import { VorgangForwardingInfoListComponent } from './vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info-list.component';
-import { VorgangForwardingInfoComponent } from './vorgang-forwarding-container/vorgang-forwarding-info-list/vorgang-forwarding-info/vorgang-forwarding-info.component';
-import { VorgangForwardZustellenContainerComponent } from './vorgang-forwarding-zustellen-container/vorgang-forward-zustellen-container.component';
+import { ForwardingByEmailContainerComponent } from './forwarding-by-email-container/forwarding-by-email-container.component';
+import { ForwardingByEmailFormComponent } from './forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-form/forwarding-by-email-form.component';
+import { ForwardingByEmailFormularComponent } from './forwarding-by-email-container/forwarding-by-email-formular/forwarding-by-email-formular.component';
+import { ForwardingByEmailInfoListComponent } from './forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info-list.component';
+import { ForwardingByEmailInfoComponent } from './forwarding-by-email-container/forwarding-by-email-info-list/forwarding-by-email-info/forwarding-by-email-info.component';
+import { ForwardingByEmailZustellenContainerComponent } from './forwarding-by-email-zustellen-container/forwarding-by-email-zustellen-container.component';
@NgModule({
imports: [
@@ -57,15 +52,15 @@ import { VorgangForwardZustellenContainerComponent } from './vorgang-forwarding-
ReactiveFormsModule,
],
declarations: [
- VorgangForwardZustellenContainerComponent,
- VorgangForwardingContainerComponent,
- VorgangForwardFormularComponent,
- VorgangForwardingInfoComponent,
- VorgangForwardingInfoListComponent,
- VorgangForwardFormularComponent,
- VorgangForwardZustellenContainerComponent,
- VorgangForwardFormComponent,
+ ForwardingByEmailZustellenContainerComponent,
+ ForwardingByEmailContainerComponent,
+ ForwardingByEmailFormularComponent,
+ ForwardingByEmailInfoComponent,
+ ForwardingByEmailInfoListComponent,
+ ForwardingByEmailFormularComponent,
+ ForwardingByEmailZustellenContainerComponent,
+ ForwardingByEmailFormComponent,
],
- exports: [VorgangForwardingContainerComponent],
+ exports: [ForwardingByEmailContainerComponent],
})
export class ForwardingModule {}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.html
index 7170a1ee9d..650f1390db 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.html
@@ -45,4 +45,4 @@
<alfa-create-wiedervorlage-button-container [showAsIconButton]="showAsIconButton" [vorgang]="vorgangWithEingang" />
<alfa-assign-user-profile-button-container [vorgang]="vorgangWithEingang" />
<alfa-postfach-mail-button-container [showAsIconButton]="showAsIconButton" [vorgang]="vorgangWithEingang" />
-<alfa-forward-by-ozgcloud-button-container [vorgangWithEingang]="vorgangWithEingang" [showAsIconButton]="showAsIconButton" />
+<alfa-forwarding-button-container [vorgangWithEingang]="vorgangWithEingang" [showAsIconButton]="showAsIconButton" />
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.spec.ts
index b8c3aed662..4d860217f0 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.spec.ts
@@ -21,12 +21,8 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { ForwardByOzgcloudButtonContainerComponent } from '@alfa-client/forwarding';
-import {
- EndgueltigLoeschenButtonContainerComponent,
- LoeschAnforderungZuruecknehmenButtonContainerComponent,
- LoeschenAnfordernButtonContainerComponent,
-} from '@alfa-client/loesch-anforderung';
+import { ForwardingButtonContainerComponent } from '@alfa-client/forwarding';
+import { EndgueltigLoeschenButtonContainerComponent, LoeschAnforderungZuruecknehmenButtonContainerComponent, LoeschenAnfordernButtonContainerComponent, } from '@alfa-client/loesch-anforderung';
import { PostfachMailButtonContainerComponent } from '@alfa-client/postfach';
import { HasLinkPipe } from '@alfa-client/tech-shared';
import { existsAsHtmlElement, getMockComponent, notExistsAsHtmlElement } from '@alfa-client/test-utils';
@@ -77,7 +73,7 @@ describe('VorgangDetailActionButtonsComponent', () => {
MockComponent(LoeschenAnfordernButtonContainerComponent),
MockComponent(EndgueltigLoeschenButtonContainerComponent),
MockComponent(LoeschAnforderungZuruecknehmenButtonContainerComponent),
- MockComponent(ForwardByOzgcloudButtonContainerComponent),
+ MockComponent(ForwardingButtonContainerComponent),
],
});
});
@@ -123,10 +119,7 @@ describe('VorgangDetailActionButtonsComponent', () => {
fixture.detectChanges();
- const button: ForwardByOzgcloudButtonContainerComponent = getMockComponent(
- fixture,
- ForwardByOzgcloudButtonContainerComponent,
- );
+ const button: ForwardingButtonContainerComponent = getMockComponent(fixture, ForwardingButtonContainerComponent);
expect(button.vorgangWithEingang).toBe(vorgangWithEingang);
expect(button.showAsIconButton).toBeTruthy();
});
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 772fdbd059..af35bf9c28 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
@@ -60,10 +60,10 @@
<div class="two-column">
<div class="section" *ngIf="vorgangResource | hasLink: vorgangWithEingangLinkRel.FORWARD_BY_EMAIL">
- <alfa-vorgang-forwarding-container
+ <alfa-forwarding-by-email-container
[vorgang]="vorgangResource"
data-test-id="forwarding-container-in-vorgang"
- ></alfa-vorgang-forwarding-container>
+ ></alfa-forwarding-by-email-container>
</div>
<div class="section" *ngIf="vorgangResource | hasLink: vorgangHeaderLinkRel.WIEDERVORLAGEN">
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 79d55a0dd7..9a60edf810 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
@@ -22,10 +22,10 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { CollaborationInVorgangContainerComponent } from '@alfa-client/collaboration';
-import { VorgangForwardingContainerComponent } from '@alfa-client/forwarding';
+import { ForwardingByEmailContainerComponent } from '@alfa-client/forwarding';
import { KommentarListInVorgangContainerComponent } from '@alfa-client/kommentar';
import { PostfachMailListContainerComponent } from '@alfa-client/postfach';
-import { HasLinkPipe, ToEmbeddedResourcesPipe, createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared';
+import { createEmptyStateResource, createStateResource, HasLinkPipe, ToEmbeddedResourcesPipe } from '@alfa-client/tech-shared';
import { existsAsHtmlElement, getMockComponent, notExistsAsHtmlElement } from '@alfa-client/test-utils';
import { ExpansionPanelComponent, OzgcloudStrokedButtonWithSpinnerComponent } from '@alfa-client/ui';
import { VorgangHeaderLinkRel, VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
@@ -72,7 +72,7 @@ describe('VorgangDetailAreaComponent', () => {
MockComponent(PostfachMailListContainerComponent),
MockComponent(VorgangDetailAntragstellerComponent),
MockComponent(VorgangDetailFormularDatenComponent),
- MockComponent(VorgangForwardingContainerComponent),
+ MockComponent(ForwardingByEmailContainerComponent),
MockComponent(BescheidListInVorgangContainerComponent),
MockComponent(ExpansionPanelComponent),
MockComponent(CollaborationInVorgangContainerComponent),
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.html
index 742a81193c..c11e59564e 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.html
@@ -37,4 +37,4 @@
}
<alfa-endgueltig-loeschen-button-container [vorgang]="vorgangWithEingang" />
<alfa-loesch-anforderung-zuruecknehmen-button-container />
-<alfa-forward-by-ozgcloud-button-container [vorgangWithEingang]="vorgangWithEingang" />
+<alfa-forwarding-button-container [vorgangWithEingang]="vorgangWithEingang" />
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.spec.ts
index 4b16a16ee5..04956f9d57 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.spec.ts
@@ -21,12 +21,8 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { ForwardByOzgcloudButtonContainerComponent } from '@alfa-client/forwarding';
-import {
- EndgueltigLoeschenButtonContainerComponent,
- LoeschAnforderungZuruecknehmenButtonContainerComponent,
- LoeschenAnfordernButtonContainerComponent,
-} from '@alfa-client/loesch-anforderung';
+import { ForwardingButtonContainerComponent } from '@alfa-client/forwarding';
+import { EndgueltigLoeschenButtonContainerComponent, LoeschAnforderungZuruecknehmenButtonContainerComponent, LoeschenAnfordernButtonContainerComponent, } from '@alfa-client/loesch-anforderung';
import { HasLinkPipe } from '@alfa-client/tech-shared';
import { existsAsHtmlElement, getMockComponent, notExistsAsHtmlElement } from '@alfa-client/test-utils';
import { OzgcloudStrokedButtonWithSpinnerComponent } from '@alfa-client/ui';
@@ -70,7 +66,7 @@ describe('VorgangDetailFormularButtonsComponent', () => {
MockComponent(LoeschenAnfordernButtonContainerComponent),
MockComponent(EndgueltigLoeschenButtonContainerComponent),
MockComponent(LoeschAnforderungZuruecknehmenButtonContainerComponent),
- MockComponent(ForwardByOzgcloudButtonContainerComponent),
+ MockComponent(ForwardingButtonContainerComponent),
],
});
});
@@ -106,10 +102,7 @@ describe('VorgangDetailFormularButtonsComponent', () => {
component.vorgangWithEingang = vorgangWithEingang;
fixture.detectChanges();
- const button: ForwardByOzgcloudButtonContainerComponent = getMockComponent(
- fixture,
- ForwardByOzgcloudButtonContainerComponent,
- );
+ const button: ForwardingButtonContainerComponent = getMockComponent(fixture, ForwardingButtonContainerComponent);
expect(button.vorgangWithEingang).toBe(vorgangWithEingang);
});
});
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index df1ec6563f..8721335caf 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -24,7 +24,7 @@
import { BescheidModule } from '@alfa-client/bescheid';
import { BinaryFileModule } from '@alfa-client/binary-file';
import { CollaborationModule } from '@alfa-client/collaboration';
-import { ForwardByOzgcloudButtonContainerComponent, ForwardingModule } from '@alfa-client/forwarding';
+import { ForwardingButtonContainerComponent, ForwardingModule } from '@alfa-client/forwarding';
import { HistorieModule } from '@alfa-client/historie';
import { KommentarModule } from '@alfa-client/kommentar';
import { LoeschAnforderungModule } from '@alfa-client/loesch-anforderung';
@@ -32,21 +32,7 @@ import { LoeschAnforderungSharedModule } from '@alfa-client/loesch-anforderung-s
import { PostfachModule } from '@alfa-client/postfach';
import { PostfachSharedModule } from '@alfa-client/postfach-shared';
import { ConvertForDataTestPipe, ConvertProblemDetailToErrorMessagesPipe, HasLinkPipe } from '@alfa-client/tech-shared';
-import {
- BackButtonComponent,
- DateEditorComponent,
- ExpansionPanelComponent,
- IconButtonWithSpinnerComponent,
- OzgcloudIconButtonPrimaryComponent,
- OzgcloudIconComponent,
- OzgcloudMenuComponent,
- OzgcloudPasteTextButtonComponent,
- OzgcloudStrokedButtonWithSpinnerComponent,
- OzgcloudTextEditorComponent,
- SpinnerComponent,
- SpinnerTransparencyComponent,
- SubnavigationComponent,
-} from '@alfa-client/ui';
+import { BackButtonComponent, DateEditorComponent, ExpansionPanelComponent, IconButtonWithSpinnerComponent, OzgcloudIconButtonPrimaryComponent, OzgcloudIconComponent, OzgcloudMenuComponent, OzgcloudPasteTextButtonComponent, OzgcloudStrokedButtonWithSpinnerComponent, OzgcloudTextEditorComponent, SpinnerComponent, SpinnerTransparencyComponent, SubnavigationComponent, } from '@alfa-client/ui';
import { UserProfileModule } from '@alfa-client/user-profile';
import { UserProfileSharedModule } from '@alfa-client/user-profile-shared';
import { VorgangSharedModule } from '@alfa-client/vorgang-shared';
@@ -60,13 +46,7 @@ import { MatIcon } from '@angular/material/icon';
import { MatMenuTrigger } from '@angular/material/menu';
import { MatTab, MatTabContent, MatTabGroup } from '@angular/material/tabs';
import { RouterModule, Routes } from '@angular/router';
-import {
- ButtonWithSpinnerComponent,
- FileUploadEditorComponent,
- SingleFileUploadEditorComponent,
- TextareaEditorComponent,
- TextEditorComponent,
-} from '@ods/component';
+import { ButtonWithSpinnerComponent, FileUploadEditorComponent, SingleFileUploadEditorComponent, TextareaEditorComponent, TextEditorComponent, } from '@ods/component';
import {
ArchiveIconComponent,
AttachmentComponent,
@@ -230,7 +210,7 @@ const routes: Routes = [
DropdownMenuTextItemComponent,
MoreIconComponent,
FileIconComponent,
- ForwardByOzgcloudButtonContainerComponent,
+ ForwardingButtonContainerComponent,
TooltipDirective,
EditIconComponent,
DiscardVorgangIconComponent,
--
GitLab