import { MatMenuTrigger } from '@angular/material/menu';
import { JsonPointer } from 'angular6-json-schema-form';
import * as uuid from 'uuid';
-import { PolicyInstance, PolicyTypeSchema } from '../interfaces/policy.types';
+import { CreatePolicyInstance, PolicyInstance, PolicyTypeSchema } from '../interfaces/policy.types';
import { PolicyService } from '../services/policy/policy.service';
import { ErrorDialogService } from '../services/ui/error-dialog.service';
import { NotificationService } from './../services/ui/notification.service';
import { UiService } from '../services/ui/ui.service';
import { HttpErrorResponse } from '@angular/common/http';
import { FormGroup, FormControl, Validators } from '@angular/forms';
+import { ChangeDetectorRef } from '@angular/core';
+import { Ric } from '../interfaces/ric';
@Component({
policyTypeName: string;
darkMode: boolean;
ric: string;
- allRics: string[];
+ allRics: Ric[];
private fetchRics() {
console.log('fetchRics ' + this.policyTypeName);
const self: PolicyInstanceDialogComponent = this;
this.dataService.getRics(this.policyTypeName).subscribe(
{
- next(value) {
+ next(value: Ric[]) {
self.allRics = value;
console.log(value);
},
}
constructor(
+ private cdr: ChangeDetectorRef,
private dataService: PolicyService,
private errorService: ErrorDialogService,
private notificationService: NotificationService,
this.policyInstanceId = data.instanceId;
this.policyTypeName = data.name;
this.jsonSchemaObject = data.createSchema;
- this.jsonObject = this.parseJson(data.instanceJson);
+ this.jsonObject = data.instanceJson;
this.ric = data.ric;
}
}
ngAfterViewInit() {
+ this.cdr.detectChanges();
}
get ricSelector() { return this.instanceForm.get('ricSelector'); }
}
const policyJson: string = this.prettyLiveFormData;
const self: PolicyInstanceDialogComponent = this;
- this.dataService.putPolicy(this.policyTypeName, this.policyInstanceId, policyJson, this.ric).subscribe(
+ let createPolicyInstance = this.createPolicyInstance(policyJson);
+ this.dataService.putPolicy(createPolicyInstance).subscribe(
{
next(_) {
self.notificationService.success('Policy ' + self.policyTypeName + ':' + self.policyInstanceId +
- ' submitted');
+ ' submitted');
},
error(error: HttpErrorResponse) {
self.errorService.displayError('Submit failed: ' + error.error);
});
}
+ private createPolicyInstance(policyJson: string) {
+ let createPolicyInstance = {} as CreatePolicyInstance;
+ createPolicyInstance.policy_data = JSON.parse(policyJson);
+ createPolicyInstance.policy_id = this.policyInstanceId;
+ createPolicyInstance.policytype_id = this.policyTypeName;
+ createPolicyInstance.ric_id = (!this.ricSelector.value.ric_id) ? this.ric : this.ricSelector.value.ric_id;
+ createPolicyInstance.service_id = 'controlpanel';
+ return createPolicyInstance;
+ }
+
onClose() {
this.dialogRef.close();
}
export function getPolicyDialogProperties(policyTypeSchema: PolicyTypeSchema, instance: PolicyInstance, darkMode: boolean): MatDialogConfig {
const createSchema = policyTypeSchema.schemaObject;
- const instanceId = instance ? instance.id : null;
- const instanceJson = instance ? instance.json : null;
+ const instanceId = instance ? instance.policy_id : null;
+ const instanceJson = instance ? instance.policy_data : null;
const name = policyTypeSchema.name;
- const ric = instance ? instance.ric : null;
+ const ric = instance ? instance.ric_id : null;
return {
maxWidth: '1200px',
maxHeight: '900px',