Skip to content

Commit

Permalink
Merged in bugfix/nojira-build-issue (pull request #56)
Browse files Browse the repository at this point in the history
Fixed issue with import

Approved-by: Ryan Mathis <rmathis@unicon.net>
  • Loading branch information
rmathis committed Apr 13, 2018
2 parents b8fc3c5 + 8da4a09 commit 509933f
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions ui/src/app/dashboard/effect/search.effects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { Effect, Actions } from '@ngrx/effects';
import { Store } from '@ngrx/store';
import { Observable } from 'rxjs/observable';
import { combineLatest } from 'rxjs/observable/combineLatest';
import { of } from 'rxjs/observable/of';
import 'rxjs/add/operator/combineLatest';

import * as entitySearch from '../action/search.action';
Expand Down Expand Up @@ -36,13 +36,16 @@ export class SearchEffects {
) { }

private performSearch(): Observable<entitySearch.Actions> {
return combineLatest(
return of([]).combineLatest(
this.store.select(fromCollections.getAllProviders),
this.store.select(fromCollections.getAllFilters),
(p: MetadataProvider[], f: MetadataFilter[]): Array<MetadataEntity> => [].concat(
f.map(filter => new Filter(filter)),
p.map(provider => new Provider(provider))
)
(o: any[], p: MetadataProvider[], f: MetadataFilter[]): Array<MetadataEntity> => {
console.log(o, p, f);
return o.concat(
f.map(filter => new Filter(filter)),
p.map(provider => new Provider(provider))
);
}
)
.combineLatest(
this.store.select(fromDashboard.getFilterType),
Expand All @@ -54,6 +57,6 @@ export class SearchEffects {
e => this.matcher(e.name, term) || this.matcher(e.entityId, term)
)
)
.map(providers => new entitySearch.SearchCompleteAction(providers));
.map(entities => new entitySearch.SearchCompleteAction(entities));
}
} /* istanbul ignore next */

0 comments on commit 509933f

Please sign in to comment.