Merge branch 'master' into OZG-5789-required-fields

alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.ts

@@ -10,13 +10,13 @@ import { BinaryFileResource } from '@alfa-client/binary-file-shared';
 import { tapOnCommandSuccessfullyDone } from '@alfa-client/command-shared';
 import {
   AbstractFormService,
-  EMPTY_STRING,
-  HttpError,
-  StateResource,
   convertToBoolean,
+  EMPTY_STRING,
   formatForDatabase,
+  HttpError,
   isNotEmpty,
   isNotNil,
+  StateResource,
 } from '@alfa-client/tech-shared';
 import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
 import { Injectable, OnDestroy } from '@angular/core';
@@ -27,16 +27,16 @@ import {
   UntypedFormControl,
   UntypedFormGroup,
 } from '@angular/forms';
-import { Resource, ResourceUri, getUrl, hasLink } from '@ngxp/rest';
+import { getUrl, hasLink, Resource, ResourceUri } from '@ngxp/rest';
 import { isEmpty, isNil, isUndefined } from 'lodash-es';
 import {
   BehaviorSubject,
-  Observable,
-  Subject,
-  Subscription,
   combineLatest,
   map,
+  Observable,
   startWith,
+  Subject,
+  Subscription,
 } from 'rxjs';
 
 @Injectable()
@@ -54,13 +54,13 @@ export class BescheidenFormService extends AbstractFormService implements OnDest
   static readonly BETREFF_DEFAULT: string = 'Ihr Bescheid zum Antrag';
   static readonly NACHRICHTENTEXT_BEWILLIGT_DEFAULT: string = [
     'Sehr geehrte/r Antragsteller/in,',
-    'ihr Antrag wurde bewilligt.',
+    'Ihr Antrag wurde bewilligt.',
     'Mit freundlichen Grüßen',
     'Ihre Verwaltung',
   ].join('\n\n');
   static readonly NACHRICHTENTEXT_ABGELEHNT_DEFAULT: string = [
     'Sehr geehrte/r Antragsteller/in,',
-    'ihr Antrag wurde abgelehnt.',
+    'Ihr Antrag wurde abgelehnt.',
     'Mit freundlichen Grüßen',
     'Ihre Verwaltung',
   ].join('\n\n');
@@ -269,6 +269,7 @@ export class BescheidenFormService extends AbstractFormService implements OnDest
   private setNachrichtSubject(value: string): void {
     this.form.controls[BescheidenFormService.FIELD_NACHRICHT_SUBJECT].patchValue(value);
   }
+
   private setNachrichtText(value: string): void {
     this.form.controls[BescheidenFormService.FIELD_NACHRICHT_TEXT].patchValue(value);
   }

alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.spec.ts

@@ -167,7 +167,7 @@ describe('VorgangSearchComponent', () => {
   });
 
   describe('ngOnInit', () => {
-    it('should set focus if path is "/alle/search"', () => {
+    it('should set focus if path ends with "/search"', () => {
       component.focus = jest.fn();
       routerEvents.next(new NavigationEnd(1, '/alle/search', ''));
 
@@ -176,7 +176,7 @@ describe('VorgangSearchComponent', () => {
       expect(component.focus).toHaveBeenCalled();
     });
 
-    it('should not set focus if path is not "/alle/search"', () => {
+    it('should not set focus if path does not end with "/search"', () => {
       component.focus = jest.fn();
       routerEvents.next(new NavigationEnd(1, '/alle', ''));
 

alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-util.ts

@@ -36,7 +36,7 @@ export function getEmpfaenger(vorgangWithEingangResource: VorgangWithEingangReso
 }
 
 export function isVorgangSearchRoute(navigationEnd: NavigationEnd): boolean {
-  return navigationEnd.url === '/alle/search';
+  return navigationEnd.url.endsWith('/search');
 }
 
 function getVorname(vorgangWithEingangResource: VorgangWithEingangResource): string {