SHIBUI-996 Fixed validation of filter names

TIER · Nov 30, 2018 · 2091f7c · 2091f7c
1 parent bfceb8c
commit 2091f7c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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,