From 60e1c15b6abe1012e6631edc0234510684305cb9 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Wed, 29 Aug 2018 11:26:49 -0700 Subject: [PATCH 1/2] SHIBUI-816 Removed validation for entity id --- .../widget/filter-target/filter-target.component.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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( From f100f5d004698cd8523e8017911fd1894b26fe1a Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Wed, 29 Aug 2018 12:26:34 -0700 Subject: [PATCH 2/2] SHIBUI-816 Fixed issue with navigation after cancelling filter changes --- ui/src/app/metadata/filter/effect/filter.effect.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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(