From 39ec99ed296a67a9c3c0cd9e650d04356bda25db Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Thu, 21 Nov 2019 14:46:51 +0000
Subject: [PATCH] Allow null values

---
 src/components/fieldComponents/checkList.vue   |  5 ++++-
 src/components/fieldComponents/htmlBlock.vue   |  3 ++-
 src/components/fieldComponents/numberInput.vue |  6 ++++--
 src/components/fieldComponents/radioList.vue   |  3 ++-
 src/components/fieldComponents/selectList.vue  |  3 ++-
 src/components/fieldComponents/textInput.vue   | 11 +++++++----
 src/components/pluginComponents/JsonForm.vue   | 11 +++++++----
 7 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/components/fieldComponents/checkList.vue b/src/components/fieldComponents/checkList.vue
index dc8749f3..e01b9ff1 100644
--- a/src/components/fieldComponents/checkList.vue
+++ b/src/components/fieldComponents/checkList.vue
@@ -26,7 +26,10 @@ export default {
   props: {
     value: {
       type: Array,
-      required: true
+      required: false,
+      default: function() {
+        return [];
+      }
     },
     options: {
       type: Array,
diff --git a/src/components/fieldComponents/htmlBlock.vue b/src/components/fieldComponents/htmlBlock.vue
index f28b65e4..812c526f 100644
--- a/src/components/fieldComponents/htmlBlock.vue
+++ b/src/components/fieldComponents/htmlBlock.vue
@@ -11,7 +11,8 @@ export default {
   props: {
     label: {
       type: String,
-      required: true
+      required: false,
+      default: ""
     },
     name: {
       type: String,
diff --git a/src/components/fieldComponents/numberInput.vue b/src/components/fieldComponents/numberInput.vue
index 7517ce6e..9897cf6b 100644
--- a/src/components/fieldComponents/numberInput.vue
+++ b/src/components/fieldComponents/numberInput.vue
@@ -20,11 +20,13 @@ export default {
   props: {
     value: {
       type: Number,
-      required: true
+      required: false,
+      default: 0
     },
     placeholder: {
       type: Number,
-      required: true
+      required: false,
+      default: NaN
     },
     name: {
       type: String,
diff --git a/src/components/fieldComponents/radioList.vue b/src/components/fieldComponents/radioList.vue
index e975d6fb..361f73ff 100644
--- a/src/components/fieldComponents/radioList.vue
+++ b/src/components/fieldComponents/radioList.vue
@@ -27,7 +27,8 @@ export default {
   props: {
     value: {
       type: String,
-      required: true
+      required: false,
+      default: ""
     },
     options: {
       type: Array,
diff --git a/src/components/fieldComponents/selectList.vue b/src/components/fieldComponents/selectList.vue
index f9272515..f49e8a74 100644
--- a/src/components/fieldComponents/selectList.vue
+++ b/src/components/fieldComponents/selectList.vue
@@ -21,7 +21,8 @@ export default {
   props: {
     value: {
       type: String,
-      required: true
+      required: false,
+      default: ""
     },
     options: {
       type: Array,
diff --git a/src/components/fieldComponents/textInput.vue b/src/components/fieldComponents/textInput.vue
index bb222ea3..165e2448 100644
--- a/src/components/fieldComponents/textInput.vue
+++ b/src/components/fieldComponents/textInput.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <label class="uk-form-label">{{ label }}</label>
+    <label v-if="label" class="uk-form-label">{{ label }}</label>
 
     <input
       class="uk-input uk-form-small"
@@ -20,11 +20,13 @@ export default {
   props: {
     placeholder: {
       type: String,
-      required: true
+      required: false,
+      default: null
     },
     label: {
       type: String,
-      required: true
+      required: false,
+      default: null
     },
     name: {
       type: String,
@@ -32,7 +34,8 @@ export default {
     },
     value: {
       type: String,
-      required: true
+      required: false,
+      default: ""
     }
   }
 };
diff --git a/src/components/pluginComponents/JsonForm.vue b/src/components/pluginComponents/JsonForm.vue
index 8bbb9858..655b4430 100644
--- a/src/components/pluginComponents/JsonForm.vue
+++ b/src/components/pluginComponents/JsonForm.vue
@@ -156,13 +156,16 @@ export default {
       */
       for (const field of this.schema) {
         if (Array.isArray(field)) {
+          var defaultValue; // Initial value of the form component
           for (const subfield of field) {
-            console.log(subfield.name);
-            this.$set(this.formData, subfield.name, null);
+            // If a default value is given in the schema, use this
+            defaultValue = subfield.default ? subfield.default : null;
+            this.$set(this.formData, subfield.name, defaultValue);
           }
         } else {
-          console.log(field.name);
-          this.$set(this.formData, field.name, null);
+          // If a default value is given in the schema, use this
+          defaultValue = field.default ? field.default : null;
+          this.$set(this.formData, field.name, defaultValue);
         }
       }
     },