From 40481f64623df2dfd5da8c5db144725d5a77d4ab Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Tue, 9 Jun 2020 16:26:33 +0530
Subject: [PATCH] Bugfix: Update conversation counters in realtime (#944)

* Bug: Update conversation counters in realtime
---
 .../dashboard/api/inbox/conversation.js       | 10 +++++++
 .../api/specs/inbox/conversation.spec.js      | 19 ++++++++++++
 .../dashboard/api/specs/inboxes.spec.js       |  2 +-
 .../assets/scss/widgets/_conv-header.scss     |  2 ++
 .../scss/widgets/_conversation-view.scss      |  1 +
 .../dashboard/components/ChatList.vue         | 20 +++++++++----
 .../dashboard/helper/actionCable.js           |  8 +++++
 .../store/modules/conversations/actions.js    |  9 ++++++
 .../conversations/specs/actions.spec.js       | 30 +++++++++++++++++++
 .../accounts/conversations/meta.json.jbuilder | 10 +++----
 .../accounts/conversations_controller_spec.rb |  2 +-
 11 files changed, 99 insertions(+), 14 deletions(-)
 create mode 100644 app/javascript/dashboard/api/specs/inbox/conversation.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/conversations/specs/actions.spec.js

diff --git a/app/javascript/dashboard/api/inbox/conversation.js b/app/javascript/dashboard/api/inbox/conversation.js
index 9a50ef1c8..d3942efea 100644
--- a/app/javascript/dashboard/api/inbox/conversation.js
+++ b/app/javascript/dashboard/api/inbox/conversation.js
@@ -43,6 +43,16 @@ class ConversationApi extends ApiClient {
   mute(conversationId) {
     return axios.post(`${this.url}/${conversationId}/mute`);
   }
+
+  meta({ inboxId, status, assigneeType }) {
+    return axios.get(`${this.url}/meta`, {
+      params: {
+        inbox_id: inboxId,
+        status,
+        assignee_type: assigneeType,
+      },
+    });
+  }
 }
 
 export default new ConversationApi();
diff --git a/app/javascript/dashboard/api/specs/inbox/conversation.spec.js b/app/javascript/dashboard/api/specs/inbox/conversation.spec.js
new file mode 100644
index 000000000..4eceba728
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/inbox/conversation.spec.js
@@ -0,0 +1,19 @@
+import conversationAPI from '../../inbox/conversation';
+import ApiClient from '../../ApiClient';
+
+describe('#ConversationAPI', () => {
+  it('creates correct instance', () => {
+    expect(conversationAPI).toBeInstanceOf(ApiClient);
+    expect(conversationAPI).toHaveProperty('get');
+    expect(conversationAPI).toHaveProperty('show');
+    expect(conversationAPI).toHaveProperty('create');
+    expect(conversationAPI).toHaveProperty('update');
+    expect(conversationAPI).toHaveProperty('delete');
+    expect(conversationAPI).toHaveProperty('toggleStatus');
+    expect(conversationAPI).toHaveProperty('assignAgent');
+    expect(conversationAPI).toHaveProperty('markMessageRead');
+    expect(conversationAPI).toHaveProperty('toggleTyping');
+    expect(conversationAPI).toHaveProperty('mute');
+    expect(conversationAPI).toHaveProperty('meta');
+  });
+});
diff --git a/app/javascript/dashboard/api/specs/inboxes.spec.js b/app/javascript/dashboard/api/specs/inboxes.spec.js
index d1a1d2683..c4927e2bb 100644
--- a/app/javascript/dashboard/api/specs/inboxes.spec.js
+++ b/app/javascript/dashboard/api/specs/inboxes.spec.js
@@ -1,7 +1,7 @@
 import inboxes from '../inboxes';
 import ApiClient from '../ApiClient';
 
-describe('#AgentAPI', () => {
+describe('#InboxesAPI', () => {
   it('creates correct instance', () => {
     expect(inboxes).toBeInstanceOf(ApiClient);
     expect(inboxes).toHaveProperty('get');
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss b/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
index 6de396353..e1aef9307 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
@@ -66,6 +66,8 @@
 }
 
 .button.resolve--button {
+  @include flex-align($x: center, $y: middle);
+
   width: 13.2rem;
 
   >.icon {
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index 6aef3e3f9..12d0f21a9 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -26,6 +26,7 @@
 
     .link {
       color: $color-white;
+      text-decoration: underline;
     }
   }
 
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 59012d516..a4cec45e3 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -55,6 +55,7 @@
 <script>
 /* eslint-env browser */
 /* eslint no-console: 0 */
+/* global bus */
 import { mapGetters } from 'vuex';
 
 import ChatFilter from './widgets/conversation/ChatFilter';
@@ -109,6 +110,14 @@ export default {
         this.activeAssigneeTab
       );
     },
+    conversationFilters() {
+      return {
+        inboxId: this.conversationInbox ? this.conversationInbox : undefined,
+        assigneeType: this.activeAssigneeTab,
+        status: this.activeStatus,
+        page: this.currentPage + 1,
+      };
+    },
   },
   watch: {
     conversationInbox() {
@@ -119,6 +128,10 @@ export default {
     this.$store.dispatch('setChatFilter', this.activeStatus);
     this.resetAndFetchData();
     this.$store.dispatch('agents/get');
+
+    bus.$on('fetch_conversation_stats', () => {
+      this.$store.dispatch('getConversationStats', this.conversationFilters);
+    });
   },
   methods: {
     resetAndFetchData() {
@@ -127,12 +140,7 @@ export default {
       this.fetchConversations();
     },
     fetchConversations() {
-      this.$store.dispatch('fetchAllConversations', {
-        inboxId: this.conversationInbox ? this.conversationInbox : undefined,
-        assigneeType: this.activeAssigneeTab,
-        status: this.activeStatus,
-        page: this.currentPage + 1,
-      });
+      this.$store.dispatch('fetchAllConversations', this.conversationFilters);
     },
     updateAssigneeTab(selectedTab) {
       if (this.activeAssigneeTab !== selectedTab) {
diff --git a/app/javascript/dashboard/helper/actionCable.js b/app/javascript/dashboard/helper/actionCable.js
index b4401750a..107f85637 100644
--- a/app/javascript/dashboard/helper/actionCable.js
+++ b/app/javascript/dashboard/helper/actionCable.js
@@ -1,5 +1,6 @@
 import AuthAPI from '../api/auth';
 import BaseActionCableConnector from '../../shared/helpers/BaseActionCableConnector';
+/* global bus */
 
 class ActionCableConnector extends BaseActionCableConnector {
   constructor(app, pubsubToken) {
@@ -45,10 +46,12 @@ class ActionCableConnector extends BaseActionCableConnector {
     if (id) {
       this.app.$store.dispatch('updateAssignee', { id, assignee });
     }
+    this.fetchConversationStats();
   };
 
   onConversationCreated = data => {
     this.app.$store.dispatch('addConversation', data);
+    this.fetchConversationStats();
   };
 
   onLogout = () => AuthAPI.logout();
@@ -61,6 +64,7 @@ class ActionCableConnector extends BaseActionCableConnector {
 
   onStatusChange = data => {
     this.app.$store.dispatch('updateConversation', data);
+    this.fetchConversationStats();
   };
 
   onTypingOn = ({ conversation, user }) => {
@@ -100,6 +104,10 @@ class ActionCableConnector extends BaseActionCableConnector {
       this.onTypingOff({ conversation, user });
     }, 30000);
   };
+
+  fetchConversationStats = () => {
+    bus.$emit('fetch_conversation_stats');
+  };
 }
 
 export default {
diff --git a/app/javascript/dashboard/store/modules/conversations/actions.js b/app/javascript/dashboard/store/modules/conversations/actions.js
index 826c92f35..d1e742728 100644
--- a/app/javascript/dashboard/store/modules/conversations/actions.js
+++ b/app/javascript/dashboard/store/modules/conversations/actions.js
@@ -236,6 +236,15 @@ const actions = {
       //
     }
   },
+
+  getConversationStats: async ({ commit }, params) => {
+    try {
+      const response = await ConversationApi.meta(params);
+      commit(types.default.SET_CONV_TAB_META, response.data.meta);
+    } catch (error) {
+      // Ignore error
+    }
+  },
 };
 
 export default actions;
diff --git a/app/javascript/dashboard/store/modules/conversations/specs/actions.spec.js b/app/javascript/dashboard/store/modules/conversations/specs/actions.spec.js
new file mode 100644
index 000000000..4693e0a62
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/conversations/specs/actions.spec.js
@@ -0,0 +1,30 @@
+import axios from 'axios';
+import actions from '../actions';
+import * as types from '../../../mutation-types';
+
+const commit = jest.fn();
+global.axios = axios;
+jest.mock('axios');
+
+describe('#actions', () => {
+  describe('#getConversationStats', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.get.mockResolvedValue({ data: { meta: { mine_count: 1 } } });
+      await actions.getConversationStats(
+        { commit },
+        { inboxId: 1, assigneeTpe: 'me', status: 'open' }
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CONV_TAB_META, { mine_count: 1 }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.get.mockRejectedValue({ message: 'Incorrect header' });
+      await actions.getConversationStats(
+        { commit },
+        { inboxId: 1, assigneeTpe: 'me', status: 'open' }
+      );
+      expect(commit.mock.calls).toEqual([]);
+    });
+  });
+});
diff --git a/app/views/api/v1/accounts/conversations/meta.json.jbuilder b/app/views/api/v1/accounts/conversations/meta.json.jbuilder
index 8895ad24d..24fbf10d5 100644
--- a/app/views/api/v1/accounts/conversations/meta.json.jbuilder
+++ b/app/views/api/v1/accounts/conversations/meta.json.jbuilder
@@ -1,7 +1,5 @@
-json.data do
-  json.meta do
-    json.mine_count @conversations_count[:mine_count]
-    json.unassigned_count @conversations_count[:unassigned_count]
-    json.all_count @conversations_count[:all_count]
-  end
+json.meta do
+  json.mine_count @conversations_count[:mine_count]
+  json.unassigned_count @conversations_count[:unassigned_count]
+  json.all_count @conversations_count[:all_count]
 end
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index 9ea04c78c..af9eeaa4f 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -54,7 +54,7 @@ RSpec.describe 'Conversations API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        expect(JSON.parse(response.body, symbolize_names: true)[:data][:meta][:all_count]).to eq(1)
+        expect(JSON.parse(response.body, symbolize_names: true)[:meta][:all_count]).to eq(1)
       end
     end
   end