Regression: Waiting_queue setting not being applied due to missing module key (#23531)

KevLehman · web-flow · commit 45a5d1f869e1 · 2021-10-21T13:45:16.000-03:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -79,6 +79,9 @@ export const createSettings = (): void => {
 				i18nLabel: 'Waiting_queue',
 				enterprise: true,
 				invalidValue: false,
+				modules: [
+					'livechat-enterprise',
+				],
 				enableQuery: omnichannelEnabledQuery,
 			});
 

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ export class SettingsRegistry {`
`120`	`120`	`try {`
`121`	`121`	`validateSetting(settingFromCode._id, settingFromCode.type, settingFromCode.value);`
`122`	`122`	`} catch (e) {`
`123`		- IS_DEVELOPMENT && SystemLogger.error(`Invalid setting code ${ _id }: ${ e.message }`);
	`123`	+ IS_DEVELOPMENT && SystemLogger.error(`Invalid setting code ${ _id }: ${ (e as Error).message }`);
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`const isOverwritten = settingFromCode !== settingOverwritten;`
`@@ -144,7 +144,7 @@ export class SettingsRegistry {`
`144`	`144`	`try {`
`145`	`145`	`validateSetting(settingFromCode._id, settingFromCode.type, settingStored?.value);`
`146`	`146`	`} catch (e) {`
`147`		- IS_DEVELOPMENT && SystemLogger.error(`Invalid setting stored ${ _id }: ${ e.message }`);
	`147`	+ IS_DEVELOPMENT && SystemLogger.error(`Invalid setting stored ${ _id }: ${ (e as Error).message }`);
`148`	`148`	`}`
`149`	`149`	`return;`
`150`	`150`	`}`