Merge branch 'main' into OZG-5977-MultipleFileUpload

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]);
       });
 

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());

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 {

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,

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>();

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;

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,