Merged in feature/SHIBUI-816 (pull request #183)

SHIBUI-816 Removed validation for entity id Approved-by: Shibui Jenkins <shibui.jenkins@gmail.com> Approved-by: Ryan Mathis <rmathis@unicon.net>
TIER · Aug 30, 2018 · 08c2ab2 · 08c2ab2
2 parents 3de9119 + f100f5d
commit 08c2ab2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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<CancelCreateFilter>(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
@@ -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(