chore: Move agent availability to Account level (#3074)

- Move agent availability to the account level
This commit is contained in:
Sojan Jose 2021-10-07 13:21:46 +05:30 committed by GitHub
parent 1c6a539c0a
commit c54aae21ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
84 changed files with 618 additions and 148 deletions

View file

@ -161,9 +161,9 @@ export default {
});
},
updateAvailability({ availability }) {
return axios.put(endPoints('profileUpdate').url, {
profile: { availability },
updateAvailability(availabilityData) {
return axios.post(endPoints('availabilityUpdate').url, {
profile: { ...availabilityData },
});
},
};

View file

@ -13,6 +13,9 @@ const endPoints = {
profileUpdate: {
url: '/api/v1/profile',
},
availabilityUpdate: {
url: '/api/v1/profile/availability',
},
logout: {
url: 'auth/sign_out',
},

View file

@ -26,7 +26,9 @@
color-scheme="secondary"
class-names="status-change--dropdown-button"
:is-disabled="status.disabled"
@click="changeAvailabilityStatus(status.value)"
@click="
changeAvailabilityStatus(status.value, currentAccountId)
"
>
<availability-status-badge :status="status.value" />
{{ status.label }}
@ -75,7 +77,8 @@ export default {
computed: {
...mapGetters({
currentUser: 'getCurrentUser',
getCurrentUserAvailabilityStatus: 'getCurrentUserAvailabilityStatus',
getCurrentAccountId: 'getCurrentAccountId',
}),
availabilityDisplayLabel() {
const availabilityIndex = AVAILABILITY_STATUS_KEYS.findIndex(
@ -85,8 +88,11 @@ export default {
availabilityIndex
];
},
currentAccountId() {
return this.getCurrentAccountId;
},
currentUserAvailabilityStatus() {
return this.currentUser.availability_status;
return this.getCurrentUserAvailabilityStatus;
},
availabilityStatuses() {
return this.$t('PROFILE_SETTINGS.FORM.AVAILABILITY.STATUSES_LIST').map(
@ -108,16 +114,16 @@ export default {
closeStatusMenu() {
this.isStatusMenuOpened = false;
},
changeAvailabilityStatus(availability) {
changeAvailabilityStatus(availability, accountId) {
if (this.isUpdating) {
return;
}
this.isUpdating = true;
this.$store
.dispatch('updateAvailability', {
availability,
availability: availability,
account_id: accountId,
})
.finally(() => {
this.isUpdating = false;

View file

@ -17,7 +17,8 @@ const i18nConfig = new VueI18n({
});
describe('AvailabilityStatus', () => {
const currentUser = { availability_status: 'online' };
const currentAvailabilityStatus = 'online' ;
const currentAccountId = '1';
let store = null;
let actions = null;
let modules = null;
@ -33,7 +34,8 @@ describe('AvailabilityStatus', () => {
modules = {
auth: {
getters: {
getCurrentUser: () => currentUser,
getCurrentUserAvailabilityStatus: () => currentAvailabilityStatus,
getCurrentAccountId: () => currentAccountId,
},
},
};
@ -77,7 +79,7 @@ describe('AvailabilityStatus', () => {
expect(actions.updateAvailability).toBeCalledWith(
expect.any(Object),
{ availability: 'offline' },
{ availability: 'offline', account_id: currentAccountId },
undefined
);
});

View file

@ -40,7 +40,11 @@ export const getters = {
},
getCurrentUserAvailabilityStatus(_state) {
return _state.currentUser.availability_status;
const { accounts = [] } = _state.currentUser;
const [currentAccount = {}] = accounts.filter(
account => account.id === _state.currentAccountId
);
return currentAccount.availability_status;
},
getCurrentAccountId(_state) {
@ -125,14 +129,17 @@ export const actions = {
}
},
updateAvailability: ({ commit, dispatch }, { availability }) => {
authAPI.updateAvailability({ availability }).then(response => {
updateAvailability: async ({ commit, dispatch }, params) => {
try {
const response = await authAPI.updateAvailability(params);
const userData = response.data;
const { id, availability_status: availabilityStatus } = userData;
const { id } = userData;
setUser(userData, getHeaderExpiry(response));
commit(types.default.SET_CURRENT_USER);
dispatch('agents/updatePresence', { [id]: availabilityStatus });
});
dispatch('agents/updatePresence', { [id]: params.availability });
} catch (error) {
// Ignore error
}
},
setCurrentAccountId({ commit }, accountId) {

View file

@ -54,13 +54,16 @@ describe('#actions', () => {
describe('#updateAvailability', () => {
it('sends correct actions if API is success', async () => {
axios.put.mockResolvedValue({
data: { id: 1, name: 'John', availability_status: 'offline' },
axios.post.mockResolvedValue({
data: {
id: 1,
account_users: [{ account_id: 1, availability_status: 'offline' }],
},
headers: { expiry: 581842904 },
});
await actions.updateAvailability(
{ commit, dispatch },
{ availability: 'offline' }
{ availability: 'offline', account_id: 1 },
);
expect(setUser).toHaveBeenCalledTimes(1);
expect(commit.mock.calls).toEqual([[types.default.SET_CURRENT_USER]]);

View file

@ -21,7 +21,11 @@ describe('#getters', () => {
it('get', () => {
expect(
getters.getCurrentUserAvailabilityStatus({
currentUser: { id: 1, name: 'Pranav', availability_status: 'busy' },
currentAccountId: 1,
currentUser: {
id: 1,
accounts: [{ id: 1, availability_status: 'busy' }],
},
})
).toEqual('busy');
});

View file

@ -1,6 +1,6 @@
import { createConsumer } from '@rails/actioncable';
const PRESENCE_INTERVAL = 60000;
const PRESENCE_INTERVAL = 20000;
class BaseActionCableConnector {
constructor(app, pubsubToken, websocketHost = '') {