diff --git a/ui/src/app/admin/admin.component.ts b/ui/src/app/admin/admin.component.ts index f4670889d..409503b6c 100644 --- a/ui/src/app/admin/admin.component.ts +++ b/ui/src/app/admin/admin.component.ts @@ -12,7 +12,5 @@ import { LoadAdminRequest } from './action/admin-collection.action'; export class AdminComponent { constructor( private store: Store - ) { - this.store.dispatch(new LoadAdminRequest()); - } + ) {} } diff --git a/ui/src/app/admin/component/enable-metadata.component.ts b/ui/src/app/admin/component/enable-metadata.component.ts index 3c463eb9d..2f2d56587 100644 --- a/ui/src/app/admin/component/enable-metadata.component.ts +++ b/ui/src/app/admin/component/enable-metadata.component.ts @@ -34,8 +34,6 @@ export class EnableMetadataComponent implements OnInit { private router: Router, private modalService: NgbModal ) { - this.store.dispatch(new LoadMetadataRequest()); - this.resolvers$ = this.store .select(fromMetadata.getMetadataCollection) .pipe( diff --git a/ui/src/app/dashboard/container/dashboard.component.ts b/ui/src/app/dashboard/container/dashboard.component.ts index 0942da7d4..35883eaec 100644 --- a/ui/src/app/dashboard/container/dashboard.component.ts +++ b/ui/src/app/dashboard/container/dashboard.component.ts @@ -7,6 +7,8 @@ import * as fromCore from '../../core/reducer'; import { Observable } from 'rxjs'; import { LoadRoleRequest } from '../../core/action/configuration.action'; import { map } from 'rxjs/operators'; +import { LoadAdminRequest } from '../../admin/action/admin-collection.action'; +import { LoadMetadataRequest } from '../../admin/action/metadata-collection.action'; @Component({ selector: 'dashboard-page', @@ -26,6 +28,9 @@ export class DashboardPageComponent { this.actionsRequired$ = this.store.select(fromAdmin.getTotalActionsRequired); this.hasActions$ = this.actionsRequired$.pipe(map(a => a > 0)); this.isAdmin$ = this.store.select(fromCore.isCurrentUserAdmin); + this.store.dispatch(new LoadRoleRequest()); + this.store.dispatch(new LoadAdminRequest()); + this.store.dispatch(new LoadMetadataRequest()); } }