public policyInstanceId: string;
public policyTypeName: string;
darkMode: boolean;
- private policyTypeId: number;
constructor(
this.formActive = false;
this.policyInstanceId = data.instanceId;
this.policyTypeName = data.name;
- this.policyTypeId = data.policyTypeId;
- this.parseJson(data.createSchema, data.instanceJson);
+ this.jsonSchemaObject = data.createSchema;
+ this.jsonObject = this.parseJson(data.instanceJson);
}
ngOnInit() {
}
const policyJson: string = this.prettyLiveFormData;
const self: PolicyInstanceDialogComponent = this;
- this.dataService.putPolicy(this.policyTypeId, this.policyInstanceId, policyJson).subscribe(
+ this.dataService.putPolicy(this.policyTypeName, this.policyInstanceId, policyJson).subscribe(
{
next(value) {
self.notificationService.success('Policy ' + self.policyTypeName + ':' + self.policyInstanceId + ' submitted');
return errorArray.join('<br>');
}
- private parseJson(createSchema: string, instanceJson: string): void {
+ private parseJson(str: string): string {
try {
- this.jsonSchemaObject = JSON.parse(createSchema);
- if (instanceJson != null) {
- this.jsonObject = JSON.parse(instanceJson);
+ if (str != null) {
+ return JSON.parse(str);
}
} catch (jsonError) {
this.jsonFormStatusMessage =
'Invalid JSON\n' +
'parser returned:\n\n' + jsonError;
- return;
}
+ return null;
}
public toggleVisible(item: string) {
}
export function getPolicyDialogProperties(policyType: PolicyType, instance: PolicyInstance, darkMode: boolean): MatDialogConfig {
- const policyTypeId = policyType.policy_type_id;
- const createSchema = policyType.schema;
- const instanceId = instance ? instance.instanceId : null;
- const instanceJson = instance ? instance.instance : null;
+ const createSchema = policyType.schemaObject;
+ const instanceId = instance ? instance.id : null;
+ const instanceJson = instance ? instance.json : null;
const name = policyType.name;
return {
maxWidth: '1200px',
disableClose: false,
panelClass: darkMode ? 'dark-theme' : '',
data: {
- policyTypeId,
createSchema,
instanceId,
instanceJson,