Merge "Fix PolicyControlComponent"

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

diff --git a/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts b/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts
index 24a7cc7..700e929 100644 (file)
--- a/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts
+++ b/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts
@@ -75,11 +75,7 @@ export class PolicyInstanceComponent implements OnInit, AfterViewInit {
     }
 
     ngOnInit() {
-        let schemaId = this.policyTypeSchema.id;
-        if(schemaId.includes('<No Type>')){
-            schemaId = '';
-        }
-        this.policyInstanceDataSource = new PolicyInstanceDataSource(this.policySvc, this.sort, this.notificationService, schemaId);
+        this.policyInstanceDataSource = new PolicyInstanceDataSource(this.policySvc, this.sort, this.notificationService, this.policyTypeSchema.id);
         this.expanded.subscribe((isExpanded: boolean) => this.onExpand(isExpanded));
 
         this.policyInstanceDataSource.connect().subscribe((data) => {