From 2091f7c776933ec7c57bd7ca477a77afd085eadb Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 30 Nov 2018 08:25:14 -0700
Subject: [PATCH] SHIBUI-996 Fixed validation of filter names

---
 ui/src/app/metadata/filter/effect/collection.effect.ts    | 8 --------
 .../provider/container/provider-select.component.ts       | 2 --
 ui/src/app/metadata/provider/provider.routing.ts          | 8 ++++----
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/ui/src/app/metadata/filter/effect/collection.effect.ts b/ui/src/app/metadata/filter/effect/collection.effect.ts
index f2975bd34..e04265eb2 100644
--- a/ui/src/app/metadata/filter/effect/collection.effect.ts
+++ b/ui/src/app/metadata/filter/effect/collection.effect.ts
@@ -166,14 +166,6 @@ export class FilterCollectionEffects {
         )
     );
 
-    /*
-    @Effect()
-    reloadOrderAfterChange$ = this.actions$.pipe(
-        ofType<SetOrderFilterSuccess>(FilterCollectionActionTypes.SET_ORDER_FILTER_SUCCESS),
-        map(() => new GetOrderFilterRequest())
-    );
-    */
-
     @Effect()
     setOrder$ = this.actions$.pipe(
         ofType<SetOrderFilterRequest>(FilterCollectionActionTypes.SET_ORDER_FILTER_REQUEST),
diff --git a/ui/src/app/metadata/provider/container/provider-select.component.ts b/ui/src/app/metadata/provider/container/provider-select.component.ts
index 8fe540eeb..baba7f626 100644
--- a/ui/src/app/metadata/provider/container/provider-select.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-select.component.ts
@@ -31,8 +31,6 @@ export class ProviderSelectComponent implements OnDestroy {
             map(params => new SelectProviderRequest(params.providerId))
         ).subscribe(store);
 
-        this.route.params.subscribe(params => console.log(params));
-
         this.provider$ = this.store.select(fromProviders.getSelectedProvider).pipe(skipWhile(p => !p));
 
         this.provider$.subscribe(provider => this.setDefinition(provider));
diff --git a/ui/src/app/metadata/provider/provider.routing.ts b/ui/src/app/metadata/provider/provider.routing.ts
index fa1a4c3b5..1dcbc4fbb 100644
--- a/ui/src/app/metadata/provider/provider.routing.ts
+++ b/ui/src/app/metadata/provider/provider.routing.ts
@@ -41,10 +41,6 @@ export const ProviderRoutes: Routes = [
                         path: '',
                         component: FilterComponent,
                         children: [
-                            {
-                                path: 'filters',
-                                component: ProviderFilterListComponent
-                            },
                             {
                                 path: 'filter/new',
                                 component: NewFilterComponent
@@ -62,6 +58,10 @@ export const ProviderRoutes: Routes = [
                             }
                         ]
                     },
+                    {
+                        path: 'filters',
+                        component: ProviderFilterListComponent
+                    },
                     {
                         path: 'edit',
                         component: ProviderEditComponent,