From 55d6e26b7ffa4c8ebd32ea0d0424ba1e494fa0f2 Mon Sep 17 00:00:00 2001 From: Kevin Aleman Date: Thu, 2 Jan 2025 10:08:52 -0600 Subject: [PATCH] minor stuff --- .../livechat-enterprise/server/hooks/index.ts | 1 + .../server/hooks/onCloseLivechat.ts | 16 +++++----------- .../server/hooks/onLoadConfigApi.ts | 4 +--- packages/apps-engine/deno-runtime/deno.lock | 17 +++++++++++++++++ 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/index.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/index.ts index a4b66087be2e8..8d59c834e2b5b 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/hooks/index.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/index.ts @@ -27,3 +27,4 @@ import './sendPdfTranscriptOnClose'; import './applyRoomRestrictions'; import './afterTagRemoved'; import './manageDepartmentUnit'; +import './autoCloseQueued'; diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.ts index bc2d4fb6a3fb4..fd6fd9b8109ce 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.ts @@ -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'; @@ -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')) { @@ -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', ); diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/onLoadConfigApi.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/onLoadConfigApi.ts index c0e966cb24fca..01b4600ca954a 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/hooks/onLoadConfigApi.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/onLoadConfigApi.ts @@ -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 }), diff --git a/packages/apps-engine/deno-runtime/deno.lock b/packages/apps-engine/deno-runtime/deno.lock index 1154e7709f11e..dd7f03dbb75e8 100644 --- a/packages/apps-engine/deno-runtime/deno.lock +++ b/packages/apps-engine/deno-runtime/deno.lock @@ -12,6 +12,11 @@ "npm:stack-trace@0.0.10": "npm:stack-trace@0.0.10", "npm:uuid@8.3.2": "npm:uuid@8.3.2" }, + "jsr": { + "@std/cli@1.0.9": { + "integrity": "557e5865af000efbf3f737dcfea5b8ab86453594f4a9cd8d08c9fa83d8e3f3bc" + } + }, "npm": { "@msgpack/msgpack@3.0.0-beta2": { "integrity": "sha512-y+l1PNV0XDyY8sM3YtuMLK5vE3/hkfId+Do8pLo/OPxfxuFAUwcGz3oiiUuV46/aBpwTzZ+mRWVMtlSKbradhw==", @@ -92,5 +97,17 @@ "https://deno.land/std@0.216.0/io/types.ts": "748bbb3ac96abda03594ef5a0db15ce5450dcc6c0d841c8906f8b10ac8d32c96", "https://deno.land/std@0.216.0/io/write_all.ts": "24aac2312bb21096ae3ae0b102b22c26164d3249dff96dbac130958aa736f038", "https://jsr.io/@std/cli/1.0.9/parse_args.ts": "29ac18602d8836d2723cab1d90111ff954acc369f184626a3f9f677e3185caef" + }, + "workspace": { + "dependencies": [ + "npm:@msgpack/msgpack@3.0.0-beta2", + "npm:@rocket.chat/ui-kit@^0.31.22", + "npm:acorn-walk@8.2.0", + "npm:acorn@8.10.0", + "npm:astring@1.8.6", + "npm:jsonrpc-lite@2.2.0", + "npm:stack-trace@0.0.10", + "npm:uuid@8.3.2" + ] } }