Merge branch 'develop' into feat/reload-banner-chat-list

This commit is contained in:
Sivin Varghese 2022-02-07 13:47:34 +05:30 committed by GitHub
commit 3757aabb6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions

View file

@ -133,6 +133,7 @@ export default {
...mapGetters({ ...mapGetters({
uiFlags: 'contacts/getUIFlags', uiFlags: 'contacts/getUIFlags',
conversationsUiFlags: 'contactConversations/getUIFlags', conversationsUiFlags: 'contactConversations/getUIFlags',
currentUser: 'getCurrentUser',
}), }),
getNewConversation() { getNewConversation() {
return { return {
@ -141,6 +142,7 @@ export default {
contactId: this.contact.id, contactId: this.contact.id,
message: { content: this.message }, message: { content: this.message },
mailSubject: this.subject, mailSubject: this.subject,
assigneeId: this.currentUser.id,
}; };
}, },
targetInbox: { targetInbox: {

View file

@ -24,7 +24,14 @@ export const actions = {
commit(types.default.SET_CONTACT_CONVERSATIONS_UI_FLAG, { commit(types.default.SET_CONTACT_CONVERSATIONS_UI_FLAG, {
isCreating: true, isCreating: true,
}); });
const { inboxId, message, contactId, sourceId, mailSubject } = params; const {
inboxId,
message,
contactId,
sourceId,
mailSubject,
assigneeId,
} = params;
try { try {
const { data } = await ConversationApi.create({ const { data } = await ConversationApi.create({
inbox_id: inboxId, inbox_id: inboxId,
@ -34,6 +41,7 @@ export const actions = {
mail_subject: mailSubject, mail_subject: mailSubject,
}, },
message, message,
assignee_id: assigneeId,
}); });
commit(types.default.ADD_CONTACT_CONVERSATION, { commit(types.default.ADD_CONTACT_CONVERSATION, {
id: contactId, id: contactId,