From 45a5d1f869e1a0ba292d0af2c2a58dcdc8761e13 Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kevin.aleman@rocket.chat>
Date: Thu, 21 Oct 2021 10:45:16 -0600
Subject: [PATCH] Regression: Waiting_queue setting not being applied due to
missing module key (#23531)
---
app/settings/server/SettingsRegistry.ts | 4 ++--
ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js | 2 +-
ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js | 2 +-
ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js | 2 +-
ee/app/livechat-enterprise/server/settings.ts | 3 +++
5 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/app/settings/server/SettingsRegistry.ts b/app/settings/server/SettingsRegistry.ts
index 62e4285aafe..40f8c08ba48 100644
--- a/app/settings/server/SettingsRegistry.ts
+++ b/app/settings/server/SettingsRegistry.ts
@@ -120,7 +120,7 @@ export class SettingsRegistry {
try {
validateSetting(settingFromCode._id, settingFromCode.type, settingFromCode.value);
} catch (e) {
- IS_DEVELOPMENT && SystemLogger.error(`Invalid setting code ${ _id }: ${ e.message }`);
+ IS_DEVELOPMENT && SystemLogger.error(`Invalid setting code ${ _id }: ${ (e as Error).message }`);
}
const isOverwritten = settingFromCode !== settingOverwritten;
@@ -144,7 +144,7 @@ export class SettingsRegistry {
try {
validateSetting(settingFromCode._id, settingFromCode.type, settingStored?.value);
} catch (e) {
- IS_DEVELOPMENT && SystemLogger.error(`Invalid setting stored ${ _id }: ${ e.message }`);
+ IS_DEVELOPMENT && SystemLogger.error(`Invalid setting stored ${ _id }: ${ (e as Error).message }`);
}
return;
}
diff --git a/ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js b/ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js
index 705d9bf7b59..424f3840a83 100644
--- a/ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js
+++ b/ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js
@@ -1,5 +1,5 @@
import { callbacks } from '../../../../../app/callbacks';
-import { settings } from '../../../../../app/settings';
+import { settings } from '../../../../../app/settings/server';
import { debouncedDispatchWaitingQueueStatus } from '../lib/Helper';
import { cbLogger } from '../lib/logger';
diff --git a/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js b/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js
index 2ebf692e772..61bbd6261be 100644
--- a/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js
+++ b/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js
@@ -1,5 +1,5 @@
import { callbacks } from '../../../../../app/callbacks';
-import { settings } from '../../../../../app/settings';
+import { settings } from '../../../../../app/settings/server';
import { LivechatInquiry } from '../../../../../app/models/server';
import { dispatchInquiryPosition } from '../lib/Helper';
import { allowAgentSkipQueue } from '../../../../../app/livechat/server/lib/Helper';
diff --git a/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js b/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js
index 4cf34373727..eb52f3ed975 100644
--- a/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js
+++ b/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js
@@ -1,5 +1,5 @@
import { callbacks } from '../../../../../app/callbacks';
-import { settings } from '../../../../../app/settings';
+import { settings } from '../../../../../app/settings/server';
import { debouncedDispatchWaitingQueueStatus } from '../lib/Helper';
import { RoutingManager } from '../../../../../app/livechat/server/lib/RoutingManager';
import { LivechatEnterprise } from '../lib/LivechatEnterprise';
diff --git a/ee/app/livechat-enterprise/server/settings.ts b/ee/app/livechat-enterprise/server/settings.ts
index 764d17cc180..d3dc3be2413 100644
--- a/ee/app/livechat-enterprise/server/settings.ts
+++ b/ee/app/livechat-enterprise/server/settings.ts
@@ -79,6 +79,9 @@ export const createSettings = (): void => {
i18nLabel: 'Waiting_queue',
enterprise: true,
invalidValue: false,
+ modules: [
+ 'livechat-enterprise',
+ ],
enableQuery: omnichannelEnabledQuery,
});
--
GitLab