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

fix: Resolve conversation with id instead of current conversation (#2731)

Browse source
This commit is contained in:
Pranav Raj S 2021-08-02 13:11:07 +05:30 committed by GitHub
parent 9f3f238cb5
commit d88e3e3596
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 54 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/dashboard/store/modules/conversations/actions.js
View file

@ -145,10 +145,10 @@ const actions = {
status,
snoozedUntil,
});
commit(
types.default.RESOLVE_CONVERSATION,
response.data.payload.current_status
);
commit(types.default.RESOLVE_CONVERSATION, {
conversationId,
status: response.data.payload.current_status,
});
} catch (error) {
// Handle error
}

4
app/javascript/dashboard/store/modules/conversations/getters.js
View file

@ -64,7 +64,9 @@ const getters = {
getChatStatusFilter: ({ chatStatusFilter }) => chatStatusFilter,
getSelectedInbox: ({ currentInbox }) => currentInbox,
getConversationById: _state => conversationId => {
return _state.allConversations.find(value => value.id === conversationId);
return _state.allConversations.find(
value => value.id === Number(conversationId)
);
},
};

7
app/javascript/dashboard/store/modules/conversations/index.js
View file

@ -69,9 +69,10 @@ export const mutations = {
Vue.set(chat.meta, 'team', team);
},
[types.default.RESOLVE_CONVERSATION](_state, status) {
const [chat] = getSelectedChatConversation(_state);
chat.status = status;
[types.default.RESOLVE_CONVERSATION](_state, { conversationId, status }) {
const conversation =
getters.getConversationById(_state)(conversationId) || {};
Vue.set(conversation, 'status', status);
},
[types.default.MUTE_CONVERSATION](_state) {

16
app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
View file

@ -214,6 +214,22 @@ describe('#actions', () => {
});
});
describe('#toggleStatus', () => {
it('sends correct mutations if toggle status is successful', async () => {
axios.post.mockResolvedValue({
data: { payload: { conversation_id: 1, current_status: 'resolved' } },
});
await actions.toggleStatus(
{ commit },
{ conversationId: 1, status: 'resolved' }
);
expect(commit).toHaveBeenCalledTimes(1);
expect(commit.mock.calls).toEqual([
['RESOLVE_CONVERSATION', { conversationId: 1, status: 'resolved' }],
]);
});
});
describe('#assignTeam', () => {
it('sends correct mutations if assignment is successful', async () => {
axios.post.mockResolvedValue({

27
app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
View file

@ -160,4 +160,31 @@ describe('#mutations', () => {
expect(global.bus.$emit).not.toHaveBeenCalled();
});
});
describe('#RESOLVE_CONVERSATION', () => {
it('updates the conversation status correctly', () => {
const state = {
allConversations: [
{
id: 1,
messages: [],
status: 'open',
},
],
};
mutations[types.RESOLVE_CONVERSATION](state, {
conversationId: '1',
status: 'resolved',
});
expect(state.allConversations).toEqual([
{
id: 1,
messages: [],
status: 'resolved',
},
]);
});
});
});