Regression: Fix incorrect imports of the Apps-Engine (#17695)

* Fix incorrect imports of the Apps-Engine * Update Apps-Engine dependency modifier
RocketChat · May 19, 2020 · d33d114 · d33d114
1 parent bbb3133
commit d33d114
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/app/livechat/server/lib/Helper.js b/app/livechat/server/lib/Helper.js
@@ -1,4 +1,3 @@
-import { AppInterface } from '@rocket.chat/apps-engine/server/compiler';
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import { MongoInternals } from 'meteor/mongo';
@@ -8,7 +7,7 @@ import { Livechat } from './Livechat';
 import { RoutingManager } from './RoutingManager';
 import { callbacks } from '../../../callbacks/server';
 import { settings } from '../../../settings';
-import { Apps } from '../../../apps/server';
+import { Apps, AppEvents } from '../../../apps/server';
 
 export const createLivechatRoom = (rid, name, guest, roomInfo = {}, extraData = {}) => {
 	check(rid, String);
@@ -45,7 +44,7 @@ export const createLivechatRoom = (rid, name, guest, roomInfo = {}, extraData =
 
 	const roomId = Rooms.insert(room);
 
-	Apps.getBridges().getListenerBridge().livechatEvent(AppInterface.IPostLivechatRoomStarted, room);
+	Apps.getBridges().getListenerBridge().livechatEvent(AppEvents.IPostLivechatRoomStarted, room);
 	callbacks.run('livechat.newRoom', room);
 	return roomId;
 };
@@ -167,7 +166,7 @@ export const removeAgentFromSubscription = (rid, { _id, username }) => {
 	Subscriptions.removeByRoomIdAndUserId(rid, _id);
 	Messages.createUserLeaveWithRoomIdAndUser(rid, { _id, username });
 
-	Apps.getBridges().getListenerBridge().livechatEvent(AppInterface.IPostLivechatAgentUnassigned, { room, user });
+	Apps.getBridges().getListenerBridge().livechatEvent(AppEvents.IPostLivechatAgentUnassigned, { room, user });
 };
 
 export const parseAgentCustomFields = (customFields) => {

diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
@@ -1,6 +1,5 @@
 import dns from 'dns';
 
-import { AppInterface } from '@rocket.chat/apps-engine/server/compiler';
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import { Random } from 'meteor/random';
@@ -38,7 +37,7 @@ import { updateMessage } from '../../../lib/server/functions/updateMessage';
 import { deleteMessage } from '../../../lib/server/functions/deleteMessage';
 import { FileUpload } from '../../../file-upload/server';
 import { normalizeTransferredByData, parseAgentCustomFields } from './Helper';
-import { Apps } from '../../../apps/server';
+import { Apps, AppEvents } from '../../../apps/server';
 
 export const Livechat = {
 	Analytics,
@@ -372,11 +371,11 @@ export const Livechat = {
 
 		Meteor.defer(() => {
 			/**
-			 * @deprecated the `AppInterface.ILivechatRoomClosedHandler` event will be removed
+			 * @deprecated the `AppEvents.ILivechatRoomClosedHandler` event will be removed
 			 * in the next major version of the Apps-Engine
 			 */
-			Apps.getBridges().getListenerBridge().livechatEvent(AppInterface.ILivechatRoomClosedHandler, room);
-			Apps.getBridges().getListenerBridge().livechatEvent(AppInterface.IPostLivechatRoomClosed, room);
+			Apps.getBridges().getListenerBridge().livechatEvent(AppEvents.ILivechatRoomClosedHandler, room);
+			Apps.getBridges().getListenerBridge().livechatEvent(AppEvents.IPostLivechatRoomClosed, room);
 			callbacks.run('livechat.closeRoom', room);
 		});
 

diff --git a/app/livechat/server/lib/RoutingManager.js b/app/livechat/server/lib/RoutingManager.js
@@ -1,4 +1,3 @@
-import { AppInterface } from '@rocket.chat/apps-engine/server/compiler';
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
@@ -12,7 +11,7 @@ import { createLivechatSubscription,
 } from './Helper';
 import { callbacks } from '../../../callbacks/server';
 import { LivechatRooms, Rooms, Messages, Users, LivechatInquiry } from '../../../models/server';
-import { Apps } from '../../../apps/server';
+import { Apps, AppEvents } from '../../../apps/server';
 
 export const RoutingManager = {
 	methodName: null,
@@ -81,7 +80,7 @@ export const RoutingManager = {
 		Messages.createCommandWithRoomIdAndUser('connected', rid, user);
 		dispatchAgentDelegated(rid, agent.agentId);
 
-		Apps.getBridges().getListenerBridge().livechatEvent(AppInterface.IPostLivechatAgentAssigned, { room, user });
+		Apps.getBridges().getListenerBridge().livechatEvent(AppEvents.IPostLivechatAgentAssigned, { room, user });
 		return inquiry;
 	},
 

diff --git a/package.json b/package.json
@@ -126,7 +126,7 @@
 		"@nivo/heatmap": "^0.61.0",
 		"@nivo/line": "^0.61.1",
 		"@nivo/pie": "^0.61.1",
-		"@rocket.chat/apps-engine": "^1.15.0-alpha.3394",
+		"@rocket.chat/apps-engine": "1.15.0-alpha.3394",
 		"@rocket.chat/fuselage": "^0.6.3-dev.45",
 		"@rocket.chat/fuselage-hooks": "^0.6.3-dev.35",
 		"@rocket.chat/fuselage-polyfills": "^0.6.3-dev.45",