From 44fae4a4a180800120d932d670727205e2587be0 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranavrajs@gmail.com>
Date: Mon, 4 May 2020 23:48:47 +0530
Subject: [PATCH] Feature: Add default value to ChatForm (#816)

* Feature: Add adefault value to ChatForm
---
 app/javascript/shared/components/ChatForm.vue | 34 +++++++++++++------
 .../concerns/content_attribute_validator.rb   |  2 +-
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/app/javascript/shared/components/ChatForm.vue b/app/javascript/shared/components/ChatForm.vue
index f694db407..68af0f053 100644
--- a/app/javascript/shared/components/ChatForm.vue
+++ b/app/javascript/shared/components/ChatForm.vue
@@ -21,7 +21,7 @@
       </div>
       <button
         v-if="!submittedValues.length"
-        class="button small block"
+        class="button block"
         type="submit"
         :disabled="!isFormValid"
       >
@@ -56,7 +56,11 @@ export default {
     },
   },
   mounted() {
-    this.updateFormValues();
+    if (this.submittedValues.length) {
+      this.updateFormValues();
+    } else {
+      this.setFormDefaults();
+    }
   },
   methods: {
     onSubmit() {
@@ -65,14 +69,20 @@ export default {
       }
       this.$emit('submit', this.formValues);
     },
-    updateFormValues() {
-      this.formValues = this.submittedValues.reduce((acc, obj) => {
+    buildFormObject(formObjectArray) {
+      return formObjectArray.reduce((acc, obj) => {
         return {
           ...acc,
-          [obj.name]: obj.value,
+          [obj.name]: obj.value || obj.default,
         };
       }, {});
     },
+    updateFormValues() {
+      this.formValues = this.buildFormObject(this.submittedValues);
+    },
+    setFormDefaults() {
+      this.formValues = this.buildFormObject(this.items);
+    },
   },
 };
 </script>
@@ -82,16 +92,16 @@ export default {
 
 .form {
   padding: $space-normal;
-  width: 100%;
+  width: 80%;
 
   .form-block {
-    max-width: 100%;
+    width: 90%;
     padding-bottom: $space-small;
   }
 
   label {
     display: block;
-    font-weight: $font-weight-bold;
+    font-weight: $font-weight-medium;
     padding: $space-smaller 0;
     text-transform: capitalize;
   }
@@ -103,12 +113,16 @@ export default {
     display: block;
     font-size: $font-size-default;
     line-height: 1.5;
-    padding: $space-smaller $space-small;
-    width: 90%;
+    padding: $space-one;
+    width: 100%;
 
     &:disabled {
       background: $color-background-light;
     }
   }
+
+  .button {
+    font-size: $font-size-default;
+  }
 }
 </style>
diff --git a/app/models/concerns/content_attribute_validator.rb b/app/models/concerns/content_attribute_validator.rb
index bbeac3a7f..a846a1a82 100644
--- a/app/models/concerns/content_attribute_validator.rb
+++ b/app/models/concerns/content_attribute_validator.rb
@@ -2,7 +2,7 @@ class ContentAttributeValidator < ActiveModel::Validator
   ALLOWED_SELECT_ITEM_KEYS = [:title, :value].freeze
   ALLOWED_CARD_ITEM_KEYS = [:title, :description, :media_url, :actions].freeze
   ALLOWED_CARD_ITEM_ACTION_KEYS = [:text, :type, :payload, :uri].freeze
-  ALLOWED_FORM_ITEM_KEYS = [:type, :placeholder, :label, :name, :options].freeze
+  ALLOWED_FORM_ITEM_KEYS = [:type, :placeholder, :label, :name, :options, :default].freeze
   ALLOWED_ARTICLE_KEYS = [:title, :description, :link].freeze
 
   def validate(record)