Merged in bugfix/SHIBUI-1211 (pull request #290)

Fixed issue with count of required actions, also fixes SHIBUI-1213 Approved-by: Ryan Mathis <rmathis@unicon.net>
TIER · Feb 11, 2019 · bc37b04 · bc37b04
2 parents 1ab6e41 + 93f5e86
commit bc37b04
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/ui/src/app/admin/admin.component.spec.ts b/ui/src/app/admin/admin.component.spec.ts
@@ -31,8 +31,6 @@ describe('Admin Root Component', () => {
 
     it('should compile', () => {
         fixture.detectChanges();
-
         expect(fixture).toBeDefined();
-        expect(store.dispatch).toHaveBeenCalled();
     });
 });
diff --git 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<fromRoot.State>
-    ) {
-        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
@@ -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
@@ -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());
     }
 }