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 PolicyControlComponent
[portal/nonrtric-controlpanel.git]
/
webapp-frontend
/
src
/
app
/
policy
/
policy-instance-dialog
/
policy-instance-dialog.component.ts
diff --git
a/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.ts
b/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.ts
index
f649911
..
d29aa07
100644
(file)
--- a/
webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.ts
+++ b/
webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.ts
@@
-29,18
+29,17
@@
import {
MatDialogRef,
MAT_DIALOG_DATA,
} from "@angular/material/dialog";
MatDialogRef,
MAT_DIALOG_DATA,
} from "@angular/material/dialog";
-import { PolicyService } from "
../../
services/policy/policy.service";
-import { NotificationService } from "
../../
services/ui/notification.service";
-import { UiService } from "
../../
services/ui/ui.service";
+import { PolicyService } from "
@
services/policy/policy.service";
+import { NotificationService } from "
@
services/ui/notification.service";
+import { UiService } from "
@
services/ui/ui.service";
import { HttpErrorResponse } from "@angular/common/http";
import { HttpErrorResponse } from "@angular/common/http";
-import { ErrorDialogService } from "
../../
services/ui/error-dialog.service";
+import { ErrorDialogService } from "
@
services/ui/error-dialog.service";
import * as uuid from "uuid";
import {
CreatePolicyInstance,
PolicyInstance,
PolicyTypeSchema,
import * as uuid from "uuid";
import {
CreatePolicyInstance,
PolicyInstance,
PolicyTypeSchema,
-} from "../../interfaces/policy.types";
-import { formatJsonString } from "../no-type-policy-editor/no-type-policy-editor.component";
+} from "@interfaces/policy.types";
@Component({
selector: "nrcp-policy-instance-dialog",
@Component({
selector: "nrcp-policy-instance-dialog",
@@
-69,13
+68,13
@@
export class PolicyInstanceDialogComponent implements OnInit, AfterViewInit {
this.policyJson = data.instanceJson;
this.jsonSchemaObject = data.createSchema;
this.policyInstance.ric_id = data.ric;
this.policyJson = data.instanceJson;
this.jsonSchemaObject = data.createSchema;
this.policyInstance.ric_id = data.ric;
+ this.policyInstance.service_id = "controlpanel";
}
ngOnInit() {
this.ui.darkModeState.subscribe((isDark) => {
this.darkMode = isDark;
});
}
ngOnInit() {
this.ui.darkModeState.subscribe((isDark) => {
this.darkMode = isDark;
});
- this.formatNoTypePolicyJson();
}
// Do not remove! Needed to avoid "Expression has changed after it was checked" warning
}
// Do not remove! Needed to avoid "Expression has changed after it was checked" warning
@@
-83,16
+82,6
@@
export class PolicyInstanceDialogComponent implements OnInit, AfterViewInit {
this.cdr.detectChanges();
}
this.cdr.detectChanges();
}
- private formatNoTypePolicyJson() {
- if (!this.typeHasSchema()) {
- if (this.policyInstance.policy_data) {
- this.policyJson = formatJsonString(this.policyInstance.policy_data);
- } else {
- this.policyJson = "{}";
- }
- }
- }
-
onSelectedRicChanged(newRic: string): void {
this.policyInstance.ric_id = newRic;
}
onSelectedRicChanged(newRic: string): void {
this.policyInstance.ric_id = newRic;
}
@@
-121,7
+110,7
@@
export class PolicyInstanceDialogComponent implements OnInit, AfterViewInit {
}
typeHasSchema(): boolean {
}
typeHasSchema(): boolean {
- return this.jsonSchemaObject
!== "{}"
;
+ return this.jsonSchemaObject
.description ? true : false
;
}
isFormValid(): boolean {
}
isFormValid(): boolean {