Reorganise policy control part of frontend

[portal/nonrtric-controlpanel.git] / webapp-frontend / src / app / policy / policy-instance / policy-instance.datasource.ts

diff --git a/webapp-frontend/src/app/policy/policy-instance/policy-instance.datasource.ts b/webapp-frontend/src/app/policy/policy-instance/policy-instance.datasource.ts
index 4b58e42..225aabb 100644 (file)
--- a/webapp-frontend/src/app/policy/policy-instance/policy-instance.datasource.ts
+++ b/webapp-frontend/src/app/policy/policy-instance/policy-instance.datasource.ts
@@ -19,16 +19,14 @@
  */
 
 import { DataSource } from '@angular/cdk/collections';
-import { HttpErrorResponse } from '@angular/common/http';
 import { MatSort } from '@angular/material/sort';
 import { Observable } from 'rxjs/Observable';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { merge } from 'rxjs';
-import { of } from 'rxjs/observable/of';
-import { catchError, finalize, map } from 'rxjs/operators';
-import { PolicyInstance, PolicyTypeSchema } from '../../interfaces/policy.types';
-import { PolicyService } from '../../services/policy/policy.service';
-import { NotificationService } from '../../services/ui/notification.service';
+import { map } from 'rxjs/operators';
+import { PolicyInstance } from '@interfaces/policy.types';
+import { PolicyService } from '@services/policy/policy.service';
+import { NotificationService } from '@services/ui/notification.service';
 
 export class PolicyInstanceDataSource extends DataSource<PolicyInstance> {
 
@@ -46,16 +44,15 @@ export class PolicyInstanceDataSource extends DataSource<PolicyInstance> {
         private policySvc: PolicyService,
         public sort: MatSort,
         private notificationService: NotificationService,
-        private policyTypeSchema: PolicyTypeSchema) {
+        private policyTypeSchemaId: string) {
         super();
     }
 
     public getPolicyInstances() {
         this.policyInstances = [] as PolicyInstance[];
-        this.policySvc.getPolicyInstancesByType(this.policyTypeSchema.id).subscribe(policies => {
+        this.policySvc.getPolicyInstancesByType(this.policyTypeSchemaId).subscribe(policies => {
             if (policies.policy_ids.length != 0) {
                 policies.policy_ids.forEach(policyId => {
-                    var policyInstance = {} as PolicyInstance
                     this.policySvc.getPolicyInstance(policyId).subscribe(policyInstance => {
                         this.policySvc.getPolicyStatus(policyId).subscribe(policyStatus => {
                             policyInstance.lastModified = policyStatus.last_modified;