Merge "Fix create policy without type"

diff --git a/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.spec.ts b/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.spec.ts
index 91edaa9..d2b1a61 100644 (file)
--- a/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.spec.ts
+++ b/webapp-frontend/src/app/policy/policy-instance-dialog/policy-instance-dialog.component.spec.ts
@@ -218,6 +218,7 @@ describe("PolicyInstanceDialogComponent", () => {
       const policyInstance = {} as CreatePolicyInstance;
       policyInstance.policy_data = JSON.parse("{}");
       policyInstance.policy_id = "1234567890";
+      policyInstance.policytype_id = "";
       policyInstance.ric_id = "ric1";
       policyInstance.service_id = "controlpanel";
       expect(policyServiceSpy.putPolicy).toHaveBeenCalledWith(policyInstance);
@@ -378,6 +379,7 @@ describe("PolicyInstanceDialogComponent", () => {
       const policyInstance = {} as CreatePolicyInstance;
       policyInstance.policy_data = instanceJson;
       policyInstance.policy_id = "instanceId";
+      policyInstance.policytype_id = "";
       policyInstance.ric_id = "ric1";
       policyInstance.service_id = "controlpanel";
       expect(policyServiceSpy.putPolicy).toHaveBeenCalledWith(policyInstance);

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 dbc62a1..05604e3 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
@@ -63,7 +63,7 @@ export class PolicyInstanceDialogComponent implements OnInit, AfterViewInit {
     private ui: UiService
   ) {
     this.policyInstance.policy_id = data.instanceId;
-    this.policyInstance.policytype_id = data.name;
+    this.policyInstance.policytype_id = data.name ? data.name : "";
     this.policyInstance.policy_data = data.instanceJson;
     this.policyJson = data.instanceJson;
     this.jsonSchemaObject = data.createSchema;