From 239b1e2bf1335c3c250c7dfc8635c01e9ba67fa6 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Tue, 27 Jun 2023 21:05:36 +0530
Subject: [PATCH] feat: Include email in the searched result (#7397)

---
 .../dashboard/i18n/locale/en/search.json      |  4 ++-
 .../SearchResultConversationItem.vue          | 30 +++++++++++++++----
 .../SearchResultConversationsList.vue         |  1 +
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/search.json b/app/javascript/dashboard/i18n/locale/en/search.json
index 9044bf5f9..107e64fd8 100644
--- a/app/javascript/dashboard/i18n/locale/en/search.json
+++ b/app/javascript/dashboard/i18n/locale/en/search.json
@@ -18,6 +18,8 @@
     "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
     "BOT_LABEL": "Bot",
     "READ_MORE": "Read more",
-    "WROTE": "wrote:"
+    "WROTE": "wrote:",
+    "FROM": "from",
+    "EMAIL": "email"
   }
 }
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue b/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
index 2e176f76e..0ca574af2 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultConversationItem.vue
@@ -20,10 +20,16 @@
           <span class="created-at">{{ createdAtTime }}</span>
         </div>
       </div>
-      <h5 v-if="name" class="text-block-title name">
-        <span class="pre-text">from:</span>
-        {{ name }}
-      </h5>
+      <div class="user-details">
+        <h5 v-if="name" class="text-block-title name">
+          <span class="pre-text"> {{ $t('SEARCH.FROM') }}: </span>
+          {{ name }}
+        </h5>
+        <h5 v-if="email" class="text-block-title email text-truncate">
+          <span class="pre-text">{{ $t('SEARCH.EMAIL') }}:</span>
+          {{ email }}
+        </h5>
+      </div>
       <slot />
     </div>
   </router-link>
@@ -52,6 +58,10 @@ export default {
       type: String,
       default: '',
     },
+    email: {
+      type: String,
+      default: '',
+    },
     accountId: {
       type: [String, Number],
       default: '',
@@ -128,8 +138,13 @@ export default {
   flex-grow: 1;
   min-width: 0;
 }
-.conversation-id,
+
 .name {
+  flex-shrink: 0;
+}
+.conversation-id,
+.name,
+.email {
   margin: 0;
 }
 .created-at,
@@ -138,4 +153,9 @@ export default {
   font-size: var(--font-size-mini);
   font-weight: var(--font-weight-normal);
 }
+
+.user-details {
+  display: flex;
+  gap: var(--space-small);
+}
 </style>
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultConversationsList.vue b/app/javascript/dashboard/modules/search/components/SearchResultConversationsList.vue
index 6c8241e30..a598d92d3 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultConversationsList.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultConversationsList.vue
@@ -11,6 +11,7 @@
         <search-result-conversation-item
           :id="conversation.id"
           :name="conversation.contact.name"
+          :email="conversation.contact.email"
           :account-id="accountId"
           :inbox="conversation.inbox"
           :created-at="conversation.created_at"