From 9106f6278d451053effdba7bb539d1480d44afa8 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 15 Dec 2022 23:06:18 +0530
Subject: [PATCH] fix: Allow editing label and placeholder for standard
 attributes in pre chat form (#6067)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 app/javascript/dashboard/helper/preChat.js      |  8 ++------
 .../inbox/PreChatForm/PreChatFields.vue         |  3 +--
 .../widget/components/PreChat/Form.vue          | 17 ++++++-----------
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/app/javascript/dashboard/helper/preChat.js b/app/javascript/dashboard/helper/preChat.js
index bc5502e5b..14d062707 100644
--- a/app/javascript/dashboard/helper/preChat.js
+++ b/app/javascript/dashboard/helper/preChat.js
@@ -60,15 +60,11 @@ export const getFormattedPreChatFields = ({ preChatFields }) => {
     return {
       ...item,
       label: getLabel({
-        key: standardFieldKeys[item.name]
-          ? standardFieldKeys[item.name].key
-          : item.name,
+        key: item.name,
         label: item.label ? item.label : item.name,
       }),
       placeholder: getPlaceHolder({
-        key: standardFieldKeys[item.name]
-          ? standardFieldKeys[item.name].key
-          : item.name,
+        key: item.name,
         placeholder: item.placeholder ? item.placeholder : item.name,
       }),
     };
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/PreChatFields.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/PreChatFields.vue
index b1df3902a..dc12be429 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/PreChatFields.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/PreChatFields.vue
@@ -43,7 +43,6 @@
 
 <script>
 import draggable from 'vuedraggable';
-import { standardFieldKeys } from 'dashboard/helper/preChat';
 export default {
   components: { draggable },
   props: {
@@ -64,7 +63,7 @@ export default {
   },
   methods: {
     isFieldEditable(item) {
-      return !!standardFieldKeys[item.name] || !item.enabled;
+      return !item.enabled;
     },
     handlePreChatFieldOptions(event, type, item) {
       this.$emit('update', event, type, item);
diff --git a/app/javascript/widget/components/PreChat/Form.vue b/app/javascript/widget/components/PreChat/Form.vue
index 3da347966..1d9eb6dd0 100644
--- a/app/javascript/widget/components/PreChat/Form.vue
+++ b/app/javascript/widget/components/PreChat/Form.vue
@@ -37,6 +37,9 @@
       :label="$t('PRE_CHAT_FORM.FIELDS.MESSAGE.LABEL')"
       :placeholder="$t('PRE_CHAT_FORM.FIELDS.MESSAGE.PLACEHOLDER')"
       validation="required"
+      :validation-messages="{
+        required: $t('PRE_CHAT_FORM.FIELDS.MESSAGE.ERROR'),
+      }"
     />
 
     <custom-button
@@ -208,14 +211,10 @@ export default {
     isContactFieldRequired(field) {
       return this.preChatFields.find(option => option.name === field).required;
     },
-    getLabel({ name, label }) {
-      if (this.labels[name])
-        return this.$t(`PRE_CHAT_FORM.FIELDS.${this.labels[name]}.LABEL`);
+    getLabel({ label }) {
       return label;
     },
-    getPlaceHolder({ name, placeholder }) {
-      if (this.labels[name])
-        return this.$t(`PRE_CHAT_FORM.FIELDS.${this.labels[name]}.PLACEHOLDER`);
+    getPlaceHolder({ placeholder }) {
       return placeholder;
     },
     getValue({ name, type }) {
@@ -226,11 +225,7 @@ export default {
       return this.formValues[name] || null;
     },
 
-    getRequiredErrorMessage({ name, label }) {
-      if (this.labels[name])
-        return this.$t(
-          `PRE_CHAT_FORM.FIELDS.${this.labels[name]}.REQUIRED_ERROR`
-        );
+    getRequiredErrorMessage({ label }) {
       return `${label} ${this.$t('PRE_CHAT_FORM.IS_REQUIRED')}`;
     },
     getValidation({ type, name }) {