From 1dd51c0b4fa76ec01e9aa499fc400a9dfaf002b7 Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Sat, 24 Jun 2023 00:35:42 -0300 Subject: [PATCH] feat: add `tmid` to UiKit interaction block action (#29639) Co-authored-by: Guilherme Gazzo Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- apps/meteor/app/ui-message/client/ActionManager.js | 3 ++- apps/meteor/ee/server/apps/communication/uikit.ts | 2 ++ apps/meteor/package.json | 2 +- yarn.lock | 10 +++++----- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/meteor/app/ui-message/client/ActionManager.js b/apps/meteor/app/ui-message/client/ActionManager.js index 0f3d356204ec..6e2aadd1babe 100644 --- a/apps/meteor/app/ui-message/client/ActionManager.js +++ b/apps/meteor/app/ui-message/client/ActionManager.js @@ -160,7 +160,7 @@ const handlePayloadUserInteraction = (type, { /* appId,*/ triggerId, ...data }) return UIKitInteractionTypes.MODAL_ClOSE; }; -export const triggerAction = async ({ type, actionId, appId, rid, mid, viewId, container, ...rest }) => +export const triggerAction = async ({ type, actionId, appId, rid, mid, viewId, container, tmid, ...rest }) => new Promise(async (resolve, reject) => { const triggerId = generateTriggerId(appId); @@ -177,6 +177,7 @@ export const triggerAction = async ({ type, actionId, appId, rid, mid, viewId, c container, mid, rid, + tmid, triggerId, viewId, }); diff --git a/apps/meteor/ee/server/apps/communication/uikit.ts b/apps/meteor/ee/server/apps/communication/uikit.ts index 5b760c842397..a3362e929427 100644 --- a/apps/meteor/ee/server/apps/communication/uikit.ts +++ b/apps/meteor/ee/server/apps/communication/uikit.ts @@ -283,6 +283,7 @@ const appsRoutes = triggerId, rid, mid, + tmid, payload: { context, message: msgText }, } = req.body; @@ -298,6 +299,7 @@ const appsRoutes = user, room, message, + tmid, payload: { context, ...(msgText && { message: msgText }), diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 0b1f19e2b46f..726ddd56e118 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -219,7 +219,7 @@ "@rocket.chat/account-utils": "workspace:^", "@rocket.chat/agenda": "workspace:^", "@rocket.chat/api-client": "workspace:^", - "@rocket.chat/apps-engine": "1.40.0-alpha.275", + "@rocket.chat/apps-engine": "1.40.0-alpha.280", "@rocket.chat/base64": "workspace:^", "@rocket.chat/cas-validate": "workspace:^", "@rocket.chat/core-services": "workspace:^", diff --git a/yarn.lock b/yarn.lock index 16905a0516b0..ce4fd467ba94 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9354,9 +9354,9 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/apps-engine@npm:1.40.0-alpha.275": - version: 1.40.0-alpha.275 - resolution: "@rocket.chat/apps-engine@npm:1.40.0-alpha.275" +"@rocket.chat/apps-engine@npm:1.40.0-alpha.280": + version: 1.40.0-alpha.280 + resolution: "@rocket.chat/apps-engine@npm:1.40.0-alpha.280" dependencies: adm-zip: ^0.5.9 cryptiles: ^4.1.3 @@ -9368,7 +9368,7 @@ __metadata: vm2: ^3.9.19 peerDependencies: "@rocket.chat/ui-kit": "*" - checksum: 77a4ad45c409397a7a8b1ef4ee2db67af75aa7a1f8a078cc59bc69681e8338ed90a110dfc279a46dc84d6bc93e4e43880ec1620a73837a6a9dcccbe055a51212 + checksum: e52495051a4f245ee04794a88df6f0c771f16367448290a8e83603ddc9341585d62699c84e829515ca43afe3e19135d38b205019a3ad611e7cbcbe45e5de978e languageName: node linkType: hard @@ -10113,7 +10113,7 @@ __metadata: "@rocket.chat/account-utils": "workspace:^" "@rocket.chat/agenda": "workspace:^" "@rocket.chat/api-client": "workspace:^" - "@rocket.chat/apps-engine": 1.40.0-alpha.275 + "@rocket.chat/apps-engine": 1.40.0-alpha.280 "@rocket.chat/base64": "workspace:^" "@rocket.chat/cas-validate": "workspace:^" "@rocket.chat/core-services": "workspace:^"