From 9782f71bdf0228a44cdeae0e2ade1ad623e1037e Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 23 Jan 2023 21:50:16 +0530
Subject: [PATCH] feat: Shows the last activity, created at timestamp in the
 same row (#6267)

---
 .../assets/scss/_foundation-custom.scss       |  3 +-
 .../dashboard/components/ui/TimeAgo.vue       | 67 ++++++++++++++++---
 .../widgets/conversation/ConversationCard.vue |  5 +-
 .../dashboard/mixins/specs/time.spec.js       | 35 ++++++++++
 app/javascript/dashboard/mixins/time.js       | 25 +++++++
 .../shared/assets/stylesheets/colors.scss     |  1 +
 .../partials/_conversation.json.jbuilder      |  1 +
 7 files changed, 126 insertions(+), 11 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_foundation-custom.scss b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
index 650fa884d..2f817b125 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-custom.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
@@ -17,9 +17,10 @@
 }
 
 .tooltip {
+  background-color: var(--black-transparent);
   border-radius: $space-smaller;
   font-size: $font-size-mini;
-  max-width: 15rem;
+  max-width: var(--space-giga);
   padding: $space-smaller $space-small;
   z-index: 999;
 }
diff --git a/app/javascript/dashboard/components/ui/TimeAgo.vue b/app/javascript/dashboard/components/ui/TimeAgo.vue
index c796ed0f6..224856253 100644
--- a/app/javascript/dashboard/components/ui/TimeAgo.vue
+++ b/app/javascript/dashboard/components/ui/TimeAgo.vue
@@ -1,7 +1,14 @@
 <template>
-  <span class="time-ago">
-    <span>{{ timeAgo }}</span>
-  </span>
+  <div
+    v-tooltip.top="{
+      content: tooltipText,
+      delay: { show: 1500, hide: 0 },
+      hideOnClick: true,
+    }"
+    class="time-ago"
+  >
+    <span>{{ `${createdAtTime} • ${lastActivityTime}` }}</span>
+  </div>
 </template>
 
 <script>
@@ -19,20 +26,55 @@ export default {
       type: Boolean,
       default: true,
     },
-    timestamp: {
+    lastActivityTimestamp: {
+      type: [String, Date, Number],
+      default: '',
+    },
+    createdAtTimestamp: {
       type: [String, Date, Number],
       default: '',
     },
   },
   data() {
     return {
-      timeAgo: this.dynamicTime(this.timestamp),
+      lastActivityAtTimeAgo: this.dynamicTime(this.lastActivityTimestamp),
+      createdAtTimeAgo: this.dynamicTime(this.createdAtTimestamp),
       timer: null,
     };
   },
+  computed: {
+    lastActivityTime() {
+      return this.shortTimestamp(this.lastActivityAtTimeAgo);
+    },
+    createdAtTime() {
+      return this.shortTimestamp(this.createdAtTimeAgo);
+    },
+    createdAt() {
+      const createdTimeDiff = Date.now() - this.createdAtTimestamp * 1000;
+      const isBeforeAMonth = createdTimeDiff > DAY_IN_MILLI_SECONDS * 30;
+      return !isBeforeAMonth
+        ? `Created ${this.createdAtTimeAgo}`
+        : `Created at: ${this.dateFormat(this.createdAtTimestamp)}`;
+    },
+    lastActivity() {
+      const lastActivityTimeDiff =
+        Date.now() - this.lastActivityTimestamp * 1000;
+      const isNotActive = lastActivityTimeDiff > DAY_IN_MILLI_SECONDS * 30;
+      return !isNotActive
+        ? `Last activity ${this.lastActivityAtTimeAgo}`
+        : `Last activity: ${this.dateFormat(this.lastActivityTimestamp)}`;
+    },
+    tooltipText() {
+      return `${this.createdAt}
+              ${this.lastActivity}`;
+    },
+  },
   watch: {
-    timestamp() {
-      this.timeAgo = this.dynamicTime(this.timestamp);
+    lastActivityTimestamp() {
+      this.lastActivityAtTimeAgo = this.dynamicTime(this.lastActivityTimestamp);
+    },
+    createdAtTimestamp() {
+      this.createdAtTimeAgo = this.dynamicTime(this.createdAtTimestamp);
     },
   },
   mounted() {
@@ -46,12 +88,15 @@ export default {
   methods: {
     createTimer() {
       this.timer = setTimeout(() => {
-        this.timeAgo = this.dynamicTime(this.timestamp);
+        this.lastActivityAtTimeAgo = this.dynamicTime(
+          this.lastActivityTimestamp
+        );
+        this.createdAtTimeAgo = this.dynamicTime(this.createdAtTimestamp);
         this.createTimer();
       }, this.refreshTime());
     },
     refreshTime() {
-      const timeDiff = Date.now() - this.timestamp * 1000;
+      const timeDiff = Date.now() - this.lastActivityTimestamp * 1000;
       if (timeDiff > DAY_IN_MILLI_SECONDS) {
         return DAY_IN_MILLI_SECONDS;
       }
@@ -71,5 +116,9 @@ export default {
   font-weight: var(--font-weight-normal);
   line-height: var(--space-normal);
   margin-left: auto;
+
+  &:hover {
+    color: var(--b-900);
+  }
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 31f820ec0..24227aeac 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -87,7 +87,10 @@
       </p>
       <div class="conversation--meta">
         <span class="timestamp">
-          <time-ago :timestamp="chat.timestamp" />
+          <time-ago
+            :last-activity-timestamp="chat.timestamp"
+            :created-at-timestamp="chat.created_at"
+          />
         </span>
         <span class="unread">{{ unreadCount > 9 ? '9+' : unreadCount }}</span>
       </div>
diff --git a/app/javascript/dashboard/mixins/specs/time.spec.js b/app/javascript/dashboard/mixins/specs/time.spec.js
index c470dfe27..e062ca92b 100644
--- a/app/javascript/dashboard/mixins/specs/time.spec.js
+++ b/app/javascript/dashboard/mixins/specs/time.spec.js
@@ -8,3 +8,38 @@ describe('#messageStamp', () => {
     );
   });
 });
+
+describe('#dynamicTime', () => {
+  it('returns correct value', () => {
+    expect(TimeMixin.methods.dynamicTime(1612971343)).toEqual(
+      'almost 2 years ago'
+    );
+  });
+});
+
+describe('#dateFormat', () => {
+  it('returns correct value', () => {
+    expect(TimeMixin.methods.dateFormat(1612971343)).toEqual('Feb 10, 2021');
+    expect(TimeMixin.methods.dateFormat(1612971343, 'LLL d, yyyy')).toEqual(
+      'Feb 10, 2021'
+    );
+  });
+});
+
+describe('#shortTimestamp', () => {
+  it('returns correct value', () => {
+    expect(TimeMixin.methods.shortTimestamp('less than a minute ago')).toEqual(
+      'now'
+    );
+    expect(TimeMixin.methods.shortTimestamp(' minute ago')).toEqual('m');
+    expect(TimeMixin.methods.shortTimestamp(' minutes ago')).toEqual('m');
+    expect(TimeMixin.methods.shortTimestamp(' hour ago')).toEqual('h');
+    expect(TimeMixin.methods.shortTimestamp(' hours ago')).toEqual('h');
+    expect(TimeMixin.methods.shortTimestamp(' day ago')).toEqual('d');
+    expect(TimeMixin.methods.shortTimestamp(' days ago')).toEqual('d');
+    expect(TimeMixin.methods.shortTimestamp(' month ago')).toEqual('mo');
+    expect(TimeMixin.methods.shortTimestamp(' months ago')).toEqual('mo');
+    expect(TimeMixin.methods.shortTimestamp(' year ago')).toEqual('y');
+    expect(TimeMixin.methods.shortTimestamp(' years ago')).toEqual('y');
+  });
+});
diff --git a/app/javascript/dashboard/mixins/time.js b/app/javascript/dashboard/mixins/time.js
index 0048d5764..eec357b88 100644
--- a/app/javascript/dashboard/mixins/time.js
+++ b/app/javascript/dashboard/mixins/time.js
@@ -12,5 +12,30 @@ export default {
       const unixTime = fromUnixTime(time);
       return formatDistanceToNow(unixTime, { addSuffix: true });
     },
+    dateFormat(time, dateFormat = 'MMM d, yyyy') {
+      const unixTime = fromUnixTime(time);
+      return format(unixTime, dateFormat);
+    },
+    shortTimestamp(time) {
+      const convertToShortTime = time
+        .replace(/about|over|almost|/g, '')
+        .replace('less than a minute ago', 'now')
+        .replace(' minute ago', 'm')
+        .replace(' minutes ago', 'm')
+        .replace('a minute ago', 'm')
+        .replace('an hour ago', 'h')
+        .replace(' hour ago', 'h')
+        .replace(' hours ago', 'h')
+        .replace(' day ago', 'd')
+        .replace('a day ago', 'd')
+        .replace(' days ago', 'd')
+        .replace('a month ago', 'mo')
+        .replace(' months ago', 'mo')
+        .replace(' month ago', 'mo')
+        .replace('a year ago', 'y')
+        .replace(' year ago', 'y')
+        .replace(' years ago', 'y');
+      return convertToShortTime;
+    },
   },
 };
diff --git a/app/javascript/shared/assets/stylesheets/colors.scss b/app/javascript/shared/assets/stylesheets/colors.scss
index 64b7f3f94..5e45d264f 100644
--- a/app/javascript/shared/assets/stylesheets/colors.scss
+++ b/app/javascript/shared/assets/stylesheets/colors.scss
@@ -1,6 +1,7 @@
 :root {
   --white: #fff;
   --white-transparent: rgba(255, 255, 255, 0.9);
+  --black-transparent: rgba(0, 0, 0, 0.9);
 
   --w-25: #F5FAFF;
   --w-50: #EBF5FF;
diff --git a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
index 5cce41f9b..1f3bca044 100644
--- a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
+++ b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
@@ -37,6 +37,7 @@ json.labels conversation.label_list
 json.muted conversation.muted?
 json.snoozed_until conversation.snoozed_until
 json.status conversation.status
+json.created_at conversation.created_at.to_i
 json.timestamp conversation.last_activity_at.to_i
 json.first_reply_created_at conversation.first_reply_created_at.to_i
 json.unread_count conversation.unread_incoming_messages.count