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
Possibility to create and edit typeless policies
[portal/nonrtric-controlpanel.git]
/
webapp-frontend
/
src
/
app
/
policy-control
/
policy-instance-dialog.component.ts
diff --git
a/webapp-frontend/src/app/policy-control/policy-instance-dialog.component.ts
b/webapp-frontend/src/app/policy-control/policy-instance-dialog.component.ts
index
60ffbd3
..
8ab798e
100644
(file)
--- a/
webapp-frontend/src/app/policy-control/policy-instance-dialog.component.ts
+++ b/
webapp-frontend/src/app/policy-control/policy-instance-dialog.component.ts
@@
-123,20
+123,11
@@
export class PolicyInstanceDialogComponent implements OnInit, AfterViewInit {
if (!this.policyInstanceId) {
this.fetchRics();
}
if (!this.policyInstanceId) {
this.fetchRics();
}
- if (this.isSchemaEmpty()) {
- // Empty schema, hide form, show json instead
- this.isVisible.form = false;
- this.isVisible.json = true;
- }
}
ngAfterViewInit() {
}
}
ngAfterViewInit() {
}
- private isSchemaEmpty(): boolean {
- return Object.keys(this.jsonSchemaObject).length === 0;
- }
-
onSubmit() {
if (this.policyInstanceId == null) {
this.policyInstanceId = uuid.v4();
onSubmit() {
if (this.policyInstanceId == null) {
this.policyInstanceId = uuid.v4();
@@
-145,8
+136,9
@@
export class PolicyInstanceDialogComponent implements OnInit, AfterViewInit {
const self: PolicyInstanceDialogComponent = this;
this.dataService.putPolicy(this.policyTypeName, this.policyInstanceId, policyJson, this.ric).subscribe(
{
const self: PolicyInstanceDialogComponent = this;
this.dataService.putPolicy(this.policyTypeName, this.policyInstanceId, policyJson, this.ric).subscribe(
{
- next(value) {
- self.notificationService.success('Policy ' + self.policyTypeName + ':' + self.policyInstanceId + ' submitted');
+ next(_) {
+ self.notificationService.success('Policy ' + self.policyTypeName + ':' + self.policyInstanceId +
+ ' submitted');
},
error(error: HttpErrorResponse) {
self.errorService.displayError('Submit failed: ' + error.error);
},
error(error: HttpErrorResponse) {
self.errorService.displayError('Submit failed: ' + error.error);
@@
-163,18
+155,15
@@
export class PolicyInstanceDialogComponent implements OnInit, AfterViewInit {
this.liveFormData = formData;
}
this.liveFormData = formData;
}
- get prettyLiveFormData(): string {
- if (this.isSchemaEmpty()) {
- return this.jsonAsString;
- }
+ get prettyLiveFormData() {
return JSON.stringify(this.liveFormData, null, 2);
}
return JSON.stringify(this.liveFormData, null, 2);
}
- get schemaAsString()
: string
{
+ get schemaAsString() {
return JSON.stringify(this.jsonSchemaObject, null, 2);
}
return JSON.stringify(this.jsonSchemaObject, null, 2);
}
- get jsonAsString()
: string
{
+ get jsonAsString() {
return JSON.stringify(this.jsonObject, null, 2);
}
return JSON.stringify(this.jsonObject, null, 2);
}