[FIX][APPS] Action buttons not removed when app is disabled or uninst…

…alled (#24107)
RocketChat · Jan 5, 2022 · bf6878e · bf6878e
1 parent fc9c193
commit bf6878e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/app/apps/client/communication/websockets.js b/app/apps/client/communication/websockets.js
@@ -38,7 +38,7 @@ export class AppWebsocketReceiver extends Emitter {
 		this.streamer.on(AppEvents.COMMAND_UPDATED, this.onCommandAddedOrUpdated);
 		this.streamer.on(AppEvents.COMMAND_REMOVED, this.onCommandRemovedOrDisabled);
 		this.streamer.on(AppEvents.COMMAND_DISABLED, this.onCommandRemovedOrDisabled);
-		this.streamer.on(AppEvents.COMMAND_DISABLED, this.onActionsChanged);
+		this.streamer.on(AppEvents.ACTIONS_CHANGED, this.onActionsChanged);
 	}
 
 	registerListener(event, listener) {

diff --git a/app/ui-utils/client/lib/MessageAction.js b/app/ui-utils/client/lib/MessageAction.js
@@ -70,6 +70,8 @@ export const MessageAction = new (class {
 		return Tracker.nonreactive(() => {
 			const btns = this.buttons.get();
 			delete btns[id];
+			mem.clear(this._getButtons);
+			mem.clear(this._getButtonsByGroup);
 			return this.buttons.set(btns);
 		});
 	}
@@ -79,6 +81,8 @@ export const MessageAction = new (class {
 			const btns = this.buttons.get();
 			if (btns[id]) {
 				btns[id] = _.extend(btns[id], config);
+				mem.clear(this._getButtons);
+				mem.clear(this._getButtonsByGroup);
 				return this.buttons.set(btns);
 			}
 		});

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -174,7 +174,7 @@
 		"@nivo/heatmap": "0.73.0",
 		"@nivo/line": "0.62.0",
 		"@nivo/pie": "0.73.0",
-		"@rocket.chat/apps-engine": "^1.29.0",
+		"@rocket.chat/apps-engine": "^1.29.1",
 		"@rocket.chat/css-in-js": "^0.31.0",
 		"@rocket.chat/emitter": "^0.31.0",
 		"@rocket.chat/fuselage": "^0.31.0",