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 index 39b4f888072852a1b45d7678e2340062634793e2..092a226b82485256feffe17ce4fb52b5173f0db5 100644 --- 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 @@ -210,9 +210,9 @@ describe('VorgangListService', () => { expect(vorgangFacade.getVorgangStatistic).toHaveBeenCalled(); }) - it('should getVorgangList', (done) => { - service.getVorgangStatistic().subscribe(() => { - expect(service.getVorgangList).toHaveBeenCalled(); + it('should return vorgangStatistic', (done) => { + service.getVorgangStatistic().subscribe(vorgangStatistic => { + expect(vorgangStatistic).toEqual(vorgangStatisticStateResource); done(); }) }) 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 index 4f9f2c340a89379c9defc4f6e03e943733f1ecbb..78336077a6e5a94397036a212078dbd73111ac1d 100644 --- a/goofy-client/libs/vorgang-shared/src/lib/vorgang-list.service.ts +++ b/goofy-client/libs/vorgang-shared/src/lib/vorgang-list.service.ts @@ -23,9 +23,9 @@ */ import { Injectable } from '@angular/core'; import { ApiRootFacade, ApiRootResource } from '@goofy-client/api-root-shared'; -import { EMPTY_STRING, StateResource, createEmptyStateResource, doIfLoadingRequired, isLoaded, isNotNull } from '@goofy-client/tech-shared'; +import { EMPTY_STRING, StateResource, createEmptyStateResource, doIfLoadingRequired, isNotNull } from '@goofy-client/tech-shared'; import { Observable, combineLatest } from 'rxjs'; -import { filter, map, startWith, tap, withLatestFrom } from 'rxjs/operators'; +import { map, startWith, tap, withLatestFrom } from 'rxjs/operators'; import { VorgangFacade } from './+state/vorgang.facade'; import { ROUTE_PARAM_BY_VORGANG_FILTER, buildLinkRel, getSearchLinkRel } from './vorgang-navigation.util'; import { VorgangFilter, VorgangListResource, VorgangResource, VorgangStatistic, VorgangView } from './vorgang.model'; @@ -64,11 +64,7 @@ export class VorgangListService { } public getVorgangStatistic(): Observable<StateResource<VorgangStatistic>> { - return this.vorgangFacade.getVorgangStatistic().pipe( - withLatestFrom(this.getVorgangList()), - filter(([, vorgangListResource]) => isLoaded(vorgangListResource)), - map(([statistic,]) => statistic), - ); + return this.vorgangFacade.getVorgangStatistic(); } public getSelectedFilterAsRouteParam(): Observable<string> {