Chore: Fix presence for current user (#1001)

Co-authored-by: Pranav Raj Sreepuram <pranavrajs@gmail.com>
This commit is contained in:
Sojan Jose
2020-07-04 20:03:16 +05:30
committed by GitHub
parent 4612494923
commit 43147b3163
11 changed files with 78 additions and 20 deletions

View File

@@ -33,6 +33,7 @@ class ActionCableConnector extends BaseActionCableConnector {
onPresenceUpdate = data => {
this.app.$store.dispatch('contacts/updatePresence', data.contacts);
this.app.$store.dispatch('agents/updatePresence', data.users);
this.app.$store.dispatch('setCurrentUserAvailabilityStatus', data.users);
};
onConversationContactChange = payload => {

View File

@@ -163,6 +163,7 @@ export default {
...mapGetters({
currentUser: 'getCurrentUser',
currentUserId: 'getCurrentUserID',
currentAvailabilityStatus: 'getCurrentUserAvailabilityStatus',
}),
},
watch: {
@@ -171,6 +172,11 @@ export default {
this.initializeUser();
}
},
currentAvailabilityStatus(newStatus, oldStatus) {
if (newStatus !== oldStatus) {
this.availability = newStatus;
}
},
},
mounted() {
if (this.currentUserId) {

View File

@@ -5,7 +5,6 @@ import accounts from './modules/accounts';
import agents from './modules/agents';
import auth from './modules/auth';
import cannedResponse from './modules/cannedResponse';
import Channel from './modules/channels';
import contactConversations from './modules/contactConversations';
import contacts from './modules/contacts';
import conversationLabels from './modules/conversationLabels';
@@ -30,7 +29,6 @@ export default new Vuex.Store({
agents,
auth,
cannedResponse,
Channel,
contactConversations,
contacts,
conversationLabels,

View File

@@ -34,6 +34,10 @@ export const getters = {
return _state.currentUser.id;
},
getCurrentUserAvailabilityStatus(_state) {
return _state.currentUser.availability_status;
},
getCurrentAccountId(_state) {
return _state.currentAccountId;
},
@@ -104,10 +108,22 @@ export const actions = {
setCurrentAccountId({ commit }, accountId) {
commit(types.default.SET_CURRENT_ACCOUNT_ID, accountId);
},
setCurrentUserAvailabilityStatus({ commit, state: $state }, data) {
if (data[$state.currentUser.id]) {
commit(
types.default.SET_CURRENT_USER_AVAILABILITY,
data[$state.currentUser.id]
);
}
},
};
// mutations
const mutations = {
[types.default.SET_CURRENT_USER_AVAILABILITY](_state, status) {
Vue.set(_state.currentUser, 'availability_status', status);
},
[types.default.CLEAR_USER](_state) {
_state.currentUser.id = null;
},

View File

@@ -1,14 +0,0 @@
/* eslint no-console: 0 */
/* eslint no-param-reassign: 0 */
// const chatType = 'all';
// initial state
const state = {};
// actions
const actions = {};
export default {
state,
actions,
};

View File

@@ -67,4 +67,30 @@ describe('#actions', () => {
expect(dispatch).toHaveBeenCalledTimes(0);
});
});
describe('#setCurrentUserAvailabilityStatus', () => {
it('sends correct mutations if user id is available', async () => {
actions.setCurrentUserAvailabilityStatus(
{
commit,
state: { currentUser: { id: 1 } },
},
{ 1: 'online' }
);
expect(commit.mock.calls).toEqual([
[types.default.SET_CURRENT_USER_AVAILABILITY, 'online'],
]);
});
it('does not send correct mutations if user id is not available', async () => {
actions.setCurrentUserAvailabilityStatus(
{
commit,
state: { currentUser: { id: 1 } },
},
{}
);
expect(commit.mock.calls).toEqual([]);
});
});
});

View File

@@ -17,4 +17,12 @@ describe('#getters', () => {
getters.getCurrentUser({ currentUser: { id: 1, name: 'Pranav' } })
).toEqual({ id: 1, name: 'Pranav' });
});
it('get', () => {
expect(
getters.getCurrentUserAvailabilityStatus({
currentUser: { id: 1, name: 'Pranav', availability_status: 'busy' },
})
).toEqual('busy');
});
});

View File

@@ -3,7 +3,7 @@ export default {
CLEAR_USER: 'LOGOUT',
SET_CURRENT_USER: 'SET_CURRENT_USER',
SET_CURRENT_ACCOUNT_ID: 'SET_CURRENT_ACCOUNT_ID',
SET_CURRENT_USER_AVAILABILITY: 'SET_CURRENT_USER_AVAILABILITY',
// Chat List
RECEIVE_CHAT_LIST: 'RECEIVE_CHAT_LIST',
SET_ALL_CONVERSATION: 'SET_ALL_CONVERSATION',