SHIBUI-598 Fixed issue with dashboard

TIER · Jun 19, 2018 · 883fa85 · 883fa85
1 parent 971f20a
commit 883fa85
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 34 deletions.
diff --git a/ui/src/app/metadata/manager/component/entity-item.component.html b/ui/src/app/metadata/manager/component/entity-item.component.html
@@ -7,7 +7,7 @@
                     &nbsp;
                     <span class="label-icon sr-hidden" [ngSwitch]="entity.kind">
                         <i class="fa fa-fw fa-3x text-info fa-cubes" *ngSwitchCase="types.FILTER"></i>
-                        <i class="fa fa-fw fa-3x text-info fa-cube" *ngSwitchCase="types.PROVIDER"></i>
+                        <i class="fa fa-fw fa-3x text-info fa-cube" *ngSwitchCase="types.RESOLVER"></i>
                         <i class="fa fa-fw fa-3x text-info fa-" *ngSwitchDefault></i>
                     </span>
                 </div>

diff --git a/ui/src/app/metadata/manager/container/manager.component.html b/ui/src/app/metadata/manager/container/manager.component.html
@@ -2,37 +2,9 @@
     <section class="section">
         <div class="section-header bg-primary p-2 text-light">
             <div class="row justify-content-between">
-                <div class="col-md-4">
+                <div class="col-md-8">
                     <span class="lead" i18n="@@label--current-metadata-sources">Current Metadata Sources</span>
                 </div>
-                <div class="col-md-4 text-right">
-                    <div ngbDropdown class="d-inline-block">
-                        <button class="btn btn-light" id="filterDropdown" ngbDropdownToggle>
-                            <i class="fa fa-fw" [ngClass]="{
-                                'fa-cube': filtering === 'provider',
-                                'fa-cubes': filtering === 'filter',
-                                'fa-dot-circle-o': filtering === 'all'
-                            }"></i>
-                            <ng-container i18n="@@label--selected-filter-option">
-                                {filtering, select, filter {Show Filters} provider {Show Sources} other {Show All}}
-                            </ng-container>
-                        </button>
-                        <div ngbDropdownMenu aria-labelledby="filterDropdown">
-                            <button class="dropdown-item"
-                                *ngFor="let option of filterOptions; index as i"
-                                (click)="changeFilter(option)">
-                                <i class="fa fa-fw" [ngClass]="{
-                                    'fa-cube': option === 'provider',
-                                    'fa-cubes': option === 'filter',
-                                    'fa-dot-circle-o': option === 'all'
-                                }"></i>
-                                <ng-container i18n="@@label--select-filter-option">
-                                    {option, select, filter {Show Filters} provider {Show Source} other {Show All}}
-                                </ng-container>
-                            </button>
-                        </div>
-                    </div>
-                </div>
                 <div class="col-md-4">
                     <provider-search
                         [query]="searchQuery$ | async"

diff --git a/ui/src/app/metadata/manager/container/manager.component.ts b/ui/src/app/metadata/manager/container/manager.component.ts
@@ -52,7 +52,7 @@ export class ManagerComponent implements OnInit {
 
         this.limited$ = this.getPagedResolvers(this.page, this.resolvers$);
 
-        // this.providers$.subscribe(p => console.log(p));
+        this.entitiesOpen$.subscribe(p => console.log(p));
     }
 
     ngOnInit (): void {

diff --git a/ui/src/app/metadata/manager/reducer/manager.reducer.ts b/ui/src/app/metadata/manager/reducer/manager.reducer.ts
@@ -11,12 +11,13 @@ export const initialState: State = {
 export function reducer(state = initialState, action: manager.Actions): State {
     switch (action.type) {
         case manager.TOGGLE_ENTITY_DISPLAY: {
-            return Object.assign({}, state, {
-                providersOpen: {
+            return {
+                ...state,
+                resolversOpen: {
                     ...state.resolversOpen,
                     ...{[action.payload]: !state.resolversOpen[action.payload]}
                 }
-            });
+            };
         }
         default: {
             // console.log(state);