feat(uikit): add room to some other interaction contexts

.changeset/angry-baboons-trade.md

@@ -0,0 +1,6 @@
+---
+'@rocket.chat/ui-kit': patch
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue that prevented BlockAction interactions from having room information when triggered in a ContextualBar surface

.changeset/tricky-kiwis-sit.md

@@ -0,0 +1,6 @@
+---
+'@rocket.chat/ui-kit': minor
+'@rocket.chat/meteor': minor
+---
+
+Adds support to room information on ViewSubmit and ViewClose events for ContextualBar surface

apps/meteor/client/uikit/hooks/useContextualBarContextValue.ts

@@ -21,13 +21,15 @@ type UseContextualBarContextValueParams = {
 			blockId?: string | undefined;
 		};
 	}>;
+	rid: string;
 };
 type UseContextualBarContextValueReturn = ContextType<typeof UiKitContext>;
 
 export const useContextualBarContextValue = ({
 	view,
 	values,
 	updateValues,
+	rid,
 }: UseContextualBarContextValueParams): UseContextualBarContextValueReturn => {
 	const actionManager = useUiKitActionManager();
 
@@ -53,6 +55,7 @@ export const useContextualBarContextValue = ({
 					blockId,
 					value,
 				},
+				rid,
 			});
 		},
 		updateState: ({ actionId, value, blockId = 'default' }) => {

apps/meteor/client/views/room/contextualBar/uikit/UiKitContextualBar.tsx

@@ -25,6 +25,7 @@ import { useContextualBarContextValue } from '../../../../uikit/hooks/useContext
 import { useUiKitActionManager } from '../../../../uikit/hooks/useUiKitActionManager';
 import { useUiKitView } from '../../../../uikit/hooks/useUiKitView';
 import { getButtonStyle } from '../../../modal/uikit/getButtonStyle';
+import { useRoom } from '../../contexts/RoomContext';
 
 type UiKitContextualBarProps = {
 	key: UiKit.ContextualBarView['id']; // force re-mount when viewId changes
@@ -34,7 +35,8 @@ type UiKitContextualBarProps = {
 const UiKitContextualBar = ({ initialView }: UiKitContextualBarProps): JSX.Element => {
 	const actionManager = useUiKitActionManager();
 	const { view, values, updateValues, state } = useUiKitView(initialView);
-	const contextValue = useContextualBarContextValue({ view, values, updateValues });
+	const room = useRoom();
+	const contextValue = useContextualBarContextValue({ view, values, updateValues, rid: room._id });
 
 	const { closeTab } = useRoomToolbox();
 
@@ -50,6 +52,7 @@ const UiKitContextualBar = ({ initialView }: UiKitContextualBarProps): JSX.Eleme
 				},
 			},
 			viewId: view.id,
+			rid: room._id,
 		});
 	});
 
@@ -66,6 +69,7 @@ const UiKitContextualBar = ({ initialView }: UiKitContextualBarProps): JSX.Eleme
 				},
 				isCleared: false,
 			},
+			rid: room._id,
 		});
 	});
 
@@ -82,6 +86,7 @@ const UiKitContextualBar = ({ initialView }: UiKitContextualBarProps): JSX.Eleme
 				},
 				isCleared: true,
 			},
+			rid: room._id,
 		});
 	});
 

apps/meteor/ee/server/apps/communication/uikit.ts

@@ -203,21 +203,20 @@ export class AppUIKitInteractionApi {
 	constructor(orch: IAppServerOrchestrator) {
 		this.orch = orch;
 
-		router.post('/:id', this.routeHandler);
+		router.post('/:id', this.routeHandler.bind(this));
 	}
 
-	private routeHandler = async (
+	private async routeHandler(
 		req: UiKitUserInteractionRequest,
 		res: Response<OperationResult<'POST', '/apps/ui.interaction/:id'> | { error: unknown }>,
-	): Promise<void> => {
+	): Promise<void> {
 		const { orch } = this;
 		const { id: appId } = req.params;
 
 		switch (req.body.type) {
 			case 'blockAction': {
-				const { type, actionId, triggerId, payload, container } = req.body;
+				const { type, actionId, triggerId, payload, container, rid } = req.body;
 				const mid = 'mid' in req.body ? req.body.mid : undefined;
-				const rid = 'rid' in req.body ? req.body.rid : undefined;
 
 				const { visitor } = req.body;
 				const user = orch.getConverters()?.get('users').convertToApp(req.user);
@@ -253,15 +252,18 @@ export class AppUIKitInteractionApi {
 			case 'viewClosed': {
 				const {
 					type,
+					rid,
 					payload: { view, isCleared },
 				} = req.body;
 
 				const user = orch.getConverters()?.get('users').convertToApp(req.user);
+				const room = rid ? await orch.getConverters()?.get('rooms').convertById(rid) : undefined;
 
 				const action = {
 					type,
 					appId,
 					user,
+					room,
 					payload: {
 						view,
 						isCleared,
@@ -280,9 +282,10 @@ export class AppUIKitInteractionApi {
 			}
 
 			case 'viewSubmit': {
-				const { type, actionId, triggerId, payload } = req.body;
+				const { type, actionId, triggerId, payload, rid } = req.body;
 
 				const user = orch.getConverters()?.get('users').convertToApp(req.user);
+				const room = rid ? await orch.getConverters()?.get('rooms').convertById(rid) : undefined;
 
 				const action = {
 					type,
@@ -291,6 +294,7 @@ export class AppUIKitInteractionApi {
 					triggerId,
 					payload,
 					user,
+					room,
 				};
 
 				try {
@@ -351,5 +355,5 @@ export class AppUIKitInteractionApi {
 		}
 
 		// TODO: validate payloads per type
-	};
+	}
 }