diff --git a/src/app/dars/metadata-table/metadata-table.component.html b/src/app/dars/metadata-table/metadata-table.component.html index 73f1377d2831696d0803476bce2703ec144565ab..c0e8f55753162918c86697214fb1bffabd7472f3 100644 --- a/src/app/dars/metadata-table/metadata-table.component.html +++ b/src/app/dars/metadata-table/metadata-table.component.html @@ -1,5 +1,5 @@ <div id="audits"> - <table class="audit-table" mat-table [dataSource]="metadata$ | async"> + <table class="audit-table" mat-table [dataSource]="metadata$"> <!-- View Column --> <ng-container matColumnDef="view"> diff --git a/src/app/dars/services/api.service.ts b/src/app/dars/services/api.service.ts index ec1b9de4b3d70c4c683f30cafd6af53c3d7b2a4c..e07d093aaf565ce52e113e1c68aafc16b735d8a9 100644 --- a/src/app/dars/services/api.service.ts +++ b/src/app/dars/services/api.service.ts @@ -6,6 +6,7 @@ import { AuditMetadata } from '../models/audit-metadata'; import { StudentDegreeProgram } from '../models/student-degree-program'; import { environment } from './../../../environments/environment'; import { Audit } from '../models/audit'; +import { map } from 'rxjs/operators'; const auditResponse: any = require('../../../assets/mock-data/audit-response.json'); @@ -33,17 +34,23 @@ export class DarsApiService { /** * Get a students degree programs. */ - public getStudentDegreePrograms(emplid: number) { - const url = `${environment.apiDarsUrl}/student-degree-programs/${emplid}`; - return this.http.get<StudentDegreeProgram[]>(url, HTTP_OPTIONS); + public getStudentDegreePrograms( + _emplid: number, + ): Observable<StudentDegreeProgram[]> { + const url = `${environment.apiDarsUrl}/studentplans`; + return this.http + .get<string>(url, HTTP_OPTIONS) + .pipe(map(JSON.parse.bind(JSON))); } /** * Get audit metadata for all audits a user has. */ public getAudits(): Observable<AuditMetadata[]> { - const url = `${environment.apiDarsUrl}/audit-metadata`; - return this.http.get<AuditMetadata[]>(url, HTTP_OPTIONS); + const url = `${environment.apiDarsUrl}/auditmetadata`; + return this.http + .get<string>(url, HTTP_OPTIONS) + .pipe(map(JSON.parse.bind(JSON))); } /** diff --git a/src/environments/environment.ts b/src/environments/environment.ts index e1812ea97e287f039b77766cdedfda218cdc149e..1735cfdf3497e6a574d7892dc17443b248211338 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -9,7 +9,7 @@ export const environment = { apiPlannerUrl: '/api/planner/v1', apiSearchUrl: '/api/search/v1', apiEnrollUrl: '/api/enroll/v1', - apiDarsUrl: 'https://gateway.test.api.wisc.edu/v1/dars', + apiDarsUrl: '/api/dars', snackbarDuration: 4000, useNewDARSView: true, };