From 8eb6fef04ecbad5b73ec87fc0bcd9d7ace7cc149 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Tue, 28 Jul 2020 12:30:12 -0300 Subject: [PATCH] [FIX] Uncaught (in promise) undefined (#18393) --- .../client/startup/responses.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/ee/app/canned-responses/client/startup/responses.js b/ee/app/canned-responses/client/startup/responses.js index 1c1f0c7b85f..a703390f3be 100644 --- a/ee/app/canned-responses/client/startup/responses.js +++ b/ee/app/canned-responses/client/startup/responses.js @@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { hasPermission } from '../../../../../app/authorization/client'; +import { settings } from '../../../../../app/settings/client'; import { APIClient } from '../../../../../app/utils/client'; import { CannedResponse } from '../collections/CannedResponse'; import { cannedResponsesStreamer } from '../streamer'; @@ -19,19 +20,25 @@ Meteor.startup(() => { if (!Meteor.userId()) { return; } - if (hasPermission('view-canned-responses')) { - const { responses } = await APIClient.v1.get('canned-responses.get'); - responses.forEach((response) => CannedResponse.insert(response)); + if (!settings.get('Canned_Responses_Enable')) { + return; + } + if (!hasPermission('view-canned-responses')) { + return; + } + try { cannedResponsesStreamer.on('canned-responses', (response, options) => { const { agentsId } = options || {}; - if (agentsId && Array.isArray(agentsId) && !agentsId.includes(Meteor.userId())) { + if (Array.isArray(agentsId) && !agentsId.includes(Meteor.userId())) { return; } - events[response.type](response); }); - + const { responses } = await APIClient.v1.get('canned-responses.get'); + responses.forEach((response) => CannedResponse.insert(response)); c.stop(); + } catch (error) { + console.log(error); } }); });