X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fpolicy-control%2Fpolicy-instance.component.ts;h=ab9bfd988d09d862cfdac65f41bf6b99b13f2942;hb=9d99a37374c9266f3d11ff0a19c2d068571159ba;hp=55f50f79fdcfd7305612576f337843c7d6977c1e;hpb=2e425bc51a5e8cb865db1e35e11ebe9240f72397;p=portal%2Fnonrtric-controlpanel.git diff --git a/webapp-frontend/src/app/policy-control/policy-instance.component.ts b/webapp-frontend/src/app/policy-control/policy-instance.component.ts index 55f50f7..ab9bfd9 100644 --- a/webapp-frontend/src/app/policy-control/policy-instance.component.ts +++ b/webapp-frontend/src/app/policy-control/policy-instance.component.ts @@ -28,6 +28,7 @@ import { NotificationService } from '../services/ui/notification.service'; import { PolicyService } from '../services/policy/policy.service'; import { ConfirmDialogService } from './../services/ui/confirm-dialog.service'; import { PolicyInstance } from '../interfaces/policy.types'; +import { NoTypePolicyInstanceDialogComponent } from './no-type-policy-instance-dialog.component'; import { PolicyInstanceDialogComponent } from './policy-instance-dialog.component'; import { getPolicyDialogProperties } from './policy-instance-dialog.component'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; @@ -75,15 +76,35 @@ export class PolicyInstanceComponent implements OnInit, AfterViewInit { } } + private isSchemaEmpty(): boolean { + return Object.keys(this.policyType.schemaObject).length === 0; + } + modifyInstance(instance: PolicyInstance): void { this.policySvc.getPolicy(this.policyType.name, instance.id).subscribe( (refreshedJson: any) => { instance.json = JSON.stringify(refreshedJson); - this.dialog.open(PolicyInstanceDialogComponent, getPolicyDialogProperties(this.policyType, instance, this.darkMode)); + if (this.isSchemaEmpty()) { + this.dialog.open( + NoTypePolicyInstanceDialogComponent, + getPolicyDialogProperties(this.policyType, instance, this.darkMode)).afterClosed().subscribe( + (_: any) => { + this.instanceDataSource.loadTable(); + } + ); + } else { + this.dialog.open( + PolicyInstanceDialogComponent, + getPolicyDialogProperties(this.policyType, instance, this.darkMode)).afterClosed().subscribe( + (_: any) => { + this.instanceDataSource.loadTable(); + } + ); + + } }, (httpError: HttpErrorResponse) => { - this.notificationService.error('Could not refresh instance ' + httpError.message); - this.dialog.open(PolicyInstanceDialogComponent, getPolicyDialogProperties(this.policyType, instance, this.darkMode)); + this.notificationService.error('Could not refresh instance. Please try again.' + httpError.message); } ); }