diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-abschliessen.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-abschliessen.cy.ts
index 81bbd0cdfbe44f1480fcd852caa3f0ae3657e701..e7cbc9d44df2099c5443729d0bb2b1187dd4e5f9 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-abschliessen.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-abschliessen.cy.ts
@@ -27,7 +27,7 @@ import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-lis
import { VorgangE2E, VorgangMessagesE2E, VorgangStatusE2E, vorgangStatusLabelE2E } from '../../../model/vorgang';
import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
import { VorgangPage } from '../../../page-objects/vorgang.po';
-import { dropCollections, wait } from '../../../support/cypress-helper';
+import { dropCollections } from '../../../support/cypress-helper';
import { contains, exist, haveText, notExist } from '../../../support/cypress.util';
import { loginAsSabine } from '../../../support/user-util';
import { buildVorgang, initVorgaenge, objectIds } from '../../../support/vorgang-util';
@@ -132,15 +132,12 @@ describe('Vorgang abschliessen', () => {
it('should close snackbar on revoke', () => {
snackBar.getRevokeButton().click();
- wait(500);
waitForSpinnerToDisappear();
-
notExist(snackBar.getMessage());
});
- it.skip('UNSTABLE: should show status Beschieden', () => {
+ it('should show status Beschieden', () => {
notExist(vorgangPage.getProgressBar());
-
haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.BESCHIEDEN]);
});
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedereroeffnen.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedereroeffnen.cy.ts
index 246013c7b169d348bd6882b3cd20f1d211f1b6fa..a589537f1b6c1ebc75b77173ca51aa829824bc8a 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedereroeffnen.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedereroeffnen.cy.ts
@@ -27,7 +27,7 @@ import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-lis
import { VorgangE2E, VorgangMessagesE2E, VorgangStatusE2E, vorgangStatusLabelE2E } from '../../../model/vorgang';
import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
import { VorgangPage } from '../../../page-objects/vorgang.po';
-import { dropCollections, wait } from '../../../support/cypress-helper';
+import { dropCollections } from '../../../support/cypress-helper';
import { contains, exist, haveText, notExist } from '../../../support/cypress.util';
import { loginAsSabine } from '../../../support/user-util';
import { buildVorgang, createVorgang, initVorgaenge, objectIds } from '../../../support/vorgang-util';
@@ -137,8 +137,6 @@ describe('Vorgang wiedereroeffnen', () => {
describe('by icon-button', () => {
it('should have status Beschieden', () => {
- wait(500);
-
haveText(
vorgangPage.getVorgangDetailHeader().getStatus(),
vorgangStatusLabelE2E[vorgangBeschiedenWiedereroeffnenRevoke.status],
@@ -155,7 +153,6 @@ describe('Vorgang wiedereroeffnen', () => {
it('should click on snackbar revoke', () => {
snackbar.getRevokeButton().click();
- wait(500);
waitForSpinnerToDisappear();
notExist(snackbar.getMessage());
@@ -261,7 +258,6 @@ describe('Vorgang wiedereroeffnen', () => {
it('should click snackbar revoke', () => {
snackbar.getRevokeButton().click();
- wait(500);
waitForSpinnerToDisappear();
notExist(snackbar.getMessage());
diff --git a/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts b/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts
index 69e7bccdfc44a17993598e6c49a8e81bd066db33..3dbd6155939b778a411f9b2fd18822286feaf958 100644
--- a/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts
@@ -46,10 +46,9 @@ export function notExist(element: any): void {
}
export function haveText(element: any, text: string): void {
- element
- .invoke('text')
- .then((elementText) => elementText.trim())
- .should('equal', text);
+ element.invoke('text').should(($text) => {
+ expect($text.trim()).to.equal(text);
+ });
}
export function haveTextWithoutChildren(element: any, text: string): void {
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
index f6df6b162cf2af8a74cd04ee074f680fce851a20..b8f0eb5dafcd5b84ec2d13457ae195d2f4589ef9 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
@@ -24,7 +24,13 @@
import { BescheidSharedModule } from '@alfa-client/bescheid-shared';
import { BinaryFileModule } from '@alfa-client/binary-file';
import { CommandSharedModule } from '@alfa-client/command-shared';
-import { GetUrlPipe, HasLinkPipe, ToEmbeddedResourcesPipe } from '@alfa-client/tech-shared';
+import {
+ ConvertForDataTestPipe,
+ ConvertProblemDetailToErrorMessagesPipe,
+ GetUrlPipe,
+ HasLinkPipe,
+ ToEmbeddedResourcesPipe,
+} from '@alfa-client/tech-shared';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import {
@@ -136,6 +142,8 @@ import { BescheidWizardWeiterButtonComponent } from './bescheid-wizard-container
SaveIconComponent,
TextEditorComponent,
TextareaEditorComponent,
+ ConvertForDataTestPipe,
+ ConvertProblemDetailToErrorMessagesPipe,
],
declarations: [
BescheidInVorgangContainerComponent,
diff --git a/alfa-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.ts b/alfa-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.ts
index 0ce2009d9f4ac65aa2299249d25930c753fde058..185fa2810d9fcae9d2d9a3e710e140a441fcc617 100644
--- a/alfa-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.ts
+++ b/alfa-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.ts
@@ -23,7 +23,7 @@
*/
import { createEmptyStateResource, StateResource } from '@alfa-client/tech-shared';
import { Component, Input } from '@angular/core';
-import { MatProgressBar } from '@angular/material/progress-bar';
+import { MatProgressBarModule } from '@angular/material/progress-bar';
import { Resource } from '@ngxp/rest';
@Component({
@@ -31,7 +31,7 @@ import { Resource } from '@ngxp/rest';
templateUrl: './progress-bar.component.html',
styleUrls: ['./progress-bar.component.scss'],
standalone: true,
- imports: [MatProgressBar],
+ imports: [MatProgressBarModule],
})
export class ProgressBarComponent {
@Input() stateResource: StateResource<Resource> = createEmptyStateResource<Resource>();
diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts
index 35789e92ba4c39d3dda980b3450d5f27fff0d73c..d4744fd1411a9d59360b7e003d2f01958f2ba7ad 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts
@@ -37,6 +37,7 @@ import { AktenzeichenEditDialogMessages } from './aktenzeichen-edit-dialog.messa
selector: 'alfa-aktenzeichen-edit-dialog',
templateUrl: './aktenzeichen-edit-dialog.component.html',
styleUrls: ['./aktenzeichen-edit-dialog.component.scss'],
+ providers: [AktenzeichenEditDialogFormservice],
})
export class AktenzeichenEditDialogComponent implements OnInit {
vorgang: VorgangWithEingangResource;
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 cd9df94996e413452d38811bdde387db2224cf3d..df1ec6563ff01d6130ab2cf54e144c5bfc970465 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
@@ -58,7 +58,7 @@ import { ReactiveFormsModule } from '@angular/forms';
import { MatDialogActions, MatDialogContent } from '@angular/material/dialog';
import { MatIcon } from '@angular/material/icon';
import { MatMenuTrigger } from '@angular/material/menu';
-import { MatTab, MatTabGroup } from '@angular/material/tabs';
+import { MatTab, MatTabContent, MatTabGroup } from '@angular/material/tabs';
import { RouterModule, Routes } from '@angular/router';
import {
ButtonWithSpinnerComponent,
@@ -234,6 +234,7 @@ const routes: Routes = [
TooltipDirective,
EditIconComponent,
DiscardVorgangIconComponent,
+ MatTabContent,
],
declarations: [
VorgangDetailPageComponent,
diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-shared-ui.module.ts b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-shared-ui.module.ts
index 1624a507647c7817aece4450f2a4067d9b6b75af..96348a1634f974b37b2626bc204283a10f82bb09 100644
--- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-shared-ui.module.ts
+++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-shared-ui.module.ts
@@ -34,6 +34,7 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatAutocomplete, MatAutocompleteTrigger, MatOption } from '@angular/material/autocomplete';
+import { MatButtonModule } from '@angular/material/button';
import { MatFormField, MatFormFieldModule } from '@angular/material/form-field';
import { MatIcon, MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
@@ -59,6 +60,7 @@ import { WiedervorlageIconComponent } from './wiedervorlage-icon/wiedervorlage-i
MatIconModule,
MatInputModule,
MatFormField,
+ MatButtonModule,
MatFormFieldModule,
ReactiveFormsModule,
MatAutocompleteTrigger,