From c1a2e67c9e55b1be4f1173301069d7dee1ebae9c Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 10 Nov 2023 09:44:59 +0530
Subject: [PATCH] fix: Change the route change logic based on bus events, after
 creating a new conversation in the widget. (#8328)

---
 .../widget/constants/widgetBusEvents.js        |  1 +
 .../store/modules/conversation/actions.js      |  3 +++
 app/javascript/widget/views/PreChatForm.vue    | 18 ++++++------------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/javascript/widget/constants/widgetBusEvents.js b/app/javascript/widget/constants/widgetBusEvents.js
index 769b941ee..1ffcd3d51 100644
--- a/app/javascript/widget/constants/widgetBusEvents.js
+++ b/app/javascript/widget/constants/widgetBusEvents.js
@@ -1,3 +1,4 @@
 export const ON_AGENT_MESSAGE_RECEIVED = 'ON_AGENT_MESSAGE_RECEIVED';
 export const ON_UNREAD_MESSAGE_CLICK = 'ON_UNREAD_MESSAGE_CLICK';
 export const ON_CAMPAIGN_MESSAGE_CLICK = 'ON_CAMPAIGN_MESSAGE_CLICK';
+export const ON_CONVERSATION_CREATED = 'ON_CONVERSATION_CREATED';
diff --git a/app/javascript/widget/store/modules/conversation/actions.js b/app/javascript/widget/store/modules/conversation/actions.js
index 73a0da91f..e1862ea84 100644
--- a/app/javascript/widget/store/modules/conversation/actions.js
+++ b/app/javascript/widget/store/modules/conversation/actions.js
@@ -10,6 +10,7 @@ import {
   deleteCustomAttribute,
 } from 'widget/api/conversation';
 
+import { ON_CONVERSATION_CREATED } from 'widget/constants/widgetBusEvents';
 import { createTemporaryMessage, getNonDeletedMessages } from './helpers';
 
 export const actions = {
@@ -21,6 +22,8 @@ export const actions = {
       const [message = {}] = messages;
       commit('pushMessageToConversation', message);
       dispatch('conversationAttributes/getAttributes', {}, { root: true });
+      // Emit event to notify that conversation is created and show the chat screen
+      bus.$emit(ON_CONVERSATION_CREATED);
     } catch (error) {
       // Ignore error
     } finally {
diff --git a/app/javascript/widget/views/PreChatForm.vue b/app/javascript/widget/views/PreChatForm.vue
index 58cad04b9..2f03521ba 100644
--- a/app/javascript/widget/views/PreChatForm.vue
+++ b/app/javascript/widget/views/PreChatForm.vue
@@ -4,28 +4,22 @@
   </div>
 </template>
 <script>
-import { mapGetters } from 'vuex';
 import PreChatForm from '../components/PreChat/Form.vue';
 import configMixin from '../mixins/configMixin';
 import routerMixin from '../mixins/routerMixin';
 import { isEmptyObject } from 'widget/helpers/utils';
+import { ON_CONVERSATION_CREATED } from '../constants/widgetBusEvents';
 
 export default {
   components: {
     PreChatForm,
   },
   mixins: [configMixin, routerMixin],
-  computed: {
-    ...mapGetters({
-      conversationSize: 'conversation/getConversationSize',
-    }),
-  },
-  watch: {
-    conversationSize(newSize, oldSize) {
-      if (!oldSize && newSize > oldSize) {
-        this.replaceRoute('messages');
-      }
-    },
+  mounted() {
+    bus.$on(ON_CONVERSATION_CREATED, () => {
+      // Redirect to messages page after conversation is created
+      this.replaceRoute('messages');
+    });
   },
   methods: {
     onSubmit({