From b12d7b7fd562676ca3f6809dee5eea9824a77e15 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Tue, 24 Jul 2018 22:28:20 +0000 Subject: [PATCH] Merged in bugfix/nojira-base-resolver (pull request #125) NOJIRA: Removed incommonmd from dashboard Approved-by: Shibui Jenkins Approved-by: Ryan Mathis --- .../manager/container/dashboard-providers-list.component.ts | 6 ++++-- ui/src/app/metadata/manager/reducer/index.ts | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts index 2cdb60443..54f122c7c 100644 --- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts +++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts @@ -7,7 +7,7 @@ import { Store } from '@ngrx/store'; import { ProviderState, getAllProviders } from '../../provider/reducer'; import * as fromDashboard from '../reducer'; import { ToggleEntityDisplay } from '../action/manager.action'; -import { Meta } from '../../../../../node_modules/@angular/platform-browser'; +import { map } from 'rxjs/operators'; @Component({ selector: 'dashboard-providers-list', @@ -23,7 +23,9 @@ export class DashboardProvidersListComponent { private store: Store, private router: Router ) { - this.providers$ = this.store.select(getAllProviders); + this.providers$ = this.store.select(getAllProviders).pipe( + map(providers => providers.filter(p => p['@type'] !== 'BaseMetadataResolver')) + ); this.providersOpen$ = store.select(fromDashboard.getOpenProviders); } diff --git a/ui/src/app/metadata/manager/reducer/index.ts b/ui/src/app/metadata/manager/reducer/index.ts index d35d2b66e..fae0c5418 100644 --- a/ui/src/app/metadata/manager/reducer/index.ts +++ b/ui/src/app/metadata/manager/reducer/index.ts @@ -2,6 +2,8 @@ import { createSelector, createFeatureSelector } from '@ngrx/store'; import * as fromRoot from '../../../core/reducer'; import * as fromDashboard from './manager.reducer'; import * as fromSearch from './search.reducer'; +import { MetadataEntity } from '../../domain/model'; +import { Metadata } from '../../domain/domain.type'; export interface DashboardState { manager: fromDashboard.State; @@ -29,6 +31,7 @@ export const getSearchResults = createSelector( getSearchState, fromSearch.getEntities ); + export const getSearchQuery = createSelector( getSearchState, fromSearch.getQuery