OZG-3116 OZG-3398 Refactoring after review

goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.ts

@@ -78,6 +78,10 @@ export class VorgangSearchFormService implements OnDestroy {
 		this.vorgangListService.clearSearchPreviewList();
 	}
 
+	isSearchInputNotPristine(): boolean {
+		return ! this.getSearchFormControl().pristine;
+	}
+
 	searchForPreviewList(value: string): void {
 		this.vorgangListService.setSearchString(value);
 		this.vorgangListService.searchForPreview(value);
@@ -107,6 +111,10 @@ export class VorgangSearchFormService implements OnDestroy {
 		}
 	}
 
+	isSameSearchString(): boolean {
+		return this.getValue() === this.lastSearchString
+	}
+
 	hasSearchString(): boolean {
 		return isNotEmpty(this.getValue());
 	}
@@ -144,14 +152,6 @@ export class VorgangSearchFormService implements OnDestroy {
 		this.getSearchFormControl().setValue(value);
 	}
 
-	isSearchInputNotPristine(): boolean {
-		return ! this.getSearchFormControl().pristine;
-	}
-
-	isSameSearchString(): boolean {
-		return this.getValue() === this.lastSearchString
-	}
-
 	ngOnDestroy(): void {
 		if (isNotNil(this.subscription)) this.subscription.unsubscribe();
 		if (isNotNil(this.previewSubscription)) this.previewSubscription.unsubscribe();

goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.ts

@@ -147,42 +147,31 @@ function buildStateOnNavigation(state: VorgangState, routeData: RouteData): Vorg
 	const searchString: string = isSearch(routeData) ? getSearchString(routeData) : null;
 
 	if (isMyVorgaenge(routeData)) {
-		return {
-			...state,
-			vorgangList: { ...state.vorgangList, reload: true },
-			searchString,
-			vorgaenge: EMPTY_ARRAY
-		};
+		return addSearchstring(state, searchString);
 	}
 	if (isVorgangListPage(routeData)) {
-		return {
-			...state,
-			searchString,
-			vorgangList: { ...state.vorgangList, reload: true },
-			vorgaenge: EMPTY_ARRAY
-		};
+		return addSearchstring(state, searchString);
 	}
 	if (isSearch(routeData)) {
-		const newState: VorgangState = {
-			...state,
-			searchString,
-			vorgangList: { ...state.vorgangList, reload: true },
-			vorgaenge: EMPTY_ARRAY
-		}
+		const newState: VorgangState = addSearchstring(state, searchString)
 		if (hasSearchStringChanged(state, searchString)) {
 			return { ...newState, searchPreviewList: createEmptyStateResource() }
 		}
 		return newState;
 	}
 	if (isVorgangDetailPage(routeData)) {
+		return addSearchstring(state, searchString);
+	}
+	return { ...state };
+}
+
+function addSearchstring(state: VorgangState, searchString: string): VorgangState {
 	return {
 		...state,
 		searchString,
 		vorgangList: { ...state.vorgangList, reload: true },
 		vorgaenge: EMPTY_ARRAY
-		};
 	}
-	return { ...state };
 }
 
 function hasSearchStringChanged(state: VorgangState, currentSearchString: string): boolean {