X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fpolicy%2Fpolicy-instance%2Fpolicy-instance.component.ts;h=aafc08eee16a0f6452559512cc2d98bebd354d06;hb=94a4ef61a407db7514f2320ea8886c1dda526d4d;hp=8442c2315676fb41d5c60adc3e4129b6d1767211;hpb=cd497d449fc933316aa3e3c2aace85fc88e2a0a8;p=portal%2Fnonrtric-controlpanel.git 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 8442c23..aafc08e 100644 --- a/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts +++ b/webapp-frontend/src/app/policy/policy-instance/policy-instance.component.ts @@ -30,7 +30,7 @@ import { PolicyInstance } from "@interfaces/policy.types"; import { PolicyInstanceDialogComponent } from "../policy-instance-dialog/policy-instance-dialog.component"; import { getPolicyDialogProperties } from "../policy-instance-dialog/policy-instance-dialog.component"; import { HttpErrorResponse, HttpResponse } from "@angular/common/http"; -import { BehaviorSubject, Observable } from "rxjs"; +import { BehaviorSubject } from "rxjs"; import { UiService } from "@services/ui/ui.service"; import { FormControl, FormGroup } from "@angular/forms"; import { MatTableDataSource } from "@angular/material/table"; @@ -48,7 +48,6 @@ class PolicyTypeInfo { }) export class PolicyInstanceComponent implements OnInit { @Input() policyTypeSchema: PolicyTypeSchema; - @Input() expanded: Observable; policyInstances: PolicyInstance[] = []; private policyInstanceSubject = new BehaviorSubject([]); policyTypeInfo = new Map(); @@ -73,8 +72,6 @@ export class PolicyInstanceComponent implements OnInit { } ngOnInit() { - this.expanded.subscribe((isExpanded: boolean) => this.onExpand(isExpanded)); - this.getPolicyInstances(); this.policyInstanceSubject.subscribe((data) => { this.instanceDataSource.data = data; @@ -105,14 +102,14 @@ export class PolicyInstanceComponent implements OnInit { getPolicyInstances() { this.policyInstances = [] as PolicyInstance[]; this.policySvc - .getPolicyInstancesByType(this.policyTypeSchema.id) - .subscribe((policies) => { - if (policies.policy_ids.length != 0) { - policies.policy_ids.forEach((policyId) => { + .getPolicyInstancesByType(this.policyTypeSchema.id) + .subscribe((policies) => { + if (policies.policy_ids.length != 0) { + policies.policy_ids.forEach((policyId) => { + this.policySvc + .getPolicyInstance(policyId) + .subscribe((policyInstance) => { this.policySvc - .getPolicyInstance(policyId) - .subscribe((policyInstance) => { - this.policySvc .getPolicyStatus(policyId) .subscribe((policyStatus) => { policyInstance.lastModified = policyStatus.last_modified;