diff --git a/src/App.vue b/src/App.vue index 8723e3d8..147c0119 100644 --- a/src/App.vue +++ b/src/App.vue @@ -17,7 +17,6 @@ import { useConfig } from './store/modules/config'; import { useProfile } from './store/modules/profile'; import { useQuickMessages } from './store/modules/chats/quickMessages'; import { useQuickMessageShared } from './store/modules/chats/quickMessagesShared'; -import { useRooms } from './store/modules/chats/rooms'; import { useDashboard } from './store/modules/dashboard'; import initHotjar from '@/plugins/Hotjar'; @@ -35,7 +34,6 @@ export default { }, computed: { - ...mapState(useRooms, ['activeRoom']), ...mapState(useProfile, ['me']), ...mapState(useDashboard, ['viewedAgent']), ...mapState(useQuickMessages, ['nextQuickMessages']), diff --git a/src/components/ModalQueuePriorizations.vue b/src/components/ModalQueuePriorizations.vue index a6cb93d8..725fe664 100644 --- a/src/components/ModalQueuePriorizations.vue +++ b/src/components/ModalQueuePriorizations.vue @@ -177,6 +177,7 @@ export default { this.removeRoom(room.uuid); } }); + await this.getAllRooms({ limit: 100 }); callUnnnicAlert({ diff --git a/src/components/chats/ContactInfo/TransferSession.vue b/src/components/chats/ContactInfo/TransferSession.vue index e2f99669..72cb6667 100644 --- a/src/components/chats/ContactInfo/TransferSession.vue +++ b/src/components/chats/ContactInfo/TransferSession.vue @@ -96,12 +96,8 @@ export default { this.$refs.roomsTransferFields.transfer(); }, - transferComplete(status) { + transferComplete() { this.isLoading = false; - - if (status === 'success') { - this.resetActiveRoom(); - } }, resetActiveRoom() { diff --git a/src/components/chats/RoomsTransferFields.vue b/src/components/chats/RoomsTransferFields.vue index 82c9e809..d6fde1b2 100644 --- a/src/components/chats/RoomsTransferFields.vue +++ b/src/components/chats/RoomsTransferFields.vue @@ -101,7 +101,11 @@ export default { }, computed: { - ...mapState(useRooms, ['selectedRoomsToTransfer', 'contactToTransfer']), + ...mapState(useRooms, [ + 'selectedRoomsToTransfer', + 'contactToTransfer', + 'activeRoom', + ]), ...mapState(useProfile, ['me']), queuesDefault() { @@ -178,7 +182,7 @@ export default { ...mapActions(useRooms, [ 'setSelectedRoomsToTransfer', 'setContactToTransfer', - 'removeRoom', + 'setActiveRoom', ]), async getQueues() { @@ -226,8 +230,10 @@ export default { const selectedQueue = this.selectedQueue?.[0]?.value; const selectedAgent = this.selectedAgent?.[0]?.value; - + const activeRoom = { ...this.activeRoom }; try { + await this.setActiveRoom(null); + const response = await Room.bulkTranfer({ rooms: roomsToTransfer, intended_queue: selectedQueue, @@ -235,12 +241,13 @@ export default { }); if (response.status === 200) { - this.transferSuccess(); this.resetRoomsToTransfer(); + this.transferSuccess(); } else { this.transferError(); } } catch (error) { + await this.setActiveRoom(activeRoom); console.error( 'An error occurred while performing the mass transfer:', error, diff --git a/src/layouts/ChatsLayout/components/TheCardGroups/CardGroup/index.vue b/src/layouts/ChatsLayout/components/TheCardGroups/CardGroup/index.vue index 8f2276cb..37110e2e 100644 --- a/src/layouts/ChatsLayout/components/TheCardGroups/CardGroup/index.vue +++ b/src/layouts/ChatsLayout/components/TheCardGroups/CardGroup/index.vue @@ -1,22 +1,16 @@ + + diff --git a/src/layouts/ChatsLayout/components/TheCardGroups/index.vue b/src/layouts/ChatsLayout/components/TheCardGroups/index.vue index 7d56cd8a..0c390c49 100644 --- a/src/layouts/ChatsLayout/components/TheCardGroups/index.vue +++ b/src/layouts/ChatsLayout/components/TheCardGroups/index.vue @@ -1,6 +1,9 @@