From cfc56705fd0c2be2eb1f6366b1ffa60ee02ef4f8 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranavrajs@gmail.com>
Date: Sun, 15 Dec 2019 00:06:01 +0530
Subject: [PATCH] [Enhancement] Group widget messages by date (#363)

* [Enhancement] Group widget messages by date

* Update DateSeparator snapshot
---
 .../shared/components/DateSeparator.vue       | 48 +++++++++++++++++
 .../components/specs/DateSeparator.spec.js    | 14 +++++
 .../__snapshots__/DateSeparator.spec.js.snap  | 11 ++++
 app/javascript/shared/helpers/DateHelper.js   | 13 +++++
 .../shared/helpers/specs/DateHelper.sepc.js   | 13 +++++
 .../widget/components/ConversationWrap.vue    | 20 ++++---
 .../widget/store/modules/conversation.js      | 12 ++++-
 .../specs/conversation/getters.spec.js        | 53 +++++++++++++++++++
 app/javascript/widget/views/Home.vue          |  9 ++--
 package.json                                  |  8 ++-
 yarn.lock                                     |  5 ++
 11 files changed, 193 insertions(+), 13 deletions(-)
 create mode 100644 app/javascript/shared/components/DateSeparator.vue
 create mode 100644 app/javascript/shared/components/specs/DateSeparator.spec.js
 create mode 100644 app/javascript/shared/components/specs/__snapshots__/DateSeparator.spec.js.snap
 create mode 100644 app/javascript/shared/helpers/DateHelper.js
 create mode 100644 app/javascript/shared/helpers/specs/DateHelper.sepc.js

diff --git a/app/javascript/shared/components/DateSeparator.vue b/app/javascript/shared/components/DateSeparator.vue
new file mode 100644
index 000000000..6a4e9f6d4
--- /dev/null
+++ b/app/javascript/shared/components/DateSeparator.vue
@@ -0,0 +1,48 @@
+<template>
+  <div class="date--separator">
+    {{ date }}
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    date: {
+      type: String,
+      required: true,
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import '~widget/assets/scss/variables';
+
+.date--separator {
+  font-size: $font-size-default;
+  color: $color-body;
+  height: 50px;
+  line-height: 50px;
+  position: relative;
+  text-align: center;
+  width: 100%;
+}
+
+.date--separator::before,
+.date--separator::after {
+  background-color: $color-border;
+  content: '';
+  height: 1px;
+  position: absolute;
+  top: 24px;
+  width: calc((100% - 120px) / 2);
+}
+
+.date--separator::before {
+  left: 0;
+}
+
+.date--separator::after {
+  right: 0;
+}
+</style>
diff --git a/app/javascript/shared/components/specs/DateSeparator.spec.js b/app/javascript/shared/components/specs/DateSeparator.spec.js
new file mode 100644
index 000000000..92f54c360
--- /dev/null
+++ b/app/javascript/shared/components/specs/DateSeparator.spec.js
@@ -0,0 +1,14 @@
+import { mount } from '@vue/test-utils';
+import DateSeparator from '../DateSeparator';
+
+describe('Spinner', () => {
+  test('matches snapshot', () => {
+    const wrapper = mount(DateSeparator, {
+      propsData: {
+        date: 'Nov 18, 2019',
+      },
+    });
+    expect(wrapper.isVueInstance()).toBeTruthy();
+    expect(wrapper.element).toMatchSnapshot();
+  });
+});
diff --git a/app/javascript/shared/components/specs/__snapshots__/DateSeparator.spec.js.snap b/app/javascript/shared/components/specs/__snapshots__/DateSeparator.spec.js.snap
new file mode 100644
index 000000000..ebed84bcf
--- /dev/null
+++ b/app/javascript/shared/components/specs/__snapshots__/DateSeparator.spec.js.snap
@@ -0,0 +1,11 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Spinner matches snapshot 1`] = `
+<div
+  class="date--separator"
+>
+  
+  Nov 18, 2019
+
+</div>
+`;
diff --git a/app/javascript/shared/helpers/DateHelper.js b/app/javascript/shared/helpers/DateHelper.js
new file mode 100644
index 000000000..961ca5b61
--- /dev/null
+++ b/app/javascript/shared/helpers/DateHelper.js
@@ -0,0 +1,13 @@
+import moment from 'moment';
+
+class DateHelper {
+  constructor(date) {
+    this.date = moment(date * 1000);
+  }
+
+  format(dateFormat = 'MMM DD, YYYY') {
+    return this.date.format(dateFormat);
+  }
+}
+
+export default DateHelper;
diff --git a/app/javascript/shared/helpers/specs/DateHelper.sepc.js b/app/javascript/shared/helpers/specs/DateHelper.sepc.js
new file mode 100644
index 000000000..3641bc369
--- /dev/null
+++ b/app/javascript/shared/helpers/specs/DateHelper.sepc.js
@@ -0,0 +1,13 @@
+import DateSeparator from '../DateSeparator';
+
+describe('#DateSeparator', () => {
+  it('should format correctly without dateFormat', () => {
+    expect(new DateSeparator(1576340626).format()).toEqual('Dec 14, 2019');
+  });
+
+  it('should format correctly without dateFormat', () => {
+    expect(new DateSeparator(1576340626).format('DD-MM-YYYY')).toEqual(
+      '14-12-2019'
+    );
+  });
+});
diff --git a/app/javascript/widget/components/ConversationWrap.vue b/app/javascript/widget/components/ConversationWrap.vue
index 262779f53..51c978471 100755
--- a/app/javascript/widget/components/ConversationWrap.vue
+++ b/app/javascript/widget/components/ConversationWrap.vue
@@ -4,11 +4,14 @@
       <div v-if="isFetchingList" class="message--loader">
         <spinner></spinner>
       </div>
-      <ChatMessage
-        v-for="message in messages"
-        :key="message.id"
-        :message="message"
-      />
+      <div v-for="date in conversationDates" :key="date">
+        <date-separator :date="date"></date-separator>
+        <ChatMessage
+          v-for="message in groupedMessages[date]"
+          :key="message.id"
+          :message="message"
+        />
+      </div>
     </div>
     <branding></branding>
   </div>
@@ -17,6 +20,7 @@
 <script>
 import Branding from 'widget/components/Branding.vue';
 import ChatMessage from 'widget/components/ChatMessage.vue';
+import DateSeparator from 'shared/components/DateSeparator.vue';
 import Spinner from 'shared/components/Spinner.vue';
 import { mapActions, mapGetters } from 'vuex';
 
@@ -25,10 +29,11 @@ export default {
   components: {
     Branding,
     ChatMessage,
+    DateSeparator,
     Spinner,
   },
   props: {
-    messages: Object,
+    groupedMessages: Object,
   },
   data() {
     return {
@@ -43,6 +48,9 @@ export default {
       isFetchingList: 'conversation/getIsFetchingList',
       conversationSize: 'conversation/getConversationSize',
     }),
+    conversationDates() {
+      return Object.keys(this.groupedMessages);
+    },
   },
   watch: {
     allMessagesLoaded() {
diff --git a/app/javascript/widget/store/modules/conversation.js b/app/javascript/widget/store/modules/conversation.js
index d00d9a820..8a334e4a4 100755
--- a/app/javascript/widget/store/modules/conversation.js
+++ b/app/javascript/widget/store/modules/conversation.js
@@ -3,6 +3,9 @@ import Vue from 'vue';
 import { sendMessageAPI, getConversationAPI } from 'widget/api/conversation';
 import { MESSAGE_TYPE } from 'widget/helpers/constants';
 import getUuid from '../../helpers/uuid';
+import DateHelper from '../../../shared/helpers/DateHelper';
+
+const groupBy = require('lodash.groupby');
 
 export const createTemporaryMessage = content => {
   const timestamp = new Date().getTime();
@@ -31,10 +34,9 @@ const state = {
 };
 
 export const getters = {
+  getAllMessagesLoaded: _state => _state.uiFlags.allMessagesLoaded,
   getConversation: _state => _state.conversations,
   getConversationSize: _state => Object.keys(_state.conversations).length,
-  getAllMessagesLoaded: _state => _state.uiFlags.allMessagesLoaded,
-  getIsFetchingList: _state => _state.uiFlags.isFetchingList,
   getEarliestMessage: _state => {
     const conversation = Object.values(_state.conversations);
     if (conversation.length) {
@@ -42,6 +44,12 @@ export const getters = {
     }
     return {};
   },
+  getGroupedConversation: _state => {
+    return groupBy(Object.values(_state.conversations), message =>
+      new DateHelper(message.created_at).format()
+    );
+  },
+  getIsFetchingList: _state => _state.uiFlags.isFetchingList,
 };
 
 export const actions = {
diff --git a/app/javascript/widget/store/modules/specs/conversation/getters.spec.js b/app/javascript/widget/store/modules/specs/conversation/getters.spec.js
index 93d0729a4..2efd3b185 100644
--- a/app/javascript/widget/store/modules/specs/conversation/getters.spec.js
+++ b/app/javascript/widget/store/modules/specs/conversation/getters.spec.js
@@ -53,4 +53,57 @@ describe('#getters', () => {
     expect(getters.getAllMessagesLoaded(state)).toEqual(false);
     expect(getters.getIsFetchingList(state)).toEqual(false);
   });
+
+  it('uiFlags', () => {
+    const state = {
+      conversations: {
+        1: {
+          id: 1,
+          content: 'Thanks for the help',
+          created_at: 1574075964,
+        },
+        2: {
+          id: 2,
+          content: 'Yes, It makes sense',
+          created_at: 1574092218,
+        },
+        3: {
+          id: 3,
+          content: 'Hey',
+          created_at: 1576340623,
+        },
+        4: {
+          id: 4,
+          content: 'How may I help you',
+          created_at: 1576340626,
+        },
+      },
+    };
+    expect(getters.getGroupedConversation(state)).toEqual({
+      'Nov 18, 2019': [
+        {
+          id: 1,
+          content: 'Thanks for the help',
+          created_at: 1574075964,
+        },
+        {
+          id: 2,
+          content: 'Yes, It makes sense',
+          created_at: 1574092218,
+        },
+      ],
+      'Dec 14, 2019': [
+        {
+          id: 3,
+          content: 'Hey',
+          created_at: 1576340623,
+        },
+        {
+          id: 4,
+          content: 'How may I help you',
+          created_at: 1576340626,
+        },
+      ],
+    });
+  });
 });
diff --git a/app/javascript/widget/views/Home.vue b/app/javascript/widget/views/Home.vue
index 184c23959..f346b782c 100755
--- a/app/javascript/widget/views/Home.vue
+++ b/app/javascript/widget/views/Home.vue
@@ -4,7 +4,7 @@
       <ChatHeaderExpanded v-if="isHeaderExpanded" />
       <ChatHeader v-else :title="getHeaderName" />
     </div>
-    <ConversationWrap :messages="getConversation" />
+    <ConversationWrap :grouped-messages="groupedMessages" />
     <div class="footer-wrap">
       <ChatFooter :on-send-message="handleSendMessage" />
     </div>
@@ -36,9 +36,12 @@ export default {
     },
   },
   computed: {
-    ...mapGetters('conversation', ['getConversation', 'getConversationSize']),
+    ...mapGetters({
+      groupedMessages: 'conversation/getGroupedConversation',
+      conversationSize: 'conversation/getConversationSize',
+    }),
     isHeaderExpanded() {
-      return this.getConversationSize === 0;
+      return this.conversationSize === 0;
     },
     getHeaderName() {
       return window.chatwootWebChannel.website_name;
diff --git a/package.json b/package.json
index b12384879..28b062e7e 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "highlight.js": "^9.15.10",
     "ionicons": "~2.0.1",
     "js-cookie": "^2.2.1",
+    "lodash.groupby": "^4.6.0",
     "md5": "~2.2.1",
     "moment": "~2.19.3",
     "query-string": "5",
@@ -90,8 +91,11 @@
     }
   },
   "jest": {
-     "collectCoverage": true,
-     "coverageReporters": ["lcov", "text"]
+    "collectCoverage": true,
+    "coverageReporters": [
+      "lcov",
+      "text"
+    ]
   },
   "lint-staged": {
     "*.{js,vue}": [
diff --git a/yarn.lock b/yarn.lock
index 53c1b6a76..4aa7494d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6220,6 +6220,11 @@ lodash.get@^4.0:
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
+lodash.groupby@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.groupby/-/lodash.groupby-4.6.0.tgz#0b08a1dcf68397c397855c3239783832df7403d1"
+  integrity sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E=
+
 lodash.has@^4.0:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"