Skip to content

chore: Omnichannel QoL improvements #34865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 2 commits into from
Jan 21, 2025
Merged

chore: Omnichannel QoL improvements #34865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55d6e26
minor stuff
KevLehman Jan 2, 2025
2ebed71
Merge branch 'develop' into chore/code-up
KevLehman Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/meteor/ee/app/livechat-enterprise/server/hooks/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ import './sendPdfTranscriptOnClose';
import './applyRoomRestrictions';
import './afterTagRemoved';
import './manageDepartmentUnit';
import './autoCloseQueued';
16 changes: 5 additions & 11 deletions apps/meteor/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
import { LivechatRooms, Subscriptions } from '@rocket.chat/models';
import { LivechatRooms } from '@rocket.chat/models';

import { notifyOnSubscriptionChangedByRoomId } from '../../../../../app/lib/server/lib/notifyListener';
import { settings } from '../../../../../app/settings/server';
import { callbacks } from '../../../../../lib/callbacks';
import { AutoCloseOnHoldScheduler } from '../lib/AutoCloseOnHoldScheduler';
Expand All @@ -17,14 +16,9 @@ const onCloseLivechat = async (params: LivechatCloseCallbackParams) => {
room: { _id: roomId },
} = params;

const responses = await Promise.all([
LivechatRooms.unsetOnHoldByRoomId(roomId),
Subscriptions.unsetOnHoldByRoomId(roomId),
AutoCloseOnHoldScheduler.unscheduleRoom(roomId),
]);

if (responses[1].modifiedCount) {
void notifyOnSubscriptionChangedByRoomId(roomId);
await LivechatRooms.unsetOnHoldByRoomId(roomId);
if (settings.get('Livechat_auto_close_on_hold_chats_timeout')) {
await AutoCloseOnHoldScheduler.unscheduleRoom(roomId);
}

if (!settings.get('Livechat_waiting_queue')) {
Expand All @@ -41,5 +35,5 @@ callbacks.add(
'livechat.closeRoom',
(params: LivechatCloseCallbackParams) => onCloseLivechat(params),
callbacks.priority.HIGH,
'livechat-waiting-queue-monitor-close-room',
'livechat-on-close-livechat-remove-on-hold-and-dispatch-waiting-queue',
);
4 changes: 1 addition & 3 deletions apps/meteor/ee/app/livechat-enterprise/server/hooks/onLoadConfigApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ callbacks.add(
async (options) => {
const { room } = options;

const queueInfo = await getLivechatQueueInfo(room);
const customFields = await getLivechatCustomFields();

const [queueInfo, customFields] = await Promise.all([getLivechatQueueInfo(room), getLivechatCustomFields()]);
return {
...(queueInfo && { queueInfo }),
...(customFields && { customFields }),
Expand Down
Loading