Merge branch 'teams-component-upgrade' of https://github.com/ngageoint/mage-server into team-details-upgrade

Author: ryanslatten

web-app/admin/src/app/admin/admin-teams/dashboard/team-dashboard.component.spec.ts

@@ -11,7 +11,7 @@ import { TeamsService } from '../teams-service';
 import { Team } from '../team';
 import { CreateTeamDialogComponent } from '../create-team/create-team.component';
 
-fdescribe('TeamDashboardComponent', () => {
+describe('TeamDashboardComponent', () => {
   let component: TeamDashboardComponent;
   let fixture: ComponentFixture<TeamDashboardComponent>;
   let mockTeamsService: jasmine.SpyObj<TeamsService>;
@@ -52,7 +52,6 @@ fdescribe('TeamDashboardComponent', () => {
     mockDialog = TestBed.inject(MatDialog) as jasmine.SpyObj<MatDialog>;
 
     mockTeamsService.getTeams.and.returnValue(of(mockTeamsResponse));
-    mockTeamsService.getTeams.calls.reset();
   });
 
   it('should create', () => {

web-app/admin/src/app/admin/admin-teams/dashboard/team-dashboard.component.ts

@@ -112,6 +112,7 @@ export class TeamDashboardComponent implements OnInit, OnDestroy {
 
   gotoTeam(team: Team): void {
     // TODO: convert to this to using a router once upgrade is complete
-    window.location.href = `/#/home/teams/${team.id}`;
+    const baseUrl = window.location.href.split('#')[0];
+    window.location.href = `${baseUrl}#/home/teams/${team.id}`;
   }
 }