X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-frontend%2Fsrc%2Fapp%2Fpolicy-control%2Fpolicy-instance.datasource.ts;h=4bf2aad0ca7caea54a847cbc141cb3864f6c3afb;hb=9872b8b01da34a6677844ebd56352c9d8c3ec09b;hp=b82ee753eedc0049cef5f5f0c63748ff771ec3f8;hpb=f507d92d55ee77fad16cc024ea95c869e0d5dc32;p=portal%2Fnonrtric-controlpanel.git

diff --git a/webapp-frontend/src/app/policy-control/policy-instance.datasource.ts b/webapp-frontend/src/app/policy-control/policy-instance.datasource.ts
index b82ee75..4bf2aad 100644
--- a/webapp-frontend/src/app/policy-control/policy-instance.datasource.ts
+++ b/webapp-frontend/src/app/policy-control/policy-instance.datasource.ts
@@ -26,10 +26,9 @@ import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { merge } from 'rxjs';
 import { of } from 'rxjs/observable/of';
 import { catchError, finalize, map } from 'rxjs/operators';
-import { PolicyInstance } from '../interfaces/policy.types';
+import { PolicyInstance, PolicyTypeSchema } from '../interfaces/policy.types';
 import { PolicyService } from '../services/policy/policy.service';
 import { NotificationService } from '../services/ui/notification.service';
-import { PolicyType } from '../interfaces/policy.types';
 
 export class PolicyInstanceDataSource extends DataSource<PolicyInstance> {
 
@@ -45,16 +44,16 @@ export class PolicyInstanceDataSource extends DataSource<PolicyInstance> {
         private policySvc: PolicyService,
         public sort: MatSort,
         private notificationService: NotificationService,
-        private policyType: PolicyType) {
+        private policyTypeSchema: PolicyTypeSchema) {
         super();
     }
 
     loadTable() {
         this.loadingSubject.next(true);
-        this.policySvc.getPolicyInstances(this.policyType.name)
+        this.policySvc.getPolicyInstances(this.policyTypeSchema.name)
             .pipe(
                 catchError((her: HttpErrorResponse) => {
-                    this.notificationService.error('Failed to get policy instances: ' + her.message);
+                    this.notificationService.error('Failed to get policy instances: ' + her.error);
                     return of([]);
                 }),
                 finalize(() => this.loadingSubject.next(false))
@@ -91,7 +90,7 @@ export class PolicyInstanceDataSource extends DataSource<PolicyInstance> {
                 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)
+                case 'lastModified': return compare(a.lastModified, b.lastModified, isAsc);
                 default: return 0;
             }
         });