Code Review
/
portal
/
nonrtric-controlpanel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix Policy-type Datasource Test cases
[portal/nonrtric-controlpanel.git]
/
webapp-frontend
/
src
/
app
/
policy-control
/
no-type-policy-instance-dialog.component.ts
diff --git
a/webapp-frontend/src/app/policy-control/no-type-policy-instance-dialog.component.ts
b/webapp-frontend/src/app/policy-control/no-type-policy-instance-dialog.component.ts
index
d7671a3
..
976a4e4
100644
(file)
--- a/
webapp-frontend/src/app/policy-control/no-type-policy-instance-dialog.component.ts
+++ b/
webapp-frontend/src/app/policy-control/no-type-policy-instance-dialog.component.ts
@@
-48,7
+48,7
@@
export class NoTypePolicyInstanceDialogComponent implements OnInit {
@Inject(MAT_DIALOG_DATA) private data,
private ui: UiService) {
this.policyInstanceId = data.instanceId;
@Inject(MAT_DIALOG_DATA) private data,
private ui: UiService) {
this.policyInstanceId = data.instanceId;
- this.policyJson = data.instanceJson ?
JSON.stringify(JSON.parse(data.instanceJson), null, 2
) : '';
+ this.policyJson = data.instanceJson ?
this.formatJsonString(data.instanceJson
) : '';
this.ric = data.ric;
}
this.ric = data.ric;
}
@@
-76,7
+76,7
@@
export class NoTypePolicyInstanceDialogComponent implements OnInit {
onSubmit() {
if (this.policyInstanceId == null) {
onSubmit() {
if (this.policyInstanceId == null) {
-
this.policyInstanceId = uuid.v4();
+ this.policyInstanceId = uuid.v4();
}
const self: NoTypePolicyInstanceDialogComponent = this;
this.policySvc.putPolicy('', this.policyInstanceId, this.policyJsonTextArea.value, this.ric).subscribe(
}
const self: NoTypePolicyInstanceDialogComponent = this;
this.policySvc.putPolicy('', this.policyInstanceId, this.policyJsonTextArea.value, this.ric).subscribe(
@@
-105,6
+105,14
@@
export class NoTypePolicyInstanceDialogComponent implements OnInit {
complete() { }
});
}
complete() { }
});
}
+
+ private formatJsonString(jsonToFormat: any) {
+ return JSON.stringify(jsonToFormat, null, 2);
+ }
+
+ formatJsonInput() {
+ this.policyJson = this.formatJsonString(JSON.parse(this.policyJsonTextArea.value));
+ }
}
export function jsonValidator(): ValidatorFn {
}
export function jsonValidator(): ValidatorFn {