X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dashboard%2Fwebapp-frontend%2Fsrc%2Fapp%2Fpolicy-control%2Fpolicy-instance.datasource.ts;h=b82ee753eedc0049cef5f5f0c63748ff771ec3f8;hb=a2ad32a98e7a3f32214d3ecd7ca9730e3602d11f;hp=53a6239e178eb4c88dbd10102c4fa179ce5aa8c6;hpb=2535d83fed43ebb805f2612f40043eb6ceee2179;p=nonrtric.git diff --git a/dashboard/webapp-frontend/src/app/policy-control/policy-instance.datasource.ts b/dashboard/webapp-frontend/src/app/policy-control/policy-instance.datasource.ts index 53a6239e..b82ee753 100644 --- a/dashboard/webapp-frontend/src/app/policy-control/policy-instance.datasource.ts +++ b/dashboard/webapp-frontend/src/app/policy-control/policy-instance.datasource.ts @@ -51,7 +51,7 @@ export class PolicyInstanceDataSource extends DataSource { loadTable() { this.loadingSubject.next(true); - this.policySvc.getPolicyInstances(this.policyType.policy_type_id) + this.policySvc.getPolicyInstances(this.policyType.name) .pipe( catchError((her: HttpErrorResponse) => { this.notificationService.error('Failed to get policy instances: ' + her.message); @@ -88,7 +88,10 @@ export class PolicyInstanceDataSource extends DataSource { return data.sort((a, b) => { const isAsc = this.sort.direction === 'asc'; switch (this.sort.active) { - case 'instanceId': return compare(a.instanceId, b.instanceId, isAsc); + case 'instanceId': return compare(a.id, b.id, isAsc); + case 'ric': return compare(a.ric, b.ric, isAsc); + case 'service': return compare(a.service, b.service, isAsc); + case 'lastModified': return compare(a.lastModified, b.lastModified, isAsc) default: return 0; } });