KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Syncing with feat branch

Browse source
This commit is contained in:
Nithin David 2021-11-15 22:13:22 +05:30
parent 2cea6dab4a
commit 18fbd1ab91
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/javascript/widget/views/Chat.vue
View file

@ -65,10 +65,10 @@ export default {
computed: { computed: {
...mapGetters({ ...mapGetters({
availableAgents: 'agent/availableAgents', availableAgents: 'agent/availableAgents',
metaIn: 'conversationV2/metaIn', metaIn: 'conversation/metaIn',
currentUser: 'contactV2/getCurrentUser', currentUser: 'contact/getCurrentUser',
getTotalMessageCount: 'conversationV2/allMessagesCountIn', getTotalMessageCount: 'conversation/allMessagesCountIn',
getGroupedMessages: 'conversationV2/groupByMessagesIn', getGroupedMessages: 'conversation/groupByMessagesIn',
}), }),
conversationId() { conversationId() {
const { conversationId } = this.$route.params; const { conversationId } = this.$route.params;
@ -104,7 +104,7 @@ export default {
this.setUserLastSeen(); this.setUserLastSeen();
}, },
methods: { methods: {
...mapActions('conversationV2', ['setUserLastSeenIn']), ...mapActions('conversation', ['setUserLastSeenIn']),
closeChat() { closeChat() {
IFrameHelper.sendMessage({ event: 'closeChat' }); IFrameHelper.sendMessage({ event: 'closeChat' });
}, },

13
app/javascript/widget/views/Home.vue
View file

@ -12,10 +12,7 @@
v-if="lastActiveConversationId" v-if="lastActiveConversationId"
:conversations="allActiveConversations" :conversations="allActiveConversations"
/> />
<team-availability <team-availability :available-agents="availableAgents" />
:available-agents="availableAgents"
@start-conversation="startConversation"
/>
<div class="footer-wrap"> <div class="footer-wrap">
<branding></branding> <branding></branding>
@ -54,12 +51,16 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
isCampaignViewClicked: {
type: Boolean,
default: false,
},
}, },
computed: { computed: {
...mapGetters({ ...mapGetters({
availableAgents: 'agent/availableAgents', availableAgents: 'agent/availableAgents',
lastActiveConversationId: 'conversationV2/lastActiveConversationId', lastActiveConversationId: 'conversation/lastActiveConversationId',
allActiveConversations: 'conversationV2/allActiveConversations', allActiveConversations: 'conversation/allActiveConversations',
}), }),
}, },
methods: { methods: {

2
app/javascript/widget/views/PreChat.vue
View file

@ -40,7 +40,7 @@ export default {
computed: { computed: {
...mapGetters({ ...mapGetters({
availableAgents: 'agent/availableAgents', availableAgents: 'agent/availableAgents',
currentUser: 'contactV2/getCurrentUser', currentUser: 'contact/getCurrentUser',
}), }),
}, },
}; };