From a42dceb08772a1ae66746457008708ce8dd31784 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 24 Aug 2022 09:21:42 +0200
Subject: [PATCH] OZG-2796 OZG-2847 reactivate service; make service using
 facade; adjust components using service; partly move "getting required
 information" from effect to service

---
 .../src/lib/+state/navigation.effects.spec.ts |   6 +-
 .../src/lib/+state/navigation.facade.spec.ts  |   4 +-
 .../src/lib/+state/navigation.facade.ts       |   3 +-
 .../src/lib/+state/navigation.reducer.spec.ts |  19 +-
 .../src/lib/+state/navigation.reducer.ts      |  10 +-
 .../lib/+state/navigation.selectors.spec.ts   |   5 +-
 .../src/lib/+state/navigation.selectors.ts    |   3 +-
 .../test/navigation-test-factory.ts           |   2 +-
 ...vorgang-search-container.component.spec.ts |  10 +-
 .../vorgang-search-container.component.ts     |   6 +-
 .../vorgang-search.formservice.spec.ts        |  18 +-
 .../vorgang-search.formservice.ts             |  11 +-
 goofy-client/libs/vorgang-shared/src/index.ts |   5 +-
 .../src/lib/+state/vorgang.actions.ts         |  23 +-
 .../src/lib/+state/vorgang.effects.spec.ts    | 221 +++++---------
 .../src/lib/+state/vorgang.effects.ts         |  96 +++---
 .../src/lib/+state/vorgang.facade.spec.ts     |  78 +++--
 .../src/lib/+state/vorgang.facade.ts          |  19 +-
 .../src/lib/+state/vorgang.reducer.spec.ts    | 158 ++++++++--
 .../src/lib/+state/vorgang.reducer.ts         |  91 ++++--
 .../src/lib/vorgang-list.service.spec.ts      | 281 ++++++++++++++++++
 .../src/lib/vorgang-list.service.ts           |  73 +++++
 .../src/lib/vorgang-navigation.util.spec.ts   |  47 +--
 .../src/lib/vorgang-navigation.util.ts        |  24 +-
 .../vorgang-list-container.component.spec.ts  |  16 +-
 .../vorgang-list-container.component.ts       |  12 +-
 26 files changed, 860 insertions(+), 381 deletions(-)
 create mode 100644 goofy-client/libs/vorgang-shared/src/lib/vorgang-list.service.spec.ts
 create mode 100644 goofy-client/libs/vorgang-shared/src/lib/vorgang-list.service.ts

diff --git a/goofy-client/libs/navigation-shared/src/lib/+state/navigation.effects.spec.ts b/goofy-client/libs/navigation-shared/src/lib/+state/navigation.effects.spec.ts
index 2cffc8ede5..56484076b7 100644
--- a/goofy-client/libs/navigation-shared/src/lib/+state/navigation.effects.spec.ts
+++ b/goofy-client/libs/navigation-shared/src/lib/+state/navigation.effects.spec.ts
@@ -7,7 +7,7 @@ import { NxModule } from '@nrwl/angular';
 import { hot } from 'jest-marbles';
 import { Observable } from 'rxjs';
 import * as NavigationUtil from '../navigation.util';
-import { createCurrentRouteData } from './../../../test/navigation-test-factory';
+import { createRouteData } from './../../../test/navigation-test-factory';
 import * as NavigationActions from './navigation.actions';
 import { NavigationEffects } from './navigation.effects';
 
@@ -33,12 +33,12 @@ describe('NavigationEffects', () => {
 		const action = routerNavigationAction;
 
 		it('should dispatch updateCurrentRouteData action with data', () => {
-			jest.spyOn(NavigationUtil, 'buildRouteData').mockReturnValue(createCurrentRouteData());
+			jest.spyOn(NavigationUtil, 'buildRouteData').mockReturnValue(createRouteData());
 			actions = hot('-a-|', { a: action });
 
 			effects.navigateEnd$.subscribe();
 
-			const expected = hot('-a-|', { a: NavigationActions.updateCurrentRouteData({ routeData: createCurrentRouteData() }) });
+			const expected = hot('-a-|', { a: NavigationActions.updateCurrentRouteData({ routeData: createRouteData() }) });
 
 			expect(effects.navigateEnd$).toBeObservable(expected);
 		})
diff --git a/goofy-client/libs/navigation-shared/src/lib/+state/navigation.facade.spec.ts b/goofy-client/libs/navigation-shared/src/lib/+state/navigation.facade.spec.ts
index d67e899de4..0737f27830 100644
--- a/goofy-client/libs/navigation-shared/src/lib/+state/navigation.facade.spec.ts
+++ b/goofy-client/libs/navigation-shared/src/lib/+state/navigation.facade.spec.ts
@@ -5,7 +5,7 @@ import { Store, StoreModule } from '@ngrx/store';
 import { NxModule } from '@nrwl/angular';
 import { readFirst } from '@nrwl/angular/testing';
 import { of } from 'rxjs';
-import { createCurrentRouteData } from './../../../test/navigation-test-factory';
+import { createRouteData } from './../../../test/navigation-test-factory';
 import { NavigationEffects } from './navigation.effects';
 import { NavigationFacade } from './navigation.facade';
 import { RouteData } from './navigation.models';
@@ -49,7 +49,7 @@ describe('NavigationFacade', () => {
 		})
 
 		it('should return data on data in state', async () => {
-			const response: RouteData = createCurrentRouteData();
+			const response: RouteData = createRouteData();
 			(<any>store.select) = jest.fn();
 			(<any>store.select).mockReturnValue(of(response));
 
diff --git a/goofy-client/libs/navigation-shared/src/lib/+state/navigation.facade.ts b/goofy-client/libs/navigation-shared/src/lib/+state/navigation.facade.ts
index 40761ff574..497b3c6258 100644
--- a/goofy-client/libs/navigation-shared/src/lib/+state/navigation.facade.ts
+++ b/goofy-client/libs/navigation-shared/src/lib/+state/navigation.facade.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { StateResource } from '@goofy-client/tech-shared';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { RouteData } from './navigation.models';
@@ -9,7 +10,7 @@ export class NavigationFacade {
 
 	constructor(private readonly store: Store) { }
 
-	public getCurrentRouteData(): Observable<RouteData> {
+	public getCurrentRouteData(): Observable<StateResource<RouteData>> {
 		return this.store.select(NavigationSelectors.currentRouteData);
 	}
 }
\ No newline at end of file
diff --git a/goofy-client/libs/navigation-shared/src/lib/+state/navigation.reducer.spec.ts b/goofy-client/libs/navigation-shared/src/lib/+state/navigation.reducer.spec.ts
index e7304fe20b..6fa4842341 100644
--- a/goofy-client/libs/navigation-shared/src/lib/+state/navigation.reducer.spec.ts
+++ b/goofy-client/libs/navigation-shared/src/lib/+state/navigation.reducer.spec.ts
@@ -1,19 +1,32 @@
-import { createCurrentRouteData } from './../../../test/navigation-test-factory';
+import { createStateResource } from '@goofy-client/tech-shared';
+import { routerNavigationAction } from '@ngrx/router-store';
+import { createRouteData } from './../../../test/navigation-test-factory';
 import * as NavigationActions from './navigation.actions';
 import { RouteData } from './navigation.models';
 import { initialState, NavigationState, reducer } from './navigation.reducer';
 
 describe('Navigation Reducer', () => {
 
+	describe('on router navigation action', () => {
+
+		it('should set route data loading true', () => {
+			const action = routerNavigationAction;
+
+			const result: NavigationState = reducer(initialState, action);
+
+			expect(result.currentRouteData.loading).toBeTruthy();
+		})
+	})
+
 	describe('on get updateRouteData action', () => {
 
 		it('should set route data', () => {
-			const routeData: RouteData = createCurrentRouteData();
+			const routeData: RouteData = createRouteData();
 			const action = NavigationActions.updateCurrentRouteData({ routeData });
 
 			const result: NavigationState = reducer(initialState, action);
 
-			expect(result.currentRouteData).toBe(routeData);
+			expect(result.currentRouteData).toStrictEqual(createStateResource(routeData));
 		})
 	})
 });
diff --git a/goofy-client/libs/navigation-shared/src/lib/+state/navigation.reducer.ts b/goofy-client/libs/navigation-shared/src/lib/+state/navigation.reducer.ts
index 75aee5ca76..9e503bbea5 100644
--- a/goofy-client/libs/navigation-shared/src/lib/+state/navigation.reducer.ts
+++ b/goofy-client/libs/navigation-shared/src/lib/+state/navigation.reducer.ts
@@ -1,3 +1,5 @@
+import { createStateResource, StateResource } from '@goofy-client/tech-shared';
+import { routerNavigationAction } from '@ngrx/router-store';
 import { Action, createReducer, on } from '@ngrx/store';
 import * as NavigationActions from './navigation.actions';
 import { RouteData } from './navigation.models';
@@ -9,7 +11,7 @@ export interface NavigationPartialState {
 }
 
 export interface NavigationState {
-	currentRouteData: RouteData | null
+	currentRouteData: StateResource<RouteData | null>
 }
 
 export const initialState: NavigationState = {
@@ -18,9 +20,13 @@ export const initialState: NavigationState = {
 
 const navigationReducer = createReducer(
 	initialState,
+	on(routerNavigationAction, (state: NavigationState) => ({
+		...state,
+		currentRouteData: { ...state.currentRouteData, loading: true }
+	})),
 	on(NavigationActions.updateCurrentRouteData, (state: NavigationState, { routeData }) => ({
 		...state,
-		currentRouteData: routeData
+		currentRouteData: createStateResource(routeData)
 	}))
 );
 
diff --git a/goofy-client/libs/navigation-shared/src/lib/+state/navigation.selectors.spec.ts b/goofy-client/libs/navigation-shared/src/lib/+state/navigation.selectors.spec.ts
index c55b63f005..7bedf94d0e 100644
--- a/goofy-client/libs/navigation-shared/src/lib/+state/navigation.selectors.spec.ts
+++ b/goofy-client/libs/navigation-shared/src/lib/+state/navigation.selectors.spec.ts
@@ -1,4 +1,5 @@
-import { createCurrentRouteData } from './../../../test/navigation-test-factory';
+import { createStateResource, StateResource } from '@goofy-client/tech-shared';
+import { createRouteData } from './../../../test/navigation-test-factory';
 import { RouteData } from './navigation.models';
 import { initialState, NavigationPartialState } from './navigation.reducer';
 import * as NavigationSelectors from './navigation.selectors';
@@ -7,7 +8,7 @@ describe('Navigation Selectors', () => {
 
 	let state: NavigationPartialState;
 
-	const currentRouteData: RouteData = createCurrentRouteData();
+	const currentRouteData: StateResource<RouteData> = createStateResource(createRouteData());
 
 	beforeEach(() => {
 		state = {
diff --git a/goofy-client/libs/navigation-shared/src/lib/+state/navigation.selectors.ts b/goofy-client/libs/navigation-shared/src/lib/+state/navigation.selectors.ts
index 38f2a6f2ac..ebe2ae895b 100644
--- a/goofy-client/libs/navigation-shared/src/lib/+state/navigation.selectors.ts
+++ b/goofy-client/libs/navigation-shared/src/lib/+state/navigation.selectors.ts
@@ -1,7 +1,8 @@
+import { StateResource } from '@goofy-client/tech-shared';
 import { createFeatureSelector, createSelector, MemoizedSelector } from '@ngrx/store';
 import { RouteData } from './navigation.models';
 import { NavigationState, NAVIGATION_FEATURE_KEY } from './navigation.reducer';
 
 export const getNavigationState: MemoizedSelector<object, NavigationState> = createFeatureSelector<NavigationState>(NAVIGATION_FEATURE_KEY);
 
-export const currentRouteData: MemoizedSelector<NavigationState, RouteData> = createSelector(getNavigationState, (state: NavigationState) => state.currentRouteData);
\ No newline at end of file
+export const currentRouteData: MemoizedSelector<NavigationState, StateResource<RouteData>> = createSelector(getNavigationState, (state: NavigationState) => state.currentRouteData);
\ No newline at end of file
diff --git a/goofy-client/libs/navigation-shared/test/navigation-test-factory.ts b/goofy-client/libs/navigation-shared/test/navigation-test-factory.ts
index 41035fc363..4dd7f7b1b4 100644
--- a/goofy-client/libs/navigation-shared/test/navigation-test-factory.ts
+++ b/goofy-client/libs/navigation-shared/test/navigation-test-factory.ts
@@ -1,5 +1,5 @@
 import { RouteData } from '../src/lib/+state/navigation.models';
 
-export function createCurrentRouteData(): RouteData {
+export function createRouteData(): RouteData {
 	return { queryParameter: {}, urlSegments: [] };
 }
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search-container.component.spec.ts b/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search-container.component.spec.ts
index b81d37953e..59d5c0ba41 100644
--- a/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search-container.component.spec.ts
+++ b/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search-container.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ApiRootFacade, ApiRootLinkRel } from '@goofy-client/api-root-shared';
 import { createStateResource, HasLinkPipe } from '@goofy-client/tech-shared';
 import { mock } from '@goofy-client/test-utils';
-import { VorgangFacade } from '@goofy-client/vorgang-shared';
+import { VorgangListService } from '@goofy-client/vorgang-shared';
 import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
 import { MockComponent } from 'ng-mocks';
@@ -16,7 +16,7 @@ describe('VorgangSearchContainerComponent', () => {
 
 	const apiRootFacade = { ...mock(ApiRootFacade), getApiRoot: jest.fn() };
 
-	const vorgangFacade = mock(VorgangFacade);
+	const vorgangListService = mock(VorgangListService);
 
 	const vorgangSearch: string = getDataTestIdOf('vorgang-search');
 
@@ -33,8 +33,8 @@ describe('VorgangSearchContainerComponent', () => {
 					useValue: apiRootFacade
 				},
 				{
-					provide: VorgangFacade,
-					useValue: vorgangFacade
+					provide: VorgangListService,
+					useValue: vorgangListService
 				}
 			]
 		}).compileComponents();
@@ -61,7 +61,7 @@ describe('VorgangSearchContainerComponent', () => {
 		it('should call vorgangFacade to get searchPreviewList', () => {
 			component.ngOnInit();
 
-			expect(vorgangFacade.getSearchPreviewList).toHaveBeenCalled();
+			expect(vorgangListService.getSearchPreviewList).toHaveBeenCalled();
 		})
 	})
 
diff --git a/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search-container.component.ts b/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search-container.component.ts
index 3a1d3d75ac..def28f3350 100644
--- a/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search-container.component.ts
+++ b/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search-container.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ApiRootFacade, ApiRootLinkRel, ApiRootResource } from '@goofy-client/api-root-shared';
 import { createEmptyStateResource, StateResource } from '@goofy-client/tech-shared';
-import { VorgangFacade, VorgangListResource } from '@goofy-client/vorgang-shared';
+import { VorgangListResource, VorgangListService } from '@goofy-client/vorgang-shared';
 import { Observable, of } from 'rxjs';
 
 @Component({
@@ -16,10 +16,10 @@ export class VorgangSearchContainerComponent implements OnInit {
 
 	readonly apiRootLinkRel = ApiRootLinkRel;
 
-	constructor(private apiRootFacade: ApiRootFacade, private vorgangFacade: VorgangFacade) { }
+	constructor(private apiRootFacade: ApiRootFacade, private vorgangListService: VorgangListService) { }
 
 	ngOnInit(): void {
 		this.apiRoot$ = this.apiRootFacade.getApiRoot();
-		this.vorgangSearchPreviewList$ = this.vorgangFacade.getSearchPreviewList();
+		this.vorgangSearchPreviewList$ = this.vorgangListService.getSearchPreviewList();
 	}
 }
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.spec.ts b/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.spec.ts
index 812e70712e..160652b57e 100644
--- a/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.spec.ts
+++ b/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.spec.ts
@@ -3,7 +3,7 @@ import { Params } from '@angular/router';
 import { faker } from '@faker-js/faker';
 import { EMPTY_STRING, NavigationService } from '@goofy-client/tech-shared';
 import { Mock, mock, useFromMock } from '@goofy-client/test-utils';
-import { VorgangFacade, VorgangHeaderLinkRel, VorgangResource } from '@goofy-client/vorgang-shared';
+import { VorgangHeaderLinkRel, VorgangListService, VorgangResource } from '@goofy-client/vorgang-shared';
 import { getUrl, ResourceUri } from '@ngxp/rest';
 import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang';
 import { of } from 'rxjs';
@@ -12,16 +12,16 @@ import { VorgangSearchFormService } from './vorgang-search.formservice';
 describe('VorgangSearchFormService', () => {
 	let formService: VorgangSearchFormService;;
 	let navigationService: Mock<NavigationService>;
-	let vorgangFacade: Mock<VorgangFacade>
+	let vorgangListService: Mock<VorgangListService>
 
 	const SEARCH_STRING = 'i search for...';
 
 	beforeEach(() => {
-		vorgangFacade = mock(VorgangFacade);
-		vorgangFacade.getSearchInfo.mockReturnValue(of({}));
+		vorgangListService = mock(VorgangListService);
+		vorgangListService.getSearchInfo.mockReturnValue(of({}));
 		navigationService = mock(NavigationService);
 
-		formService = new VorgangSearchFormService(new FormBuilder(), useFromMock(navigationService), useFromMock(vorgangFacade));
+		formService = new VorgangSearchFormService(new FormBuilder(), useFromMock(navigationService), useFromMock(vorgangListService));
 	})
 
 	it('should create', () => {
@@ -44,7 +44,7 @@ describe('VorgangSearchFormService', () => {
 
 			formService.handleValueChanges(SEARCH_STRING);
 
-			expect(vorgangFacade.searchForPreview).toHaveBeenCalled();
+			expect(vorgangListService.searchForPreview).toHaveBeenCalled();
 		})
 
 		it('should clear preview list on 3 or less character', () => {
@@ -52,7 +52,7 @@ describe('VorgangSearchFormService', () => {
 
 			formService.handleValueChanges('AH');
 
-			expect(vorgangFacade.clearSearchPreviewList).toHaveBeenCalled();
+			expect(vorgangListService.clearSearchPreviewList).toHaveBeenCalled();
 		})
 	})
 
@@ -61,7 +61,7 @@ describe('VorgangSearchFormService', () => {
 		it('should call submit for preview list', () => {
 			formService.searchForPreviewList(SEARCH_STRING);
 
-			expect(vorgangFacade.searchForPreview).toHaveBeenCalledWith(SEARCH_STRING);
+			expect(vorgangListService.searchForPreview).toHaveBeenCalledWith(SEARCH_STRING);
 		})
 	})
 
@@ -70,7 +70,7 @@ describe('VorgangSearchFormService', () => {
 		it('should call submit for preview list', () => {
 			formService.clearVorgangSearchPreviewList();
 
-			expect(vorgangFacade.clearSearchPreviewList).toHaveBeenCalled();
+			expect(vorgangListService.clearSearchPreviewList).toHaveBeenCalled();
 		})
 	})
 
diff --git a/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.ts b/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.ts
index 245242decb..7f83a05620 100644
--- a/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.ts
+++ b/goofy-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.ts
@@ -2,7 +2,7 @@ import { Injectable, OnDestroy } from '@angular/core';
 import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
 import { Params } from '@angular/router';
 import { EMPTY_STRING, hasMinLength, isNotEmpty, isNotNil, NavigationService, toResourceUri } from '@goofy-client/tech-shared';
-import { SearchInfo, VorgangFacade, VorgangHeaderLinkRel, VorgangResource } from '@goofy-client/vorgang-shared';
+import { SearchInfo, VorgangHeaderLinkRel, VorgangListService, VorgangResource } from '@goofy-client/vorgang-shared';
 import { isEmpty } from 'lodash-es';
 import { Subscription } from 'rxjs';
 import { debounceTime, first } from 'rxjs/operators';
@@ -23,7 +23,7 @@ export class VorgangSearchFormService implements OnDestroy {
 	constructor(
 		private formBuilder: FormBuilder,
 		private navigationService: NavigationService,
-		private vorgangFacade: VorgangFacade
+		private vorgangListService: VorgangListService
 	) {
 		this.init();
 	}
@@ -62,15 +62,15 @@ export class VorgangSearchFormService implements OnDestroy {
 	}
 
 	searchForPreviewList(searchInput: string): void {
-		this.vorgangFacade.searchForPreview(searchInput);
+		this.vorgangListService.searchForPreview(searchInput);
 	}
 
 	clearVorgangSearchPreviewList(): void {
-		this.vorgangFacade.clearSearchPreviewList();
+		this.vorgangListService.clearSearchPreviewList();
 	}
 
 	private subscribeToSearchString(): void {
-		this.subscription = this.vorgangFacade.getSearchInfo().subscribe((searchInfo: SearchInfo) => this.patchSearchInfo(searchInfo));
+		this.subscription = this.vorgangListService.getSearchInfo().subscribe((searchInfo: SearchInfo) => this.patchSearchInfo(searchInfo));
 	}
 
 	patchSearchInfo(searchInfo: SearchInfo): void {
@@ -102,7 +102,6 @@ export class VorgangSearchFormService implements OnDestroy {
 	}
 
 	submitByPreviewList(resource: VorgangResource): void {
-		//TODO: Suchstring im State leeren anstelle FormControl patchen.
 		this.getSearchFormControl().patchValue(EMPTY_STRING);
 		this.navigateToVorgang(resource);
 	}
diff --git a/goofy-client/libs/vorgang-shared/src/index.ts b/goofy-client/libs/vorgang-shared/src/index.ts
index 4ffec6a858..d3cad9fd2d 100644
--- a/goofy-client/libs/vorgang-shared/src/index.ts
+++ b/goofy-client/libs/vorgang-shared/src/index.ts
@@ -1,8 +1,5 @@
-export * from './lib/+state/vorgang.actions';
-export * from './lib/+state/vorgang.facade';
-export * from './lib/+state/vorgang.reducer';
-export * from './lib/+state/vorgang.selectors';
 export * from './lib/vorgang-command.service';
+export * from './lib/vorgang-list.service';
 export * from './lib/vorgang-shared.module';
 export * from './lib/vorgang.linkrel';
 export * from './lib/vorgang.messages';
diff --git a/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.actions.ts b/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.actions.ts
index 2a8c281773..576fe02054 100644
--- a/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.actions.ts
+++ b/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.actions.ts
@@ -1,20 +1,27 @@
+import { ApiRootResource } from '@goofy-client/api-root-shared';
 import { ApiError } from '@goofy-client/tech-shared';
 import { createAction, props } from '@ngrx/store';
 import { VorgangListResource } from '../vorgang.model';
 
 export const noOperation = createAction('[Vorgang-Routing] No Operation');
 
-export const loadVorgangList = createAction('[Vorgang] Load VorgangList');
+//Typisiert:
+// export const loadVorgangList: ActionCreator<"[Vorgang] Load VorgangList", (props: { apiRoot: ApiRootResource; }) => { apiRoot: ApiRootResource; } & TypedAction<"[Vorgang] Load VorgangList">>
+// 	= createAction('[Vorgang] Load VorgangList', props<{ apiRoot: ApiRootResource }>());
+export const loadVorgangList = createAction('[Vorgang] Load VorgangList', props<{ apiRoot: ApiRootResource }>());
+
+export const searchVorgaengeBy = createAction('[Vorgang] Search VorgangList', props<{ apiRoot: ApiRootResource, searchString: string, linkRel: string }>());
+export const searchVorgaengeBySuccess = createAction('[Vorgang] Search VorgangList Success', props<{ loadedResource: VorgangListResource }>());
+
+export const loadMyVorgaengeList = createAction('[Vorgang] Load MyVorgaengList', props<{ apiRoot: ApiRootResource }>());
 export const loadVorgangListSuccess = createAction('[Vorgang] Load VorgangList Success', props<{ loadedResource: VorgangListResource }>());
 export const loadVorgangListFailure = createAction('[Vorgang] Load VorgangList Failure', props<{ apiError: ApiError }>());
 
 export const loadNextPage = createAction('[Vorgang] Load next VorgangList page');
-export const reloadVorgangList = createAction('[Vorgang] Reload VorgangList', props<{ searchString: string }>());
-
-export const searchForPreview = createAction('[Vorgang] Search for preview', props<{ searchString: string }>());
-export const searchForPreviewSuccess = createAction('[Vorgang] Search for preview Success', props<{ loadedResource: VorgangListResource }>());
-export const searchForPreviewFailure = createAction('[Vorgang] Search for preview Failure', props<{ apiError: ApiError }>());
+export const loadNextPageSuccess = createAction('[Vorgang] Load next VorgangList page Success', props<{ loadedResource: VorgangListResource }>());
 
-export const clearSearchPreviewList = createAction('[Vorgang] Clear Search preview');
+export const searchForPreview = createAction('[Vorgang-S1] Search for preview', props<{ searchString: string }>());
+export const searchForPreviewSuccess = createAction('[Vorgang-S2] Search for preview Success', props<{ loadedResource: VorgangListResource }>());
+export const searchForPreviewFailure = createAction('[Vorgang-S3] Search for preview Failure', props<{ apiError: ApiError }>());
 
-export const setSearchString = createAction('[Vorgang] Set SearchString', props<{ searchString: string }>());
\ No newline at end of file
+export const clearSearchPreviewList = createAction('[Vorgang-S4] Clear Search preview');
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.effects.spec.ts b/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.effects.spec.ts
index 3d34c6cabb..6a4a8cf58d 100644
--- a/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.effects.spec.ts
+++ b/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.effects.spec.ts
@@ -1,11 +1,10 @@
 import { TestBed } from '@angular/core/testing';
 import { ApiRootFacade, ApiRootLinkRel, ApiRootResource } from '@goofy-client/api-root-shared';
-import { NavigationFacade, RouteData } from '@goofy-client/navigation-shared';
-import { ApiError, createEmptyStateResource, createStateResource, StateResource } from '@goofy-client/tech-shared';
+import { NavigationFacade } from '@goofy-client/navigation-shared';
+import { ApiError, createStateResource } from '@goofy-client/tech-shared';
 import { mock } from '@goofy-client/test-utils';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { routerNavigatedAction } from '@ngrx/router-store';
-import { Action, MemoizedSelector } from '@ngrx/store';
+import { Action } from '@ngrx/store';
 import { MockStore, provideMockStore } from '@ngrx/store/testing';
 import { NxModule } from '@nrwl/angular';
 import { cold, hot } from 'jest-marbles';
@@ -13,13 +12,11 @@ import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
 import { createApiError } from 'libs/tech-shared/test/error';
 import { createVorgangListResource } from 'libs/vorgang-shared/test/vorgang';
 import { Observable, of } from 'rxjs';
-import { createCurrentRouteData } from '../../../../navigation-shared/test/navigation-test-factory';
-import * as NavigationUtil from '../vorgang-navigation.util';
+import { createRouteData } from '../../../../navigation-shared/test/navigation-test-factory';
 import { VorgangListResource } from '../vorgang.model';
 import { VorgangRepository } from '../vorgang.repository';
 import * as VorgangActions from './vorgang.actions';
 import { VorgangEffects } from './vorgang.effects';
-import { VorgangState } from './vorgang.reducer';
 import * as VorgangSelectors from './vorgang.selectors';
 
 describe('VorgangEffects', () => {
@@ -33,8 +30,6 @@ describe('VorgangEffects', () => {
 
 	const vorgangList: VorgangListResource = createVorgangListResource();
 
-	let vorgangListSelector: MemoizedSelector<VorgangState, StateResource<VorgangListResource>>;
-
 	beforeEach(() => {
 		TestBed.configureTestingModule({
 			imports: [NxModule.forRoot()],
@@ -60,42 +55,27 @@ describe('VorgangEffects', () => {
 		effects = TestBed.inject(VorgangEffects);
 
 		store = TestBed.inject(MockStore);
-		vorgangListSelector = store.overrideSelector(VorgangSelectors.vorgangList, createStateResource(vorgangList));
+		store.overrideSelector(VorgangSelectors.vorgangList, createStateResource(vorgangList));
 	});
 
-	describe('loadVorgangList$', () => {
+	describe('loadVorgangList', () => {
 
 		const vorgangList: VorgangListResource = createVorgangListResource();
 		const apiRoot: ApiRootResource = createApiRootResource();
-		const currentRouteData: RouteData = createCurrentRouteData();
-
-		beforeEach(() => {
-			apiRootFacade.getApiRoot.mockReturnValue(of(createStateResource(apiRoot)));
-			navigationFacade.getCurrentRouteData.mockReturnValue(of(currentRouteData));
-
-			effects.loadVorgangList = jest.fn().mockReturnValue(of(vorgangList));
-		})
-
-		it('should call api root facade', () => {
-			actions = of(VorgangActions.loadVorgangList());
-
-			effects.loadVorgangList$.subscribe();
-
-			expect(apiRootFacade.getApiRoot).toHaveBeenCalled();
-		})
+		const action = VorgangActions.loadVorgangList({ apiRoot });
 
-		it('should call loadVorgangList', () => {
-			actions = of(VorgangActions.loadVorgangList());
+		it('should call repository', () => {
+			actions = of(action);
 
 			effects.loadVorgangList$.subscribe();
 
-			expect(effects.loadVorgangList).toHaveBeenCalledWith(apiRoot, currentRouteData);
+			expect(vorgangRepository.loadVorgangList).toHaveBeenCalledWith(apiRoot);
 		})
 
 		it('should dispatch loadVorgangListSuccess action', () => {
-			effects.loadVorgangList = jest.fn().mockReturnValue(of(vorgangList));
+			vorgangRepository.loadVorgangList.mockReturnValue(of(vorgangList));
 
-			actions = hot('-a-|', { a: VorgangActions.loadVorgangList() });
+			actions = hot('-a-|', { a: action });
 
 			const expected = hot('-a-|', { a: VorgangActions.loadVorgangListSuccess({ loadedResource: vorgangList }) });
 			expect(effects.loadVorgangList$).toBeObservable(expected);
@@ -105,63 +85,90 @@ describe('VorgangEffects', () => {
 			const apiError: ApiError = createApiError()
 			const error = { error: { error: apiError } };
 			const errorResponse = cold('-#', {}, error);
-			effects.loadVorgangList = jest.fn(() => errorResponse);
+			vorgangRepository.loadVorgangList = jest.fn(() => errorResponse);
 
-			const expected = cold('--c', { c: VorgangActions.loadVorgangListFailure({ apiError }) });
-			actions = hot('-a', { a: VorgangActions.loadVorgangList() });
+			const expected = cold('--b', { b: VorgangActions.loadVorgangListFailure({ apiError }) });
+			actions = hot('-a', { a: action });
 
 			expect(effects.loadVorgangList$).toBeObservable(expected);
 		})
 	})
 
-	describe('loadVorgangList', () => {
+	describe('searchVorgaengeBy', () => {
 
+		const vorgangList: VorgangListResource = createVorgangListResource();
 		const apiRoot: ApiRootResource = createApiRootResource();
-		const searchString: string = 'searchThisForMe'
-		const searchLinkRel: ApiRootLinkRel = ApiRootLinkRel.SEARCH;
+		const searchString: string = 'search like me';
+		const linkRel: string = 'linkRelationName';
+		const action = VorgangActions.searchVorgaengeBy({ apiRoot, searchString, linkRel });
 
+		it('should call repository', () => {
+			actions = of(action);
 
-		describe('with existing searchString', () => {
+			effects.searchVorgaengeBy$.subscribe();
 
-			beforeEach(() => {
-				jest.spyOn(NavigationUtil, 'existSearchString').mockReturnValue(true);
-			})
+			expect(vorgangRepository.searchVorgaengeBy).toHaveBeenCalledWith(apiRoot, searchString, linkRel);
+		})
 
-			it('should call repository searchVorgaengeBy', () => {
-				jest.spyOn(NavigationUtil, 'getSearchString').mockReturnValue(searchString);
-				jest.spyOn(NavigationUtil, 'getSearchLinkRel').mockReturnValue(searchLinkRel);
+		it('should dispatch searchVorgaengeBySuccess action', () => {
+			vorgangRepository.searchVorgaengeBy.mockReturnValue(of(vorgangList));
 
-				effects.loadVorgangList(apiRoot, createCurrentRouteData());
+			actions = hot('-a-|', { a: action });
 
-				expect(vorgangRepository.searchVorgaengeBy).toHaveBeenCalledWith(apiRoot, searchString, searchLinkRel);
-			})
+			const expected = hot('-a-|', { a: VorgangActions.searchVorgaengeBySuccess({ loadedResource: vorgangList }) });
+			expect(effects.searchVorgaengeBy$).toBeObservable(expected);
 		})
 
-		describe('without searchString', () => {
+		it('should dispatch loadVorgangListFailure action', () => {
+			const apiError: ApiError = createApiError()
+			const error = { error: { error: apiError } };
+			const errorResponse = cold('-#', {}, error);
+			vorgangRepository.searchVorgaengeBy = jest.fn(() => errorResponse);
+
+			const expected = cold('--b', { b: VorgangActions.loadVorgangListFailure({ apiError }) });
+			actions = hot('-a', { a: action });
 
-			beforeEach(() => {
-				jest.spyOn(NavigationUtil, 'existSearchString').mockReturnValue(false);
-			})
+			expect(effects.searchVorgaengeBy$).toBeObservable(expected);
+		})
+	})
+
+	describe('loadMyVorgaengeList', () => {
 
-			it('should call repository loadMyVorgaengeList if urlSegement exists', () => {
-				jest.spyOn(NavigationUtil, 'isMyVorgaenge').mockReturnValue(true);
+		const vorgangList: VorgangListResource = createVorgangListResource();
+		const apiRoot: ApiRootResource = createApiRootResource();
+		const action = VorgangActions.loadMyVorgaengeList({ apiRoot });
 
-				effects.loadVorgangList(apiRoot, createCurrentRouteData());
+		it('should call repository', () => {
+			actions = of(action);
 
-				expect(vorgangRepository.loadMyVorgaengeList).toHaveBeenCalledWith(apiRoot);
-			})
+			effects.loadMyVorgaengeList$.subscribe();
 
-			it('should call repository loadVorgangList', () => {
-				jest.spyOn(NavigationUtil, 'isMyVorgaenge').mockReturnValue(false);
+			expect(vorgangRepository.loadMyVorgaengeList).toHaveBeenCalledWith(apiRoot);
+		})
+
+		it('should dispatch loadVorgangListSuccess action', () => {
+			vorgangRepository.loadMyVorgaengeList.mockReturnValue(of(vorgangList));
+
+			actions = hot('-a-|', { a: action });
+
+			const expected = hot('-a-|', { a: VorgangActions.loadVorgangListSuccess({ loadedResource: vorgangList }) });
+			expect(effects.loadMyVorgaengeList$).toBeObservable(expected);
+		})
+
+		it('should dispatch loadVorgangListFailure action', () => {
+			const apiError: ApiError = createApiError()
+			const error = { error: { error: apiError } };
+			const errorResponse = cold('-#', {}, error);
+			vorgangRepository.loadMyVorgaengeList = jest.fn(() => errorResponse);
 
-				effects.loadVorgangList(apiRoot, createCurrentRouteData());
+			const expected = cold('--b', { b: VorgangActions.loadVorgangListFailure({ apiError }) });
+			actions = hot('-a', { a: action });
 
-				expect(vorgangRepository.loadVorgangList).toHaveBeenCalledWith(apiRoot);
-			})
+			expect(effects.loadMyVorgaengeList$).toBeObservable(expected);
 		})
 	})
 
-	describe('loadNextPage$', () => {
+	describe('loadNextPage', () => {
 
 		const action = VorgangActions.loadNextPage();
 
@@ -187,7 +194,7 @@ describe('VorgangEffects', () => {
 
 			actions = hot('-a-|', { a: action });
 
-			const expected = hot('-a-|', { a: VorgangActions.loadVorgangListSuccess({ loadedResource: vorgangList }) });
+			const expected = hot('-a-|', { a: VorgangActions.loadNextPageSuccess({ loadedResource: vorgangList }) });
 			expect(effects.loadNextPage$).toBeObservable(expected);
 		})
 
@@ -204,7 +211,7 @@ describe('VorgangEffects', () => {
 		})
 	})
 
-	describe('searchForPreview$', () => {
+	describe('searchForPreview', () => {
 
 		const vorgangList: VorgangListResource = createVorgangListResource();
 		const apiRoot: ApiRootResource = createApiRootResource();
@@ -214,7 +221,7 @@ describe('VorgangEffects', () => {
 
 		beforeEach(() => {
 			apiRootFacade.getApiRoot.mockReturnValue(of(createStateResource(apiRoot)));
-			navigationFacade.getCurrentRouteData.mockReturnValue(of(createCurrentRouteData()));
+			navigationFacade.getCurrentRouteData.mockReturnValue(of(createStateResource(createRouteData())));
 		})
 
 		it('should call apiRootFacade', () => {
@@ -262,86 +269,4 @@ describe('VorgangEffects', () => {
 			expect(effects.searchForPreview$).toBeObservable(expected);
 		})
 	})
-
-	describe('navigate$', () => {
-
-		const action = routerNavigatedAction;
-		const currentRouteData: RouteData = createCurrentRouteData();
-
-		beforeEach(() => {
-			navigationFacade.getCurrentRouteData.mockReturnValue(of(currentRouteData));
-		})
-
-		it('should select vorgangList from state', () => {
-			store.select = jest.fn();
-			actions = of(action);
-
-			effects.navigate$.subscribe();
-
-			expect(store.select).toHaveBeenCalledWith(VorgangSelectors.vorgangList);
-		})
-
-		it('should call navigationFacade', () => {
-			actions = of(action);
-
-			effects.navigate$.subscribe();
-
-			expect(navigationFacade.getCurrentRouteData).toHaveBeenCalled();
-		})
-
-		it('should dispatch noOperation action', () => {
-			vorgangListSelector.setResult(createEmptyStateResource());
-			actions = hot('-a-|', { a: action });
-
-			effects.navigate$.subscribe();
-
-			const expected = hot('-a-|', { a: VorgangActions.noOperation() });
-			expect(effects.navigate$).toBeObservable(expected);
-		})
-
-		it('should dispatch reloadVorgang action', () => {
-			vorgangListSelector.setResult(createStateResource(vorgangList));
-			jest.spyOn(NavigationUtil, 'navigateFromVorgangList').mockReturnValue(true);
-
-			actions = hot('-a-|', { a: action });
-
-			effects.navigate$.subscribe();
-
-			const expected = hot('-a-|', { a: VorgangActions.reloadVorgangList({ searchString: null }) });
-			expect(effects.navigate$).toBeObservable(expected);
-		})
-
-		describe('with existing searchString', () => {
-
-			const searchString: string = 'searchThisForMe';
-
-			beforeEach(() => {
-				jest.spyOn(NavigationUtil, 'getSearchString').mockReturnValue(searchString);
-				jest.spyOn(NavigationUtil, 'existSearchString').mockReturnValue(true);
-			})
-
-			it('should dispatch reloadVorgang with searchString action', () => {
-				vorgangListSelector.setResult(createStateResource(vorgangList));
-				jest.spyOn(NavigationUtil, 'navigateFromVorgangList').mockReturnValue(false);
-
-				actions = hot('-a-|', { a: action });
-
-				effects.navigate$.subscribe();
-
-				const expected = hot('-a-|', { a: VorgangActions.reloadVorgangList({ searchString }) });
-				expect(effects.navigate$).toBeObservable(expected);
-			})
-
-			it('should dispatch setSearchString action', () => {
-				vorgangListSelector.setResult(createEmptyStateResource());
-
-				actions = hot('-a-|', { a: action });
-
-				effects.navigate$.subscribe();
-
-				const expected = hot('-a-|', { a: VorgangActions.setSearchString({ searchString }) });
-				expect(effects.navigate$).toBeObservable(expected);
-			})
-		})
-	})
 });
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.effects.ts b/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.effects.ts
index e7bf7f4e35..31fcc78285 100644
--- a/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.effects.ts
+++ b/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.effects.ts
@@ -1,13 +1,11 @@
 import { Injectable } from '@angular/core';
-import { ApiRootFacade, ApiRootResource } from '@goofy-client/api-root-shared';
-import { NavigationFacade, RouteData } from '@goofy-client/navigation-shared';
+import { ApiRootFacade } from '@goofy-client/api-root-shared';
+import { NavigationFacade } from '@goofy-client/navigation-shared';
 import { Actions, concatLatestFrom, createEffect, ofType } from '@ngrx/effects';
-import { routerNavigatedAction } from '@ngrx/router-store';
 import { Store } from '@ngrx/store';
-import { Observable, of } from 'rxjs';
+import { of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
-import { existSearchString, getSearchLinkRel, getSearchString, isMyVorgaenge, navigateFromVorgangList } from '../vorgang-navigation.util';
-import { VorgangListResource } from '../vorgang.model';
+import { getSearchLinkRel } from '../vorgang-navigation.util';
 import { VorgangRepository } from '../vorgang.repository';
 import * as VorgangActions from './vorgang.actions';
 import * as VorgangSelectors from './vorgang.selectors';
@@ -24,36 +22,45 @@ export class VorgangEffects {
 	loadVorgangList$ = createEffect(() =>
 		this.actions$.pipe(
 			ofType(VorgangActions.loadVorgangList),
-			concatLatestFrom(() => [this.apiRootFacade.getApiRoot(), this.navigationFacade.getCurrentRouteData()]),
-			switchMap(([, apiRoot, currentRouteData]) => {
-				return this.loadVorgangList(apiRoot.resource, currentRouteData).pipe(
-					map(listResource => VorgangActions.loadVorgangListSuccess({ loadedResource: listResource })),
-					catchError(error => of(VorgangActions.loadVorgangListFailure({ apiError: this.getApiErrorFromHttpError(error) })))
-				);
-			})
+			switchMap((action) => this.repository.loadVorgangList(action.apiRoot).pipe(
+				map(listResource => VorgangActions.loadVorgangListSuccess({ loadedResource: listResource })),
+				catchError(error => of(VorgangActions.loadVorgangListFailure({ apiError: this.getApiErrorFromHttpError(error) })))
+			)
+			)
 		)
 	)
 
-	loadVorgangList(apiRoot: ApiRootResource, currentRouteData: RouteData): Observable<VorgangListResource> {
-		if (existSearchString(currentRouteData)) {
-			return this.repository.searchVorgaengeBy(apiRoot, getSearchString(currentRouteData), getSearchLinkRel(currentRouteData));
-		}
-		if (isMyVorgaenge(currentRouteData)) {
-			return this.repository.loadMyVorgaengeList(apiRoot);
-		}
-		return this.repository.loadVorgangList(apiRoot);
-	}
+	searchVorgaengeBy$ = createEffect(() =>
+		this.actions$.pipe(
+			ofType(VorgangActions.searchVorgaengeBy),
+			switchMap((action) => this.repository.searchVorgaengeBy(action.apiRoot, action.searchString, action.linkRel).pipe(
+				map(listResource => VorgangActions.searchVorgaengeBySuccess({ loadedResource: listResource })),
+				catchError(error => of(VorgangActions.loadVorgangListFailure({ apiError: this.getApiErrorFromHttpError(error) })))
+			)
+			)
+		)
+	)
+
+	loadMyVorgaengeList$ = createEffect(() =>
+		this.actions$.pipe(
+			ofType(VorgangActions.loadMyVorgaengeList),
+			switchMap((action) => this.repository.loadMyVorgaengeList(action.apiRoot).pipe(
+				map(listResource => VorgangActions.loadVorgangListSuccess({ loadedResource: listResource })),
+				catchError(error => of(VorgangActions.loadVorgangListFailure({ apiError: this.getApiErrorFromHttpError(error) })))
+			)
+			)
+		)
+	)
 
 	loadNextPage$ = createEffect(() =>
 		this.actions$.pipe(
 			ofType(VorgangActions.loadNextPage),
 			concatLatestFrom(() => this.store.select(VorgangSelectors.vorgangList)),
-			switchMap(([, vorgangList]) => {
-				return this.repository.getNextVorgangListPage(vorgangList.resource).pipe(
-					map(listResource => VorgangActions.loadVorgangListSuccess({ loadedResource: listResource })),
-					catchError(error => of(VorgangActions.loadVorgangListFailure({ apiError: this.getApiErrorFromHttpError(error) })))
-				)
-			})
+			switchMap(([, vorgangList]) => this.repository.getNextVorgangListPage(vorgangList.resource).pipe(
+				map(listResource => VorgangActions.loadNextPageSuccess({ loadedResource: listResource })),
+				catchError(error => of(VorgangActions.loadVorgangListFailure({ apiError: this.getApiErrorFromHttpError(error) })))
+			)
+			)
 		)
 	)
 
@@ -62,9 +69,15 @@ export class VorgangEffects {
 			ofType(VorgangActions.searchForPreview),
 			concatLatestFrom(() => [this.apiRootFacade.getApiRoot(), this.navigationFacade.getCurrentRouteData()]),
 			switchMap(([action, apiRoot, currentRouteData]) => {
-				return this.repository.searchVorgaengeBy(apiRoot.resource, action.searchString, getSearchLinkRel(currentRouteData), VorgangEffects.SEARCH_PREVIEW_LIST_LIMIT).pipe(
-					map(listResource => VorgangActions.searchForPreviewSuccess({ loadedResource: listResource })),
-					catchError(error => of(VorgangActions.searchForPreviewFailure({ apiError: this.getApiErrorFromHttpError(error) })))
+				return this.repository.searchVorgaengeBy(apiRoot.resource, action.searchString, getSearchLinkRel(currentRouteData.resource), VorgangEffects.SEARCH_PREVIEW_LIST_LIMIT).pipe(
+					map(listResource => {
+						console.info('effect: dispatch search success with loaded resource', listResource);
+						return VorgangActions.searchForPreviewSuccess({ loadedResource: listResource });
+					}),
+					catchError(error => {
+						console.info('effect: catch error', error);
+						return of(VorgangActions.searchForPreviewFailure({ apiError: this.getApiErrorFromHttpError(error) }));
+					})
 				)
 			})
 		)
@@ -73,25 +86,4 @@ export class VorgangEffects {
 	private getApiErrorFromHttpError(error: any) {
 		return error.error.error;
 	}
-
-	navigate$ = createEffect(() =>
-		this.actions$.pipe(
-			ofType(routerNavigatedAction),
-			concatLatestFrom(() => [this.store.select(VorgangSelectors.vorgangList), this.navigationFacade.getCurrentRouteData()]),
-			switchMap(([, vorgangList, currentRouteData]) => {
-				if (vorgangList.loaded) {
-					if (navigateFromVorgangList(currentRouteData)) {
-						return of(VorgangActions.reloadVorgangList({ searchString: null }));
-					}
-					if (existSearchString(currentRouteData)) {
-						return of(VorgangActions.reloadVorgangList({ searchString: getSearchString(currentRouteData) }));
-					}
-				}
-				if (existSearchString(currentRouteData)) {
-					return of(VorgangActions.setSearchString({ searchString: getSearchString(currentRouteData) }));
-				}
-				return of(VorgangActions.noOperation());
-			})
-		)
-	)
 }
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.facade.spec.ts b/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.facade.spec.ts
index 0c35a5c4bc..023bbbd5dd 100644
--- a/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.facade.spec.ts
+++ b/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.facade.spec.ts
@@ -1,6 +1,8 @@
-import { createEmptyStateResource, createStateResource, EMPTY_STRING, StateResource } from '@goofy-client/tech-shared';
+import { ApiRootResource } from '@goofy-client/api-root-shared';
+import { createStateResource, EMPTY_STRING, StateResource } from '@goofy-client/tech-shared';
 import { Mock, mock, useFromMock } from '@goofy-client/test-utils';
 import { Store } from '@ngrx/store';
+import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
 import { createVorgangListResource, createVorgangResources } from 'libs/vorgang-shared/test/vorgang';
 import { Subject } from 'rxjs';
 import { SearchInfo, VorgangListResource, VorgangResource } from '../vorgang.model';
@@ -30,55 +32,51 @@ describe('VorgangFacade', () => {
 
 	describe('getVorgangList', () => {
 
-		describe('on loaded resource', () => {
+		it('should return selected value', (done) => {
+			const vorgaengeStateResource: StateResource<VorgangResource[]> = createStateResource(createVorgangResources());
 
-			it('should return selected value', (done) => {
-				const vorgangListStateResource: StateResource<VorgangListResource> = createStateResource(createVorgangListResource());
+			facade.getVorgangList().subscribe(vorgaenge => {
+				expect(vorgaenge).toBe(vorgaengeStateResource);
+				done();
+			});
 
-				facade.getVorgangList().subscribe(vorgangList => {
-					expect(store.dispatch).not.toHaveBeenCalledWith(VorgangActions.loadVorgangList());
-					expect(vorgangList).toBe(vorgangListStateResource);
-					done();
-				});
+			selectionSubject.next(vorgaengeStateResource);
+		});
+	})
 
-				selectionSubject.next(vorgangListStateResource);
-			});
+	describe('loadVorgangList', () => {
 
-			it('should not dispatch action', (done) => {
-				const vorgangListStateResource: StateResource<VorgangListResource> = createStateResource(createVorgangListResource());
+		it('should dispatch "loadVorgangList" action', () => {
+			const apiRoot: ApiRootResource = createApiRootResource();
 
-				facade.getVorgangList().subscribe(() => {
-					expect(store.dispatch).not.toHaveBeenCalledWith(VorgangActions.loadVorgangList());
-					done();
-				});
+			facade.loadVorgangList(apiRoot);
 
-				selectionSubject.next(vorgangListStateResource);
-			})
-		})
+			expect(store.dispatch).toHaveBeenCalledWith(VorgangActions.loadVorgangList({ apiRoot }));
+		});
+	})
 
-		describe('on NOT loaded resource', () => {
+	describe('searchVorgaengeBy', () => {
 
-			it('should set loading to true', (done) => {
-				facade.getVorgangList().subscribe(historieList => {
-					expect(historieList.loading).toBe(true);
-					done();
-				});
+		const apiRoot: ApiRootResource = createApiRootResource();
+		const searchString: string = 'search like me';
+		const linkRel: string = 'LinkRelationName';
 
-				selectionSubject.next(createEmptyStateResource());
-				selectionSubject.next(createEmptyStateResource(true));
-			});
+		it('should dispatch "searchVorgaengeBy" action', () => {
+			facade.searchVorgaengeBy(apiRoot, searchString, linkRel);
 
-			it('should dispatch "loadVorgangList" action if not loaded', (done) => {
-				facade.getVorgangList().subscribe(historieList => {
-					expect(store.dispatch).toHaveBeenCalledWith(VorgangActions.loadVorgangList());
-					expect(historieList.loading).toBe(true);
-					done();
-				});
+			expect(store.dispatch).toHaveBeenCalledWith(VorgangActions.searchVorgaengeBy({ apiRoot, searchString, linkRel }));
+		});
+	})
 
-				selectionSubject.next(createEmptyStateResource());
-				selectionSubject.next(createEmptyStateResource(true));
-			});
-		})
+	describe('loadMyVorgaengeList', () => {
+
+		it('should dispatch "loadMyVorgaengeList" action', () => {
+			const apiRoot: ApiRootResource = createApiRootResource();
+
+			facade.loadMyVorgaengeList(apiRoot);
+
+			expect(store.dispatch).toHaveBeenCalledWith(VorgangActions.loadMyVorgaengeList({ apiRoot }));
+		});
 	})
 
 	describe('getVorgaenge', () => {
@@ -95,7 +93,7 @@ describe('VorgangFacade', () => {
 		});
 	})
 
-	describe('getSearchString', () => {
+	describe('getSearchInfo', () => {
 
 		it('should return selected value', (done) => {
 			const searchInfoStateValue: StateResource<SearchInfo> = createStateResource({ changedAfterSearchDone: false, searchString: EMPTY_STRING });
diff --git a/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.facade.ts b/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.facade.ts
index a6fcf58ae8..191faeb896 100644
--- a/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.facade.ts
+++ b/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.facade.ts
@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
-import { doIfLoadingRequired, StateResource } from '@goofy-client/tech-shared';
+import { ApiRootResource } from '@goofy-client/api-root-shared';
+import { StateResource } from '@goofy-client/tech-shared';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { filter } from 'rxjs/operators';
 import { SearchInfo, VorgangListResource, VorgangResource } from '../vorgang.model';
 import * as VorgangActions from './vorgang.actions';
 import * as VorgangSelectors from './vorgang.selectors';
@@ -13,8 +13,19 @@ export class VorgangFacade {
 	constructor(private readonly store: Store) { }
 
 	public getVorgangList(): Observable<StateResource<VorgangListResource>> {
-		return this.store.select(VorgangSelectors.vorgangList).pipe(
-			filter(vorgangList => !doIfLoadingRequired(vorgangList, () => this.store.dispatch(VorgangActions.loadVorgangList()))));
+		return this.store.select(VorgangSelectors.vorgangList);
+	}
+
+	public loadVorgangList(apiRoot: ApiRootResource): void {
+		this.store.dispatch(VorgangActions.loadVorgangList({ apiRoot }));
+	}
+
+	public searchVorgaengeBy(apiRoot: ApiRootResource, searchString: string, linkRel: string): void {
+		this.store.dispatch(VorgangActions.searchVorgaengeBy({ apiRoot, searchString, linkRel }));
+	}
+
+	public loadMyVorgaengeList(apiRoot: ApiRootResource): void {
+		this.store.dispatch(VorgangActions.loadMyVorgaengeList({ apiRoot }));
 	}
 
 	public getVorgaenge(): Observable<VorgangResource[]> {
diff --git a/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.spec.ts b/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.spec.ts
index ad50201cf3..65fe723204 100644
--- a/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.spec.ts
+++ b/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.spec.ts
@@ -1,10 +1,17 @@
-import { ApiError, createEmptyStateResource, createStateResource, EMPTY_ARRAY } from '@goofy-client/tech-shared';
+import { UrlSegment } from '@angular/router';
+import { ApiRootResource } from '@goofy-client/api-root-shared';
+import { RouteData } from '@goofy-client/navigation-shared';
+import { ApiError, createEmptyStateResource, createStateResource, EMPTY_ARRAY, EMPTY_STRING } from '@goofy-client/tech-shared';
 import { Action } from '@ngrx/store';
-import { createVorgangListResource, createVorgangListResourceWithResource, createVorgangResources } from 'libs/vorgang-shared/test/vorgang';
+import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
+import { createRouteData } from 'libs/navigation-shared/test/navigation-test-factory';
+import { createVorgangListResource, createVorgangListResourceWithResource, createVorgangResource, createVorgangResources } from 'libs/vorgang-shared/test/vorgang';
+import * as NavigationActions from '../../../../navigation-shared/src/lib/+state/navigation.actions';
 import { createApiError } from '../../../../tech-shared/test/error';
 import { VorgangListLinkRel } from '../vorgang.linkrel';
 import { VorgangListResource, VorgangResource } from '../vorgang.model';
 import * as VorgangActions from './vorgang.actions';
+import { VorgangEffects } from './vorgang.effects';
 import { initialState, reducer, VorgangState } from './vorgang.reducer';
 
 describe('Vorgang Reducer', () => {
@@ -25,7 +32,7 @@ describe('Vorgang Reducer', () => {
 		describe('on "loadVorgangList" action', () => {
 
 			it('should set loading to true', () => {
-				const action = VorgangActions.loadVorgangList();
+				const action = VorgangActions.loadVorgangList({ apiRoot: createApiRootResource() });
 
 				const state: VorgangState = reducer(initialState, action);
 
@@ -81,39 +88,94 @@ describe('Vorgang Reducer', () => {
 		})
 	})
 
-	describe('on "reloadVorgangList" action', () => {
+	describe('loadNextPage', () => {
 
-		const searchString: string = 'searchThisForMe';
-		const action = VorgangActions.reloadVorgangList({ searchString });
+		describe('on "loadNextPage" action', () => {
 
-		it('should set vorgangList to reload', () => {
-			const state: VorgangState = reducer(initialState, action);
+			it('should set vorgangList reload to true', () => {
+				const action = VorgangActions.loadNextPage();
 
-			expect(state.vorgangList.reload).toBeTruthy();
+				const state: VorgangState = reducer(initialState, action);
+
+				expect(state.vorgangList.reload).toBeTruthy();
+			})
 		})
 
-		it('should clear vorgaenge', () => {
-			const state: VorgangState = reducer({ ...initialState, vorgaenge: createVorgangResources() }, action);
+		describe('on "loadNextPageSuccess" action', () => {
 
-			expect(state.vorgaenge).toBe(EMPTY_ARRAY);
-		})
+			const vorgangListResource: VorgangListResource = createVorgangListResource();
+
+			it('should set vorgangList', () => {
+				const action = VorgangActions.loadNextPageSuccess({ loadedResource: vorgangListResource });
+
+				const state: VorgangState = reducer(initialState, action);
+
+				expect(state.vorgangList).toStrictEqual(createStateResource(vorgangListResource));
+			})
 
-		it('should set searchString', () => {
-			const state: VorgangState = reducer(initialState, action);
+			it('should add vorgaenge', () => {
+				const action = VorgangActions.loadNextPageSuccess({ loadedResource: vorgangListResource });
 
-			expect(state.searchInfo.searchString).toBe(searchString);
+				const state: VorgangState = reducer({ ...initialState, vorgaenge: [createVorgangResource()] }, action);
+
+				expect(state.vorgaenge.length).toBe(11);
+			})
 		})
 	})
 
-	describe('on "setSearchString" action', () => {
+	describe('searchVorgaengeBy', () => {
+
+		describe('on "searchVorgaengeBy" action', () => {
+
+			const apiRoot: ApiRootResource = createApiRootResource();
+			const searchString: string = 'search like me';
+			const linkRel: string = 'LinkRelationName';
+
+			const action = VorgangActions.searchVorgaengeBy({ apiRoot, searchString, linkRel });
+
+			it('should vorgangList loading', () => {
+				const state: VorgangState = reducer(initialState, action);
+
+				expect(state.vorgangList.loading).toBeTruthy();
+			})
+
+			it('should clear vorgaenge', () => {
+				const state: VorgangState = reducer(initialState, action);
+
+				expect(state.vorgaenge).toBe(EMPTY_ARRAY);
+			})
+
+			it('should clear searchPreviewList', () => {
+				const state: VorgangState = reducer(initialState, action);
+
+				expect(state.searchPreviewList).toStrictEqual(createEmptyStateResource());
+			})
+		})
+
+		describe('on "searchVorgaengeBySuccess" action', () => {
+
+			const vorgaenge: VorgangResource[] = createVorgangResources();
+			const vorgangListResource: VorgangListResource = createVorgangListResourceWithResource(vorgaenge);
+
+			const action = VorgangActions.searchVorgaengeBySuccess({ loadedResource: vorgangListResource });
+
+			it('should set vorgangList', () => {
+				const state: VorgangState = reducer(initialState, action);
+
+				expect(state.vorgangList).toStrictEqual(createStateResource(vorgangListResource));
+			})
 
-		const searchString: string = 'searchThisForMe';
-		const action = VorgangActions.setSearchString({ searchString });
+			it('should set vorgaenge', () => {
+				const state: VorgangState = reducer(initialState, action);
+
+				expect(state.vorgaenge).toBe(vorgaenge);
+			})
 
-		it('should set searchString', () => {
-			const state: VorgangState = reducer(initialState, action);
+			it('should clear searchPreviewList', () => {
+				const state: VorgangState = reducer(initialState, action);
 
-			expect(state.searchInfo.searchString).toBe(searchString);
+				expect(state.searchPreviewList).toStrictEqual(createEmptyStateResource());
+			})
 		})
 	})
 
@@ -166,4 +228,56 @@ describe('Vorgang Reducer', () => {
 			})
 		})
 	})
+
+	describe('on "updateCurrentReouteData" action', () => {
+
+		const routeData: RouteData = createRouteData();
+
+		describe('navigate to vorgangDetailPage', () => {
+
+			const action = NavigationActions.updateCurrentRouteData({ routeData: { ...routeData, queryParameter: { ['vorgangWithEingangUrl']: 'encodedVorgangUri' } } });
+
+			it('should set searchInfo', () => {
+				const state: VorgangState = reducer(initialState, action);
+
+				expect(state.searchInfo.searchString).toEqual(EMPTY_STRING);
+			})
+
+			it('should set vorganglist reload to true', () => {
+				const state: VorgangState = reducer(initialState, action);
+
+				expect(state.vorgangList.reload).toBeTruthy();
+			})
+		})
+
+		describe('navigate with existing search string', () => {
+
+			const searchString: string = 'search like me';
+			const action = NavigationActions.updateCurrentRouteData({ routeData: buildCurrentRouteData(searchString) });
+
+			it('should set searchInfo', () => {
+				const state: VorgangState = reducer(initialState, action);
+
+				expect(state.searchInfo.searchString).toEqual(searchString);
+			})
+
+			it('should vorgangList reload to true', () => {
+				const state: VorgangState = reducer(initialState, action);
+
+				expect(state.vorgangList.reload).toBeTruthy();
+			})
+
+			it('should clear searchPreviewList on changed searchString', () => {
+				const state: VorgangState = reducer({ ...initialState, searchInfo: { ...initialState.searchInfo, searchString: 'existingSearchString' } }, action);
+
+				expect(state.searchPreviewList).toStrictEqual(createEmptyStateResource());
+			})
+		})
+
+		function buildCurrentRouteData(searchString: string): RouteData {
+			const urlSegments: UrlSegment[] = [<any>{ path: VorgangEffects.SEARCH_QUERY_PARAM }, <any>{ path: searchString }];
+			const queryParameter = { [VorgangEffects.SEARCH_QUERY_PARAM]: searchString };
+			return { ...createRouteData(), urlSegments, queryParameter };
+		}
+	})
 });
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.ts b/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.ts
index 4c8f556011..a2b0e7f123 100644
--- a/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.ts
+++ b/goofy-client/libs/vorgang-shared/src/lib/+state/vorgang.reducer.ts
@@ -1,5 +1,8 @@
+import { RouteData } from '@goofy-client/navigation-shared';
 import { createEmptyStateResource, createErrorStateResource, createStateResource, EMPTY_ARRAY, EMPTY_STRING, StateResource } from '@goofy-client/tech-shared';
 import { Action, createReducer, on } from '@ngrx/store';
+import * as NavigationActions from '../../../../navigation-shared/src/lib/+state/navigation.actions';
+import { existSearchString, getSearchString, isVorgangDetailPage } from '../vorgang-navigation.util';
 import { SearchInfo, VorgangListResource, VorgangResource } from '../vorgang.model';
 import { getVorgaengeFromList } from '../vorgang.util';
 import * as VorgangActions from './vorgang.actions';
@@ -26,54 +29,94 @@ export const initialState: VorgangState = {
 
 const vorgangReducer = createReducer(
 	initialState,
-	on(VorgangActions.loadVorgangList, (state, { }) => ({
+	on(VorgangActions.loadVorgangList, (state: VorgangState): VorgangState => ({
 		...state,
-		vorgangList: { ...state.vorgangList, loading: true }
+		vorgangList: { ...state.vorgangList, loading: true },
 	})),
-	on(VorgangActions.loadVorgangListSuccess, (state, action) => {
-		return {
-			...state,
-			vorgangList: createStateResource<VorgangListResource>(action.loadedResource),
-			vorgaenge: [...state.vorgaenge].concat(getVorgaengeFromList(action.loadedResource)),
-			searchPreviewList: createEmptyStateResource()
-		}
-	}),
-	on(VorgangActions.loadVorgangListFailure, (state, { apiError }) => ({
+	on(VorgangActions.loadVorgangListSuccess, (state: VorgangState, action) => ({
+		...state,
+		vorgangList: createStateResource<VorgangListResource>(action.loadedResource),
+		vorgaenge: getVorgaengeFromList(action.loadedResource),
+		searchPreviewList: createEmptyStateResource<VorgangListResource>()
+	})),
+	on(VorgangActions.loadVorgangListFailure, (state: VorgangState, action): VorgangState => ({
 		...state,
-		vorgangList: createErrorStateResource(apiError),
+		vorgangList: createErrorStateResource(action.apiError),
 		searchPreviewList: createEmptyStateResource()
 	})),
 
-	on(VorgangActions.reloadVorgangList, (state, { searchString }) => ({
+
+	on(VorgangActions.loadNextPage, (state: VorgangState): VorgangState => ({
 		...state,
 		vorgangList: { ...state.vorgangList, reload: true },
-		vorgaenge: EMPTY_ARRAY,
-		searchInfo: { ...state.searchInfo, searchString }
 	})),
+	on(VorgangActions.loadNextPageSuccess, (state, action): VorgangState => ({
+		...state,
+		vorgangList: createStateResource<VorgangListResource>(action.loadedResource),
+		vorgaenge: [...state.vorgaenge].concat(getVorgaengeFromList(action.loadedResource)),
+	})),
+
 
-	on(VorgangActions.setSearchString, (state, { searchString }) => ({
+	on(VorgangActions.searchVorgaengeBy, (state: VorgangState): VorgangState => ({
+		...state,
+		vorgangList: { ...state.vorgangList, loading: true },
+		vorgaenge: EMPTY_ARRAY,
+		searchPreviewList: createEmptyStateResource()
+	})),
+	on(VorgangActions.searchVorgaengeBySuccess, (state: VorgangState, action): VorgangState => ({
 		...state,
-		searchInfo: { searchString, changedAfterSearchDone: true }
+		vorgangList: createStateResource<VorgangListResource>(action.loadedResource),
+		vorgaenge: getVorgaengeFromList(action.loadedResource),
+		searchPreviewList: createEmptyStateResource<VorgangListResource>()
 	})),
 
-	on(VorgangActions.searchForPreview, (state, { }) => ({
+
+	on(VorgangActions.searchForPreview, (state: VorgangState): VorgangState => ({
 		...state,
 		searchPreviewList: { ...state.searchPreviewList, loading: true }
 	})),
-	on(VorgangActions.searchForPreviewSuccess, (state, { loadedResource }) => ({
+	on(VorgangActions.searchForPreviewSuccess, (state: VorgangState, action): VorgangState => ({
 		...state,
-		searchPreviewList: createStateResource(loadedResource)
+		searchPreviewList: createStateResource<VorgangListResource>(action.loadedResource)
 	})),
-	on(VorgangActions.searchForPreviewFailure, (state, { apiError }) => ({
+	on(VorgangActions.searchForPreviewFailure, (state: VorgangState, action): VorgangState => ({
 		...state,
-		searchPreviewList: createErrorStateResource(apiError)
+		searchPreviewList: createErrorStateResource(action.apiError)
 	})),
-	on(VorgangActions.clearSearchPreviewList, (state, { }) => ({
+	on(VorgangActions.clearSearchPreviewList, (state: VorgangState): VorgangState => ({
 		...state,
-		searchPreviewList: createEmptyStateResource()
+		vorgangList: { ...state.vorgangList, reload: true },
+		searchPreviewList: createEmptyStateResource<VorgangListResource>()
 	})),
+
+
+	on(NavigationActions.updateCurrentRouteData, (state, action): VorgangState => {
+		return buildStateOnNavigation(state, action.routeData);
+	})
 );
 
+function buildStateOnNavigation(state: VorgangState, routeData: RouteData): VorgangState {
+	if (isVorgangDetailPage(routeData)) {
+		return ({
+			...state,
+			searchInfo: { ...state.searchInfo, searchString: EMPTY_STRING, changedAfterSearchDone: false },
+			vorgangList: { ...state.vorgangList, reload: true }
+		});
+	}
+	if (existSearchString(routeData)) {
+		const newState: VorgangState = {
+			...state,
+			searchInfo: { ...state.searchInfo, searchString: getSearchString(routeData), changedAfterSearchDone: true },
+			vorgangList: { ...state.vorgangList, reload: true }
+		}
+		if (getSearchString(routeData) != state.searchInfo.searchString) {
+			return { ...newState, searchPreviewList: createEmptyStateResource() }
+		}
+		return newState;
+	}
+	return { ...state };
+}
+
 export function reducer(state: VorgangState, action: Action) {
 	return vorgangReducer(state, action);
 }
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-shared/src/lib/vorgang-list.service.spec.ts b/goofy-client/libs/vorgang-shared/src/lib/vorgang-list.service.spec.ts
new file mode 100644
index 0000000000..07040b9a52
--- /dev/null
+++ b/goofy-client/libs/vorgang-shared/src/lib/vorgang-list.service.spec.ts
@@ -0,0 +1,281 @@
+import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@goofy-client/api-root-shared';
+import { NavigationFacade, RouteData } from '@goofy-client/navigation-shared';
+import { createEmptyStateResource, createStateResource, StateResource } from '@goofy-client/tech-shared';
+import { Mock, mock, useFromMock } from '@goofy-client/test-utils';
+import { cold, hot } from 'jest-marbles';
+import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
+import { createRouteData } from 'libs/navigation-shared/test/navigation-test-factory';
+import { createVorgangListResource } from 'libs/vorgang-shared/test/vorgang';
+import { Observable } from 'rxjs';
+import { VorgangEffects } from './+state/vorgang.effects';
+import { VorgangFacade } from './+state/vorgang.facade';
+import { VorgangListService } from './vorgang-list.service';
+import { SearchInfo, VorgangListResource } from './vorgang.model';
+
+describe('VorgangListService', () => {
+	let service: VorgangListService;
+	let vorgangFacade: Mock<VorgangFacade>;
+	let apiRootService: Mock<ApiRootService>;
+	let navigationFacade: Mock<NavigationFacade>;
+
+	beforeEach(() => {
+		vorgangFacade = mock(VorgangFacade);
+		apiRootService = mock(ApiRootService);
+		navigationFacade = mock(NavigationFacade);
+
+		service = new VorgangListService(useFromMock(vorgangFacade), useFromMock(apiRootService), useFromMock(navigationFacade));
+	})
+
+	describe('getVorgangList', () => {
+
+		describe('load required data', () => {
+
+			it('should get vorgang list by facade', () => {
+				service.getVorgangList();
+
+				expect(vorgangFacade.getVorgangList).toHaveBeenCalled();
+			})
+
+			it('should get apiroot by service', () => {
+				service.getVorgangList();
+
+				expect(apiRootService.getApiRoot).toHaveBeenCalled();
+			})
+
+			it('should get current route data by navigation facade', () => {
+				service.getVorgangList();
+
+				expect(apiRootService.getApiRoot).toHaveBeenCalled();
+			})
+		})
+
+		describe('on loaded resource', () => {
+
+			const vorgangListStateResource: StateResource<VorgangListResource> = createStateResource(createVorgangListResource());
+			const apiRootStateResource: StateResource<ApiRootResource> = createStateResource(createApiRootResource());
+			const currentRouteData: StateResource<RouteData> = createStateResource(createRouteData());
+
+			beforeEach(() => {
+				service.loadVorgangList = jest.fn();
+
+				vorgangFacade.getVorgangList.mockReturnValue(hot('-a', { a: vorgangListStateResource }));
+				apiRootService.getApiRoot.mockReturnValue(hot('-a', { a: apiRootStateResource }));
+				navigationFacade.getCurrentRouteData.mockReturnValue(hot('-a', { a: currentRouteData }));
+			})
+
+			it('should return loaded resource', () => {
+				const vorgangList = service.getVorgangList();
+
+				expect(vorgangList).toBeObservable(cold('ab', { a: createEmptyStateResource(true), b: vorgangListStateResource }));
+			})
+
+			it('should not load vorgangList', () => {
+				service.getVorgangList();
+
+				expect(service.loadVorgangList).not.toHaveBeenCalled();
+			})
+		})
+
+		describe('on reload required', () => {
+
+			const vorgangListResource: VorgangListResource = createVorgangListResource();
+			const vorgangListStateResource: StateResource<VorgangListResource> = { ...createStateResource(vorgangListResource), reload: true };
+			const apiRootStateResource: StateResource<ApiRootResource> = createStateResource(createApiRootResource());
+			const currentRouteData: StateResource<RouteData> = createStateResource(createRouteData());
+
+			beforeEach(() => {
+				service.loadVorgangList = jest.fn();
+
+				vorgangFacade.getVorgangList.mockReturnValue(hot('-a', { a: vorgangListStateResource }));
+				apiRootService.getApiRoot.mockReturnValue(hot('-a', { a: apiRootStateResource }));
+				navigationFacade.getCurrentRouteData.mockReturnValue(hot('-a', { a: currentRouteData }));
+			})
+
+			it('should return value on loaded resource', () => {
+				const vorgangList = service.getVorgangList();
+
+				expect(vorgangList).toBeObservable(cold('ab', { a: createEmptyStateResource(true), b: { ...vorgangListStateResource, reload: true } }));
+			})
+
+			it.skip('FIXME: should load vorgangList', () => {
+				vorgangFacade.getVorgangList.mockReturnValue(hot('-ab', { a: { ...vorgangListStateResource, loading: true, reload: false }, b: { ...vorgangListStateResource, loading: true, reload: false } }));
+
+				service.getVorgangList();
+
+				expect(service.loadVorgangList).toHaveBeenCalled();
+			})
+		})
+	})
+
+	describe('loadVorgangList', () => {
+
+		const apiRootResource: ApiRootResource = createApiRootResource([ApiRootLinkRel.SEARCH]);
+		const routeData: RouteData = createRouteData();
+
+		describe('on existing search string', () => {
+
+			const searchString: string = 'search like me';
+
+			it('should call facade searchVorgaengeBy', () => {
+				service.loadVorgangList(apiRootResource, { ...routeData, queryParameter: { ['search']: searchString }, urlSegments: [<any>{ path: VorgangEffects.SEARCH_QUERY_PARAM }, { path: searchString }] });
+
+				expect(vorgangFacade.searchVorgaengeBy).toHaveBeenCalledWith(apiRootResource, searchString, ApiRootLinkRel.SEARCH);
+			})
+		})
+
+		describe('on "myVorgaenge"', () => {
+
+			it('should call facade loadMyVorgaengeList', () => {
+				service.loadVorgangList(apiRootResource, { ...routeData, urlSegments: [<any>{ path: 'myVorgaenge' }] });
+
+				expect(vorgangFacade.loadMyVorgaengeList).toHaveBeenCalledWith(apiRootResource);
+			})
+		})
+
+		describe('on vorganglist loadVorgangList', () => {
+
+			it('should call facade loadMyVorgaengeList', () => {
+				service.loadVorgangList(apiRootResource, routeData);
+
+				expect(vorgangFacade.loadVorgangList).toHaveBeenCalledWith(apiRootResource);
+			})
+		})
+	})
+
+	describe('clearSearchPreviewList', () => {
+
+		it('should call facade', () => {
+			service.clearSearchPreviewList();
+
+			expect(vorgangFacade.clearSearchPreviewList).toHaveBeenCalled();
+		})
+	})
+
+	describe('getVorgaenge', () => {
+
+		it('should call facade', () => {
+			service.getVorgaenge();
+
+			expect(vorgangFacade.getVorgaenge).toHaveBeenCalled();
+		})
+	})
+
+	describe('loadNextPage', () => {
+
+		it('should call facade', () => {
+			service.loadNextPage();
+
+			expect(vorgangFacade.loadNextPage).toHaveBeenCalled();
+		})
+	})
+
+	describe('getSearchInfo', () => {
+
+		const searchInfo: SearchInfo = <any>{};
+
+		beforeEach(() => {
+			vorgangFacade.getSearchInfo.mockReturnValue(hot('a', { a: searchInfo }));
+		})
+
+		it('should call facade', () => {
+			service.getSearchInfo();
+
+			expect(vorgangFacade.getSearchInfo).toHaveBeenCalled();
+		})
+
+		it.skip('FIXME: should return value', () => {
+			const searchInfo: Observable<SearchInfo> = service.getSearchInfo();
+
+			expect(searchInfo).toBeObservable(cold('a', { a: searchInfo }));
+		})
+	})
+
+	describe('searchForPreview', () => {
+
+		it('should call facade', () => {
+			const searchString: string = 'search like me';
+			service.searchForPreview(searchString);
+
+			expect(vorgangFacade.searchForPreview).toHaveBeenCalledWith(searchString);
+		})
+	})
+
+	describe('getSearchPreviewList', () => {
+
+		describe('load required data', () => {
+
+			it('should get apiroot by service', () => {
+				service.getSearchPreviewList();
+
+				expect(apiRootService.getApiRoot).toHaveBeenCalled();
+			})
+
+			it('should get search preview list by facade', () => {
+				service.getSearchPreviewList();
+
+				expect(vorgangFacade.getSearchPreviewList).toHaveBeenCalled();
+			})
+
+			it('should get search info by facade', () => {
+				service.getSearchPreviewList();
+
+				expect(vorgangFacade.getSearchInfo).toHaveBeenCalled();
+			})
+		})
+
+		describe('on loaded resource', () => {
+
+			const vorgangListStateResource: StateResource<VorgangListResource> = createStateResource(createVorgangListResource());
+			const apiRootStateResource: StateResource<ApiRootResource> = createStateResource(createApiRootResource());
+			const searchString: string = 'search like me';
+			const searchInfo: SearchInfo = <any>{ searchString };
+
+			beforeEach(() => {
+				service.searchForPreview = jest.fn();
+
+				vorgangFacade.getSearchPreviewList.mockReturnValue(hot('-a', { a: vorgangListStateResource }));
+				vorgangFacade.getSearchInfo.mockReturnValue(hot('-a', { a: searchInfo }));
+				apiRootService.getApiRoot.mockReturnValue(hot('-a', { a: apiRootStateResource }));
+			})
+
+			it('should return loaded resource', () => {
+				const vorgangList = service.getSearchPreviewList();
+
+				expect(vorgangList).toBeObservable(cold('ab', { a: createEmptyStateResource(true), b: vorgangListStateResource }));
+			})
+
+			it('should not load vorgangList', () => {
+				service.getSearchPreviewList();
+
+				expect(service.searchForPreview).not.toHaveBeenCalled();
+			})
+		})
+
+		describe('on reload required', () => {
+
+			const searchPreviewList: StateResource<VorgangListResource> = { ...createStateResource(createVorgangListResource()), reload: true };
+			const apiRootStateResource: StateResource<ApiRootResource> = createStateResource(createApiRootResource());
+			const searchString: string = 'search like me';
+			const searchInfo: SearchInfo = <any>{ searchString };
+
+			beforeEach(() => {
+				vorgangFacade.getSearchPreviewList.mockReturnValue(hot('-a', { a: searchPreviewList }));
+				vorgangFacade.getSearchInfo.mockReturnValue(hot('-a', { a: searchInfo }));
+				apiRootService.getApiRoot.mockReturnValue(hot('-a', { a: apiRootStateResource }));
+			})
+
+			it('should return value on loaded resource', () => {
+				const vorgangList = service.getSearchPreviewList();
+
+				expect(vorgangList).toBeObservable(cold('ab', { a: createEmptyStateResource(true), b: { ...searchPreviewList, reload: true } }));
+			})
+
+			it.skip('FIXME: should call facade searchForPreview', () => {
+				const vorgangList = service.getSearchPreviewList();
+
+				expect(vorgangList).toBeObservable(cold('ab', { a: createEmptyStateResource(true), b: { ...searchPreviewList, reload: true } }));
+				expect(vorgangFacade.searchForPreview).toHaveBeenCalledWith(searchPreviewList, searchString);
+			})
+		})
+	})
+})
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-shared/src/lib/vorgang-list.service.ts b/goofy-client/libs/vorgang-shared/src/lib/vorgang-list.service.ts
new file mode 100644
index 0000000000..4705682e90
--- /dev/null
+++ b/goofy-client/libs/vorgang-shared/src/lib/vorgang-list.service.ts
@@ -0,0 +1,73 @@
+import { Injectable } from '@angular/core';
+import { ApiRootResource, ApiRootService } from '@goofy-client/api-root-shared';
+import { NavigationFacade, RouteData } from '@goofy-client/navigation-shared';
+import { createEmptyStateResource, doIfLoadingRequired, EMPTY_STRING, isNotNull, StateResource } from '@goofy-client/tech-shared';
+import { combineLatest, Observable } from 'rxjs';
+import { map, startWith, tap } from 'rxjs/operators';
+import { VorgangFacade } from './+state/vorgang.facade';
+import { existSearchString, getSearchLinkRel, getSearchString, isMyVorgaenge, isVorgangListPage } from './vorgang-navigation.util';
+import { SearchInfo, VorgangListResource, VorgangResource } from './vorgang.model';
+
+@Injectable({ providedIn: 'root' })
+export class VorgangListService {
+
+	constructor(private vorgangFacade: VorgangFacade, private apiRootService: ApiRootService, private navigationFacade: NavigationFacade) { }
+
+	public getVorgangList(): Observable<StateResource<VorgangListResource>> {
+		return combineLatest([this.vorgangFacade.getVorgangList(), this.apiRootService.getApiRoot(), this.navigationFacade.getCurrentRouteData()]).pipe(
+			tap(([vorgangList, apiRoot, currentRouteData]) => {
+				if (isNotNull(apiRoot.resource) && !currentRouteData.loading) {
+					doIfLoadingRequired(vorgangList, () => this.loadVorgangList(apiRoot.resource, currentRouteData.resource));
+				}
+			}),
+			map(([vorgangList, ,]) => vorgangList),
+			startWith(createEmptyStateResource<VorgangListResource>(true)));
+	}
+
+	loadVorgangList(apiRoot: ApiRootResource, currentRouteData: RouteData): void {
+		if (existSearchString(currentRouteData)) {
+			this.vorgangFacade.searchVorgaengeBy(apiRoot, getSearchString(currentRouteData), getSearchLinkRel(currentRouteData));
+		}
+		if (isMyVorgaenge(currentRouteData)) {
+			this.vorgangFacade.loadMyVorgaengeList(apiRoot);
+		}
+		if (isVorgangListPage(currentRouteData)) {
+			this.vorgangFacade.loadVorgangList(apiRoot);
+		}
+	}
+
+	public clearSearchPreviewList(): void {
+		this.vorgangFacade.clearSearchPreviewList();
+	}
+
+	public getVorgaenge(): Observable<VorgangResource[]> {
+		return this.vorgangFacade.getVorgaenge();
+	}
+
+	public loadNextPage(): void {
+		this.vorgangFacade.loadNextPage();
+	}
+
+	public getSearchInfo(): Observable<SearchInfo> {
+		return this.vorgangFacade.getSearchInfo();
+	}
+
+	public searchForPreview(searchString: string): void {
+		this.vorgangFacade.searchForPreview(searchString);
+	}
+
+	public getSearchPreviewList(): Observable<StateResource<VorgangListResource>> {
+		return combineLatest([this.apiRootService.getApiRoot(), this.vorgangFacade.getSearchPreviewList(), this.vorgangFacade.getSearchInfo()]).pipe(
+			tap(([apiRoot, previewList, searchInfo]) => {
+				if (isNotNull(apiRoot.resource) && this.shouldSearchForPreview(previewList, searchInfo.searchString)) {
+					this.vorgangFacade.searchForPreview(searchInfo.searchString);
+				}
+			}),
+			map(([, previewList,]) => previewList),
+			startWith(createEmptyStateResource<VorgangListResource>(true)));
+	}
+
+	shouldSearchForPreview(previewList: StateResource<VorgangListResource>, searchString: string): boolean {
+		return previewList.reload && !previewList.loading && (searchString != EMPTY_STRING);
+	}
+}
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-shared/src/lib/vorgang-navigation.util.spec.ts b/goofy-client/libs/vorgang-shared/src/lib/vorgang-navigation.util.spec.ts
index b11f78a897..79dc592019 100644
--- a/goofy-client/libs/vorgang-shared/src/lib/vorgang-navigation.util.spec.ts
+++ b/goofy-client/libs/vorgang-shared/src/lib/vorgang-navigation.util.spec.ts
@@ -1,9 +1,9 @@
 import { UrlSegment } from '@angular/router';
 import { ApiRootLinkRel } from '@goofy-client/api-root-shared';
 import { RouteData } from '@goofy-client/navigation-shared';
-import { createCurrentRouteData } from 'libs/navigation-shared/test/navigation-test-factory';
+import { createRouteData } from 'libs/navigation-shared/test/navigation-test-factory';
 import { VorgangEffects } from './+state/vorgang.effects';
-import { existSearchString, getSearchLinkRel, getSearchString, isMyVorgaenge, navigateFromVorgangList } from './vorgang-navigation.util';
+import { existSearchString, getSearchLinkRel, getSearchString, isMyVorgaenge, isVorgangDetailPage, isVorgangListPage } from './vorgang-navigation.util';
 
 describe('Vorgang Navigation Util', () => {
 
@@ -11,7 +11,7 @@ describe('Vorgang Navigation Util', () => {
 
 		it('should return true is exists', () => {
 			const queryParameter = { [VorgangEffects.SEARCH_QUERY_PARAM]: 'searchThisForMe' };
-			const currentRouteData: RouteData = { ...createCurrentRouteData(), queryParameter };
+			const currentRouteData: RouteData = { ...createRouteData(), queryParameter };
 
 			const exists: boolean = existSearchString(currentRouteData);
 
@@ -19,7 +19,7 @@ describe('Vorgang Navigation Util', () => {
 		})
 
 		it('should return false if NOT exists', () => {
-			const exists: boolean = existSearchString(createCurrentRouteData());
+			const exists: boolean = existSearchString(createRouteData());
 
 			expect(exists).toBeFalsy();
 		})
@@ -46,7 +46,7 @@ describe('Vorgang Navigation Util', () => {
 		function buildCurrentRouteData(searchString: string): RouteData {
 			const urlSegments: UrlSegment[] = [<any>{ path: VorgangEffects.SEARCH_QUERY_PARAM }, <any>{ path: searchString }];
 			const queryParameter = { [VorgangEffects.SEARCH_QUERY_PARAM]: searchString };
-			return { ...createCurrentRouteData(), urlSegments, queryParameter };
+			return { ...createRouteData(), urlSegments, queryParameter };
 		}
 	})
 
@@ -54,7 +54,7 @@ describe('Vorgang Navigation Util', () => {
 
 		it('should return "searchMyVorgaenge" linkrel', () => {
 			const urlSegments: UrlSegment[] = [<any>{ path: VorgangEffects.MY_VORGAENGE_URI_SEGMENT }];
-			const currentRouteData: RouteData = { ...createCurrentRouteData(), urlSegments };
+			const currentRouteData: RouteData = { ...createRouteData(), urlSegments };
 
 			const linkRel: string = getSearchLinkRel(currentRouteData);
 
@@ -62,7 +62,7 @@ describe('Vorgang Navigation Util', () => {
 		})
 
 		it('should return "search" linkrel', () => {
-			const linkRel: string = getSearchLinkRel(createCurrentRouteData());
+			const linkRel: string = getSearchLinkRel(createRouteData());
 
 			expect(linkRel).toBe(ApiRootLinkRel.SEARCH);
 		})
@@ -72,7 +72,7 @@ describe('Vorgang Navigation Util', () => {
 
 		it('should return true if "myVorgaenge" exists in urlSegments', () => {
 			const urlSegments: UrlSegment[] = [<any>{ path: VorgangEffects.MY_VORGAENGE_URI_SEGMENT }];
-			const currentRouteData: RouteData = { ...createCurrentRouteData(), urlSegments };
+			const currentRouteData: RouteData = { ...createRouteData(), urlSegments };
 
 			const result: boolean = isMyVorgaenge(currentRouteData);
 
@@ -80,14 +80,14 @@ describe('Vorgang Navigation Util', () => {
 		})
 
 		it('should return false if urlSegments is empty', () => {
-			const result: boolean = isMyVorgaenge(createCurrentRouteData());
+			const result: boolean = isMyVorgaenge(createRouteData());
 
 			expect(result).toBeFalsy();
 		})
 
 		it('should return false if urlSegments contains other data', () => {
 			const urlSegments: UrlSegment[] = [<any>{ path: VorgangEffects.SEARCH_QUERY_PARAM }];
-			const currentRouteData: RouteData = { ...createCurrentRouteData(), urlSegments };
+			const currentRouteData: RouteData = { ...createRouteData(), urlSegments };
 
 			const result: boolean = isMyVorgaenge(currentRouteData);
 
@@ -95,18 +95,31 @@ describe('Vorgang Navigation Util', () => {
 		})
 	})
 
-	describe('navigateFromVorgangList', () => {
+	describe('isVorgangListPage', () => {
 
-		it('should return true is queryParamter is empty', () => {
-			const result: boolean = navigateFromVorgangList(createCurrentRouteData());
+		it('should return true if queryParameter is empty', () => {
+			const result: boolean = isVorgangListPage(createRouteData());
 
-			expect(result).toBeTruthy()
+			expect(result).toBeTruthy();
+		})
+
+		it('should return false if queryParameter is not empty', () => {
+			const result: boolean = isVorgangListPage({ ...createRouteData(), queryParameter: { ['search']: 'exampleParameter' } });
+
+			expect(result).toBeFalsy();
 		})
+	})
+
+	describe('isVorgangDetailPage', () => {
+
+		it('should return true if queryParameter contains "vorgangWithEingangUrl"', () => {
+			const result: boolean = isVorgangDetailPage({ ...createRouteData(), queryParameter: { ['vorgangWithEingangUrl']: 'encodedUri' } });
 
-		it('should return false if queryParameter is NOT empty', () => {
-			const currentRouteData: RouteData = { ...createCurrentRouteData(), queryParameter: { ['']: 'myVorgaenge' } };
+			expect(result).toBeTruthy();
+		})
 
-			const result: boolean = navigateFromVorgangList(currentRouteData);
+		it('should return false if queryParameter NOT contains "vorgangWithEingangUrl"', () => {
+			const result: boolean = isVorgangDetailPage({ ...createRouteData(), queryParameter: { ['search']: 'exampleParameter' } });
 
 			expect(result).toBeFalsy();
 		})
diff --git a/goofy-client/libs/vorgang-shared/src/lib/vorgang-navigation.util.ts b/goofy-client/libs/vorgang-shared/src/lib/vorgang-navigation.util.ts
index 43d48c537b..b8ff3bf79f 100644
--- a/goofy-client/libs/vorgang-shared/src/lib/vorgang-navigation.util.ts
+++ b/goofy-client/libs/vorgang-shared/src/lib/vorgang-navigation.util.ts
@@ -7,23 +7,27 @@ export function existSearchString(routeData: RouteData): boolean {
 	return isNotUndefined(routeData.queryParameter[VorgangEffects.SEARCH_QUERY_PARAM]);
 }
 
-export function getSearchString(currentRouteData: RouteData): string {
-	const searchString: string = currentRouteData.urlSegments[getSearchStringIndex(currentRouteData) + 1].path.toString();
+export function getSearchString(routeData: RouteData): string {
+	const searchString: string = routeData.urlSegments[getSearchStringIndex(routeData) + 1].path.toString();
 	return decodeURIComponent(searchString);
 }
 
-function getSearchStringIndex(currentRouteData: RouteData): number {
-	return currentRouteData.urlSegments.findIndex(segment => segment.path.toString() == VorgangEffects.SEARCH_QUERY_PARAM);
+function getSearchStringIndex(routeData: RouteData): number {
+	return routeData.urlSegments.findIndex(segment => segment.path.toString() == VorgangEffects.SEARCH_QUERY_PARAM);
 }
 
-export function getSearchLinkRel(currentRouteData: RouteData): string {
-	return isMyVorgaenge(currentRouteData) ? ApiRootLinkRel.SEARCH_MY_VORGAENGE : ApiRootLinkRel.SEARCH;
+export function getSearchLinkRel(routeData: RouteData): string {
+	return isMyVorgaenge(routeData) ? ApiRootLinkRel.SEARCH_MY_VORGAENGE : ApiRootLinkRel.SEARCH;
 }
 
-export function isMyVorgaenge(currentRouteData: RouteData): boolean {
-	return currentRouteData.urlSegments.length > 0 && currentRouteData.urlSegments[0].path.toString() == VorgangEffects.MY_VORGAENGE_URI_SEGMENT;
+export function isMyVorgaenge(routeData: RouteData): boolean {
+	return routeData.urlSegments.length > 0 && routeData.urlSegments[0].path.toString() == VorgangEffects.MY_VORGAENGE_URI_SEGMENT;
 }
 
-export function navigateFromVorgangList(routeData: RouteData): boolean {
-	return isEmptyObject(routeData.queryParameter) ? true : false;
+export function isVorgangListPage(routeData: RouteData): boolean {
+	return isEmptyObject(routeData.queryParameter);
+}
+
+export function isVorgangDetailPage(routeData: RouteData): boolean {
+	return isNotUndefined(routeData.queryParameter['vorgangWithEingangUrl']);
 }
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list-container.component.spec.ts b/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list-container.component.spec.ts
index ac823211d4..6681f689f2 100644
--- a/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list-container.component.spec.ts
+++ b/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list-container.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { EMPTY_STRING } from '@goofy-client/tech-shared';
 import { mock } from '@goofy-client/test-utils';
-import { SearchInfo, VorgangFacade } from '@goofy-client/vorgang-shared';
+import { SearchInfo, VorgangListService } from '@goofy-client/vorgang-shared';
 import { MockComponent } from 'ng-mocks';
 import { of } from 'rxjs';
 import { VorgangListContainerComponent } from './vorgang-list-container.component';
@@ -12,7 +12,7 @@ describe('VorgangListContainerComponent', () => {
 	let fixture: ComponentFixture<VorgangListContainerComponent>;
 
 	const searchInfo: SearchInfo = { searchString: EMPTY_STRING, changedAfterSearchDone: false };
-	const vorgangFacade = { ...mock(VorgangFacade), getSearchInfo: jest.fn().mockReturnValue(of(searchInfo)) };
+	const vorgangListService = { ...mock(VorgangListService), getSearchInfo: jest.fn().mockReturnValue(of(searchInfo)) };
 
 	beforeEach(async () => {
 		await TestBed.configureTestingModule({
@@ -22,8 +22,8 @@ describe('VorgangListContainerComponent', () => {
 			],
 			providers: [
 				{
-					provide: VorgangFacade,
-					useValue: vorgangFacade
+					provide: VorgangListService,
+					useValue: vorgangListService
 				}
 			]
 		})
@@ -44,19 +44,19 @@ describe('VorgangListContainerComponent', () => {
 		it('should call facade to get vorgaenge', () => {
 			component.ngOnInit();
 
-			expect(vorgangFacade.getVorgaenge).toHaveBeenCalled();
+			expect(vorgangListService.getVorgaenge).toHaveBeenCalled();
 		})
 
 		it('should call facade to get vorgangList', () => {
 			component.ngOnInit();
 
-			expect(vorgangFacade.getVorgangList).toHaveBeenCalled();
+			expect(vorgangListService.getVorgangList).toHaveBeenCalled();
 		})
 
 		it('should call facade to get searchInfo', () => {
 			component.ngOnInit();
 
-			expect(vorgangFacade.getSearchInfo).toHaveBeenCalled();
+			expect(vorgangListService.getSearchInfo).toHaveBeenCalled();
 		})
 	})
 
@@ -65,7 +65,7 @@ describe('VorgangListContainerComponent', () => {
 		it('should call facade loadNextPage', () => {
 			component.loadNextPage();
 
-			expect(vorgangFacade.loadNextPage).toHaveBeenCalled();
+			expect(vorgangListService.loadNextPage).toHaveBeenCalled();
 		})
 	})
 });
diff --git a/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list-container.component.ts b/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list-container.component.ts
index 7c92fd6f34..f89d44a0dc 100644
--- a/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list-container.component.ts
+++ b/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list-container.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { StateResource } from '@goofy-client/tech-shared';
-import { VorgangFacade, VorgangListResource, VorgangResource } from '@goofy-client/vorgang-shared';
+import { VorgangListResource, VorgangListService, VorgangResource } from '@goofy-client/vorgang-shared';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
@@ -15,15 +15,15 @@ export class VorgangListContainerComponent implements OnInit {
 	public vorgaenge$: Observable<VorgangResource[]>
 	public searchString$: Observable<string>;
 
-	constructor(private vorgangFacade: VorgangFacade) { }
+	constructor(private vorgangListService: VorgangListService) { }
 
 	ngOnInit(): void {
-		this.vorgaenge$ = this.vorgangFacade.getVorgaenge();
-		this.vorgangListPageResource$ = this.vorgangFacade.getVorgangList();
-		this.searchString$ = this.vorgangFacade.getSearchInfo().pipe(map(searchInfo => searchInfo.searchString));
+		this.vorgaenge$ = this.vorgangListService.getVorgaenge();
+		this.vorgangListPageResource$ = this.vorgangListService.getVorgangList();
+		this.searchString$ = this.vorgangListService.getSearchInfo().pipe(map(searchInfo => searchInfo.searchString));
 	}
 
 	loadNextPage(): void {
-		this.vorgangFacade.loadNextPage();
+		this.vorgangListService.loadNextPage();
 	}
 }
-- 
GitLab