SHIBUI-1063 Loading resolvers into admin dashboard for approval

TIER · Jan 21, 2019 · 42d3e0d · 42d3e0d
1 parent 2a7ae3d
commit 42d3e0d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/ui/src/app/admin/admin.component.ts b/ui/src/app/admin/admin.component.ts
@@ -16,6 +16,6 @@ export class AdminComponent implements OnInit {
     ) { }
 
     ngOnInit(): void {
-        this.store.dispatch(new LoadAdminRequest());
+        // this.store.dispatch(new LoadAdminRequest());
     }
 }
diff --git a/ui/src/app/admin/component/enable-metadata.component.html b/ui/src/app/admin/component/enable-metadata.component.html
@@ -1,5 +1,5 @@
 <ul class="list-unstyled m-0">
-    <li *ngFor="let resolver of limited$ | async; index as i"
+    <li *ngFor="let resolver of resolvers$ | async; index as i"
         [ngClass]="{'mt-2': i > 0}"
         aria-label="Provider Item Accordion. Press Spacebar to open">
         <resolver-item

diff --git a/ui/src/app/admin/component/enable-metadata.component.ts b/ui/src/app/admin/component/enable-metadata.component.ts
@@ -7,26 +7,25 @@ import { map } from 'rxjs/operators';
 
 import { MetadataEntity, MetadataResolver } from '../../metadata/domain/model';
 import * as fromDashboard from '../../metadata/manager/reducer';
+import * as fromResolver from '../../metadata/resolver/reducer';
 import { ToggleEntityDisplay } from '../../metadata/manager/action/manager.action';
 import { DeleteDialogComponent } from '../../metadata/manager/component/delete-dialog.component';
 import { PreviewEntity } from '../../metadata/domain/action/entity.action';
 import { RemoveDraftRequest } from '../../metadata/resolver/action/draft.action';
-import { LoadResolverRequest } from '../../metadata/resolver/action/collection.action';
+import { LoadAdminResolverRequest } from '../../metadata/resolver/action/collection.action';
 
 @Component({
     selector: 'enable-metadata',
     templateUrl: './enable-metadata.component.html'
 })
 
 export class EnableMetadataComponent implements OnInit {
-    searchQuery$: Observable<string>;
     resolvers$: Observable<MetadataEntity[]>;
     loading$: Observable<boolean>;
 
     total$: Observable<number>;
     page = 1;
     limit = 8;
-    limited$: Observable<MetadataEntity[]>;
 
     entitiesOpen$: Observable<{ [key: string]: boolean }>;
 
@@ -35,16 +34,15 @@ export class EnableMetadataComponent implements OnInit {
         private router: Router,
         private modalService: NgbModal
     ) {
-        this.resolvers$ = store.select(fromDashboard.getSearchResults);
-        this.searchQuery$ = store.select(fromDashboard.getSearchQuery);
+        this.resolvers$ = store.select(fromResolver.getAllResolvers);
         this.loading$ = store.select(fromDashboard.getSearchLoading);
         this.entitiesOpen$ = store.select(fromDashboard.getOpenProviders);
 
         this.total$ = this.resolvers$.pipe(map(list => list.length));
     }
 
     ngOnInit(): void {
-        this.store.dispatch(new LoadResolverRequest());
+        this.store.dispatch(new LoadAdminResolverRequest());
     }
 
     edit(entity: MetadataEntity): void {

diff --git a/ui/src/app/metadata/resolver/effect/collection.effects.ts b/ui/src/app/metadata/resolver/effect/collection.effects.ts
@@ -35,6 +35,7 @@ import { Notification, NotificationType } from '../../../notification/model/noti
 import { I18nService } from '../../../i18n/service/i18n.service';
 import * as fromRoot from '../../../app.reducer';
 import * as fromI18n from '../../../i18n/reducer';
+import { FileBackedHttpMetadataResolver } from '../../domain/entity';
 
 
 /* istanbul ignore next */
@@ -56,12 +57,12 @@ export class ResolverCollectionEffects {
 
     @Effect()
     loadAdminResolvers$ = this.actions$.pipe(
-        ofType<LoadAdminResolverRequest>(ResolverCollectionActionTypes.LOAD_RESOLVER_REQUEST),
+        ofType<LoadAdminResolverRequest>(ResolverCollectionActionTypes.LOAD_ADMIN_RESOLVERS_REQUEST),
         switchMap(() =>
             this.descriptorService
                 .query({admin: true})
                 .pipe(
-                    map(descriptors => new LoadResolverSuccess(descriptors)),
+                    map(descriptors => new LoadResolverSuccess(descriptors.map(d => new FileBackedHttpMetadataResolver(d)))),
                     catchError(error => of(new LoadResolverError(error)))
                 )
         )