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=c74c9ab29512457dd8c16960460958d17bd2dbe5;hpb=b96fd22c2a19b61bbd9d4c71c4f4a8fbb3741df1;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 c74c9ab2..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
@@ -42,16 +42,16 @@ export class PolicyInstanceDataSource extends DataSource<PolicyInstance> {
     public rowCount = 1; // hide footer during intial load
 
     constructor(
-        private policySvc: PolicyService,    
+        private policySvc: PolicyService,
         public sort: MatSort,
-        private notificationService: NotificationService, 
+        private notificationService: NotificationService,
         private policyType: PolicyType) {
         super();
     }
 
     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,13 +88,16 @@ export class PolicyInstanceDataSource extends DataSource<PolicyInstance> {
         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;
             }
         });
     }
 }
 
-function compare(a: string, b: string, isAsc: boolean) {  
+function compare(a: string, b: string, isAsc: boolean) {
     return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
 }