From 33b73451b7c11c17acaf65b53584bec99be0176f Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Sat, 13 Mar 2021 14:06:25 +0530
Subject: [PATCH] Fix: Update offline message in widget by availability 
 (#1879)

Feat: Display out of office message based on business hours

Co-authored-by: Pranav Raj Sreepuram <pranavrajs@gmail.com>
---
 app/javascript/shared/helpers/DateHelper.js   | 14 ++--
 .../widget/components/ChatHeader.vue          | 22 ++++-
 .../widget/components/TeamAvailability.vue    | 83 +++++--------------
 app/javascript/widget/mixins/availability.js  | 62 ++++++++++++++
 app/javascript/widget/mixins/configMixin.js   | 18 ----
 5 files changed, 110 insertions(+), 89 deletions(-)
 create mode 100644 app/javascript/widget/mixins/availability.js

diff --git a/app/javascript/shared/helpers/DateHelper.js b/app/javascript/shared/helpers/DateHelper.js
index 2cd178896..6adc36951 100644
--- a/app/javascript/shared/helpers/DateHelper.js
+++ b/app/javascript/shared/helpers/DateHelper.js
@@ -16,12 +16,14 @@ export const formatDate = ({ date, todayText, yesterdayText }) => {
   return date;
 };
 
-export const buildDateFromTime = (hr, min, utcOffset, date = new Date()) => {
-  const today = format(date, 'yyyy-MM-dd');
-  const timeString = `${today}T${hr}:${min}:00${utcOffset}`;
-  return parseISO(timeString);
-};
-
 export const formatDigitToString = val => {
   return val > 9 ? `${val}` : `0${val}`;
 };
+
+export const buildDateFromTime = (hr, min, utcOffset, date = new Date()) => {
+  const today = format(date, 'yyyy-MM-dd');
+  const hour = formatDigitToString(hr);
+  const minute = formatDigitToString(min);
+  const timeString = `${today}T${hour}:${minute}:00${utcOffset}`;
+  return parseISO(timeString);
+};
diff --git a/app/javascript/widget/components/ChatHeader.vue b/app/javascript/widget/components/ChatHeader.vue
index fa5890cdf..c075222d5 100644
--- a/app/javascript/widget/components/ChatHeader.vue
+++ b/app/javascript/widget/components/ChatHeader.vue
@@ -13,13 +13,13 @@
           <div
             :class="
               `status-view--badge rounded-full leading-4 ${
-                availableAgents.length ? 'bg-green-500' : 'hidden'
+                isOnline ? 'bg-green-500' : 'hidden'
               }`
             "
           />
         </div>
         <div class="text-xs mt-1 text-black-700">
-          {{ replyTimeStatus }}
+          {{ replyWaitMeessage }}
         </div>
       </div>
     </div>
@@ -30,14 +30,14 @@
 <script>
 import { mapGetters } from 'vuex';
 import HeaderActions from './HeaderActions';
-import configMixin from 'widget/mixins/configMixin';
+import availabilityMixin from 'widget/mixins/availability';
 
 export default {
   name: 'ChatHeader',
   components: {
     HeaderActions,
   },
-  mixins: [configMixin],
+  mixins: [availabilityMixin],
   props: {
     avatarUrl: {
       type: String,
@@ -60,6 +60,20 @@ export default {
     ...mapGetters({
       widgetColor: 'appConfig/getWidgetColor',
     }),
+    isOnline() {
+      const { workingHoursEnabled } = this.channelConfig;
+      const anyAgentOnline = this.availableAgents.length > 0;
+
+      if (workingHoursEnabled) {
+        return this.isInBetweenTheWorkingHours;
+      }
+      return anyAgentOnline;
+    },
+    replyWaitMeessage() {
+      return this.isOnline
+        ? this.replyTimeStatus
+        : this.$t('TEAM_AVAILABILITY.OFFLINE');
+    },
   },
 };
 </script>
diff --git a/app/javascript/widget/components/TeamAvailability.vue b/app/javascript/widget/components/TeamAvailability.vue
index 4484336cf..0460161c4 100644
--- a/app/javascript/widget/components/TeamAvailability.vue
+++ b/app/javascript/widget/components/TeamAvailability.vue
@@ -1,27 +1,19 @@
 <template>
   <div class="px-4">
-    <div
-      v-if="channelConfig.workingHoursEnabled"
-      class="flex items-center justify-between mb-4"
-    >
+    <div class="flex items-center justify-between mb-4">
       <div class="text-black-700">
         <div class="text-base leading-5 font-medium mb-1">
           {{
-            isInBetweenTheWorkingHours
+            isOnline
               ? $t('TEAM_AVAILABILITY.ONLINE')
               : $t('TEAM_AVAILABILITY.OFFLINE')
           }}
         </div>
         <div class="text-xs leading-4 mt-1">
-          {{
-            isInBetweenTheWorkingHours ? replyTimeStatus : outOfOfficeMessage
-          }}
+          {{ replyWaitMeessage }}
         </div>
       </div>
-      <available-agents
-        v-if="isInBetweenTheWorkingHours"
-        :agents="availableAgents"
-      />
+      <available-agents v-if="isOnline" :agents="availableAgents" />
     </div>
     <woot-button
       class="font-medium"
@@ -39,13 +31,9 @@
 import { mapGetters } from 'vuex';
 import AvailableAgents from 'widget/components/AvailableAgents.vue';
 import { getContrastingTextColor } from 'shared/helpers/ColorHelper';
-import {
-  buildDateFromTime,
-  formatDigitToString,
-} from 'shared/helpers/DateHelper';
 import WootButton from 'shared/components/Button';
 import configMixin from 'widget/mixins/configMixin';
-import compareAsc from 'date-fns/compareAsc';
+import availabilityMixin from 'widget/mixins/availability';
 
 export default {
   name: 'TeamAvailability',
@@ -53,7 +41,7 @@ export default {
     AvailableAgents,
     WootButton,
   },
-  mixins: [configMixin],
+  mixins: [configMixin, availabilityMixin],
   props: {
     availableAgents: {
       type: Array,
@@ -65,52 +53,25 @@ export default {
     textColor() {
       return getContrastingTextColor(this.widgetColor);
     },
-    isInBetweenTheWorkingHours() {
-      const {
-        closedAllDay,
-        openHour,
-        openMinute,
-        closeHour,
-        closeMinute,
-      } = this.currentDayAvailability;
+    isOnline() {
+      const { workingHoursEnabled } = this.channelConfig;
+      const anyAgentOnline = this.availableAgents.length > 0;
 
-      if (closedAllDay) {
-        return false;
+      if (workingHoursEnabled) {
+        return this.isInBetweenTheWorkingHours;
       }
-
-      const { utcOffset } = this.channelConfig;
-      const startTime = buildDateFromTime(
-        formatDigitToString(openHour),
-        formatDigitToString(openMinute),
-        utcOffset
-      );
-      const endTime = buildDateFromTime(
-        formatDigitToString(closeHour),
-        formatDigitToString(closeMinute),
-        utcOffset
-      );
-
-      if (
-        compareAsc(new Date(), startTime) === 1 &&
-        compareAsc(endTime, new Date()) === 1
-      ) {
-        return true;
-      }
-
-      return false;
+      return anyAgentOnline;
     },
-    currentDayAvailability() {
-      const dayOfTheWeek = new Date().getDay();
-      const [workingHourConfig = {}] = this.channelConfig.workingHours.filter(
-        workingHour => workingHour.day_of_week === dayOfTheWeek
-      );
-      return {
-        closedAllDay: workingHourConfig.closed_all_day,
-        openHour: workingHourConfig.open_hour,
-        openMinute: workingHourConfig.open_minutes,
-        closeHour: workingHourConfig.close_hour,
-        closeMinute: workingHourConfig.close_minutes,
-      };
+    replyWaitMeessage() {
+      const { workingHoursEnabled } = this.channelConfig;
+
+      if (this.isOnline) {
+        return this.replyTimeStatus;
+      }
+      if (workingHoursEnabled) {
+        return this.outOfOfficeMessage;
+      }
+      return this.$t('TEAM_AVAILABILITY.OFFLINE');
     },
   },
   methods: {
diff --git a/app/javascript/widget/mixins/availability.js b/app/javascript/widget/mixins/availability.js
new file mode 100644
index 000000000..1508a825d
--- /dev/null
+++ b/app/javascript/widget/mixins/availability.js
@@ -0,0 +1,62 @@
+import compareAsc from 'date-fns/compareAsc';
+import { buildDateFromTime } from 'shared/helpers/DateHelper';
+
+export default {
+  computed: {
+    channelConfig() {
+      return window.chatwootWebChannel;
+    },
+    replyTime() {
+      return window.chatwootWebChannel.replyTime;
+    },
+    replyTimeStatus() {
+      switch (this.replyTime) {
+        case 'in_a_few_minutes':
+          return this.$t('REPLY_TIME.IN_A_FEW_MINUTES');
+        case 'in_a_few_hours':
+          return this.$t('REPLY_TIME.IN_A_FEW_HOURS');
+        case 'in_a_day':
+          return this.$t('REPLY_TIME.IN_A_DAY');
+        default:
+          return this.$t('REPLY_TIME.IN_A_FEW_HOURS');
+      }
+    },
+    outOfOfficeMessage() {
+      return this.channelConfig.outOfOfficeMessage;
+    },
+    isInBetweenTheWorkingHours() {
+      const {
+        openHour,
+        openMinute,
+        closeHour,
+        closeMinute,
+        closedAllDay,
+      } = this.currentDayAvailability;
+      const { utcOffset } = this.channelConfig;
+
+      if (closedAllDay) return false;
+
+      const startTime = buildDateFromTime(openHour, openMinute, utcOffset);
+      const endTime = buildDateFromTime(closeHour, closeMinute, utcOffset);
+      const isBetween =
+        compareAsc(new Date(), startTime) === 1 &&
+        compareAsc(endTime, new Date()) === 1;
+
+      if (isBetween) return true;
+      return false;
+    },
+    currentDayAvailability() {
+      const dayOfTheWeek = new Date().getDay();
+      const [workingHourConfig = {}] = this.channelConfig.workingHours.filter(
+        workingHour => workingHour.day_of_week === dayOfTheWeek
+      );
+      return {
+        closedAllDay: workingHourConfig.closed_all_day,
+        openHour: workingHourConfig.open_hour,
+        openMinute: workingHourConfig.open_minutes,
+        closeHour: workingHourConfig.close_hour,
+        closeMinute: workingHourConfig.close_minutes,
+      };
+    },
+  },
+};
diff --git a/app/javascript/widget/mixins/configMixin.js b/app/javascript/widget/mixins/configMixin.js
index a06b711e9..df26add3b 100644
--- a/app/javascript/widget/mixins/configMixin.js
+++ b/app/javascript/widget/mixins/configMixin.js
@@ -21,9 +21,6 @@ export default {
     hasAttachmentsEnabled() {
       return this.channelConfig.enabledFeatures.includes('attachments');
     },
-    replyTime() {
-      return window.chatwootWebChannel.replyTime;
-    },
     preChatFormEnabled() {
       return window.chatwootWebChannel.preChatFormEnabled;
     },
@@ -34,20 +31,5 @@ export default {
         preChatMessage: options.pre_chat_message,
       };
     },
-    replyTimeStatus() {
-      switch (this.replyTime) {
-        case 'in_a_few_minutes':
-          return this.$t('REPLY_TIME.IN_A_FEW_MINUTES');
-        case 'in_a_few_hours':
-          return this.$t('REPLY_TIME.IN_A_FEW_HOURS');
-        case 'in_a_day':
-          return this.$t('REPLY_TIME.IN_A_DAY');
-        default:
-          return this.$t('REPLY_TIME.IN_A_FEW_HOURS');
-      }
-    },
-    outOfOfficeMessage() {
-      return this.channelConfig.outOfOfficeMessage;
-    },
   },
 };