Skip to content
Snippets Groups Projects
Commit a678afcf authored by OZGCloud's avatar OZGCloud
Browse files

OZG-449 cleanup

parent 9f992632
No related branches found
No related tags found
No related merge requests found
import { Injectable } from '@angular/core';
import { Params } from '@angular/router';
import { ApiRootLinkRel, ApiRootResource } from '@goofy-client/api-root-shared';
import { createEmptyStateResource, createStateResource, doIfLoadingRequired, EMPTY_STRING, isNotNil, NavigationService, StateResource } from '@goofy-client/tech-shared';
import { createEmptyStateResource, createStateResource, doIfLoadingRequired, EMPTY_STRING, isNotEmpty, isNotNil, NavigationService, StateResource } from '@goofy-client/tech-shared';
import { hasLink } from '@ngxp/rest';
import { ApiRootService } from 'libs/api-root-shared/src/lib/api-root.service';
import { isEmpty } from 'lodash-es';
import { BehaviorSubject, Observable } from 'rxjs';
import { filter, first, mergeMap } from 'rxjs/operators';
import { VorgangListLinkRel } from './vorgang.linkrel';
......@@ -105,15 +104,14 @@ export class VorgangListService {
loadVorgangList(apiRootResource: ApiRootResource): Observable<VorgangListResource> {
this.setVorgangListLoading();
if (isEmpty(this.searchInfo$.value.searchString)) {
if (isNotEmpty(this.searchInfo$.value.searchString)) {
return this.vorgangRepository.searchVorgaengeBy(apiRootResource, this.searchInfo$.value.searchString, this.getSearchLinkRel());
}
if (this.navigationService.isMyVorgaengeNavigation()) {
return this.vorgangRepository.loadMyVorgaengeList(apiRootResource);
} else {
return this.vorgangRepository.loadVorgangList(apiRootResource);
}
}
return this.vorgangRepository.searchVorgaengeBy(apiRootResource, this.searchInfo$.value.searchString, this.getSearchLinkRel());
return this.vorgangRepository.loadVorgangList(apiRootResource);
}
public loadNextPage(): void {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment