From 4a2a309d187112d4a5ad5c111baf944af5ba022d Mon Sep 17 00:00:00 2001
From: Pranav Raj Sreepuram <pranavrajs@gmail.com>
Date: Tue, 13 Oct 2020 13:03:55 +0530
Subject: [PATCH] Use name instead of display_name in the dashboard

---
 app/javascript/dashboard/components/layout/Sidebar.vue        | 3 +--
 .../components/widgets/conversation/ConversationHeader.vue    | 4 ++--
 .../dashboard/routes/dashboard/settings/inbox/AddAgents.vue   | 2 +-
 .../dashboard/routes/dashboard/settings/inbox/Settings.vue    | 2 +-
 app/models/conversation.rb                                    | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index fddfaab6e..43f4640e0 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -208,8 +208,7 @@ export default {
       accountLabels: 'labels/getLabelsOnSidebar',
     }),
     currentUserAvailableName() {
-      const { available_name: availableName } = this.currentUser;
-      return availableName;
+      return this.currentUser.name;
     },
     showChangeAccountOption() {
       if (this.globalConfig.createNewAccountFromDashboard) {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
index 10860a2bd..29bbc77bc 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
@@ -32,7 +32,7 @@
         <multiselect
           v-model="currentChat.meta.assignee"
           :options="agentList"
-          label="available_name"
+          label="name"
           :allow-empty="true"
           deselect-label="Remove"
           placeholder="Select Agent"
@@ -97,7 +97,7 @@ export default {
       return [
         {
           confirmed: true,
-          available_name: 'None',
+          name: 'None',
           id: 0,
           role: 'agent',
           account_id: 0,
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue
index d12f08598..1d0395bef 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue
@@ -15,7 +15,7 @@
               v-model="selectedAgents"
               :options="agentList"
               track-by="id"
-              label="available_name"
+              label="name"
               :multiple="true"
               :close-on-select="false"
               :clear-on-select="false"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index d52182eb5..458a1df29 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -180,7 +180,7 @@
           v-model="selectedAgents"
           :options="agentList"
           track-by="id"
-          label="available_name"
+          label="name"
           :multiple="true"
           :close-on-select="false"
           :clear-on-select="false"
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index eda0ddaa3..0105088aa 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -157,7 +157,7 @@ class Conversation < ApplicationRecord
   def create_activity
     return unless Current.user
 
-    user_name = Current.user&.available_name
+    user_name = Current.user.name
 
     create_status_change_message(user_name) if saved_change_to_status?
     create_assignee_change(user_name) if saved_change_to_assignee_id?