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
Move Enrichment Job Logic from backend
[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
da05ebb
..
66dcfb7
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
@@
-26,6
+26,7
@@
import { UiService } from '../services/ui/ui.service';
import { HttpErrorResponse } from '@angular/common/http';
import { ErrorDialogService } from '../services/ui/error-dialog.service';
import * as uuid from 'uuid';
import { HttpErrorResponse } from '@angular/common/http';
import { ErrorDialogService } from '../services/ui/error-dialog.service';
import * as uuid from 'uuid';
+import { Ric } from '../interfaces/ric';
@Component({
selector: 'rd-no-type-policy-instance-dialog',
@Component({
selector: 'rd-no-type-policy-instance-dialog',
@@
-33,15
+34,13
@@
import * as uuid from 'uuid';
styleUrls: ['./no-type-policy-instance-dialog.component.scss']
})
export class NoTypePolicyInstanceDialogComponent implements OnInit {
styleUrls: ['./no-type-policy-instance-dialog.component.scss']
})
export class NoTypePolicyInstanceDialogComponent implements OnInit {
-
- // Declare following variables as Public variable. Private variables should not be used in template HTML
instanceForm: FormGroup;
policyInstanceId: string; // null if not yet created
policyJson: string;
darkMode: boolean;
ric: string;
instanceForm: FormGroup;
policyInstanceId: string; // null if not yet created
policyJson: string;
darkMode: boolean;
ric: string;
- allRics:
string
[];
+ allRics:
Ric
[];
constructor(
private policySvc: PolicyService,
constructor(
private policySvc: PolicyService,
@@
-50,7
+49,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;
}
@@
-78,7
+77,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(
@@
-97,7
+96,7
@@
export class NoTypePolicyInstanceDialogComponent implements OnInit {
const self: NoTypePolicyInstanceDialogComponent = this;
this.policySvc.getRics('').subscribe(
{
const self: NoTypePolicyInstanceDialogComponent = this;
this.policySvc.getRics('').subscribe(
{
- next(value) {
+ next(value
:Ric[]
) {
self.allRics = value;
console.log(value);
},
self.allRics = value;
console.log(value);
},
@@
-107,6
+106,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 {