diff --git a/ui/src/app/metadata/filter/effect/filter.effect.ts b/ui/src/app/metadata/filter/effect/filter.effect.ts index 0c0ce98fe..e4a252d6e 100644 --- a/ui/src/app/metadata/filter/effect/filter.effect.ts +++ b/ui/src/app/metadata/filter/effect/filter.effect.ts @@ -60,8 +60,10 @@ export class FilterEffects { @Effect({ dispatch: false }) cancelChanges$ = this.actions$.pipe( ofType(FilterActionTypes.CANCEL_CREATE_FILTER), - combineLatest(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))), - tap(([filter, provider]) => this.router.navigate(['/', 'metadata', 'provider', provider, 'filters'])) + withLatestFrom(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))), + tap(([filter, provider]) => { + this.router.navigate(['/', 'metadata', 'provider', provider, 'filters']); + }) ); constructor( diff --git a/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts b/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts index 2b08949d2..87e84198c 100644 --- a/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts +++ b/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts @@ -25,9 +25,7 @@ export class FilterTargetComponent extends ObjectWidget implements OnDestroy, Af search: FormControl = new FormControl( '', [], - [ - EntityValidators.existsInCollection(this.store.select(fromFilters.getEntityCollection)) - ] + [] ); script: FormControl = new FormControl(