Merge "Add tests of PolicyInstanceDialog"

[portal/nonrtric-controlpanel.git] / webapp-frontend / src / app / policy / no-type-policy-editor / no-type-policy-editor.component.ts

diff --git a/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.ts b/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.ts
index d231b00..877e0e3 100644 (file)
--- a/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.ts
+++ b/webapp-frontend/src/app/policy/no-type-policy-editor/no-type-policy-editor.component.ts
@@ -54,6 +54,7 @@ export class NoTypePolicyEditorComponent implements OnInit {
         this.jsonValidator(),
       ])
     );
+    if (!this.policyJson) this.policyJson = "{}";
   }
 
   get policyJsonTextArea(): AbstractControl {
@@ -63,9 +64,9 @@ export class NoTypePolicyEditorComponent implements OnInit {
   }
 
   formatJsonInput(): void {
-    this.policyJson = formatJsonString(
-      JSON.parse(this.policyJsonTextArea.value)
-    );
+    let jsonBefore: string = this.policyJsonTextArea.value;
+    let jsonAfter = formatJsonString(JSON.parse(jsonBefore));
+    this.policyJsonTextArea.setValue(jsonAfter);
   }
 
   jsonValidator(): ValidatorFn {
@@ -85,16 +86,14 @@ export class NoTypePolicyEditorComponent implements OnInit {
   }
 
   isJsonValid(json: string): boolean {
+    let valid = false as boolean;
     try {
       if (json != null) {
         JSON.parse(json);
-        return true;
-      } else {
-        return false;
+        valid = true;
       }
-    } catch (jsonError) {
-      return false;
-    }
+    } catch (jsonError) {}
+    return valid;
   }
 }