Track rid in ActionManager and pass to modals via props

Co-authored-by: d-gubert <1810309+d-gubert@users.noreply.github.com>

Author: Copilot

apps/meteor/app/ui-message/client/ActionManager.ts

@@ -23,24 +23,25 @@ export class ActionManager implements IActionManager {
 
 	protected events = new Emitter<{ busy: { busy: boolean }; [viewId: string]: any }>();
 
-	protected appIdByTriggerId = new Map<string, string | undefined>();
+	protected triggerIdInfo = new Map<string, { appId: string | undefined; rid: string | undefined }>();
 
 	protected viewInstances = new Map<
 		string,
 		{
 			payload?: {
 				view: UiKit.ContextualBarView;
 			};
+			rid?: string;
 			close: () => void;
 		}
 	>();
 
 	public constructor(protected router: ContextType<typeof RouterContext>) {}
 
 	protected invalidateTriggerId(id: string) {
-		const appId = this.appIdByTriggerId.get(id);
-		this.appIdByTriggerId.delete(id);
-		return appId;
+		const info = this.triggerIdInfo.get(id);
+		this.triggerIdInfo.delete(id);
+		return info;
 	}
 
 	public on(viewId: string, listener: (data: any) => void): void;
@@ -67,15 +68,20 @@ export class ActionManager implements IActionManager {
 		this.events.emit('busy', { busy: false });
 	}
 
-	public generateTriggerId(appId: string | undefined) {
+	public generateTriggerId(appId: string | undefined, rid?: string) {
 		const triggerId = Random.id();
-		this.appIdByTriggerId.set(triggerId, appId);
+		this.triggerIdInfo.set(triggerId, { appId, rid });
 		setTimeout(() => this.invalidateTriggerId(triggerId), ActionManager.TRIGGER_TIMEOUT);
 		return triggerId;
 	}
 
 	public async emitInteraction(appId: string, userInteraction: DistributiveOmit<UiKit.UserInteraction, 'triggerId'>) {
-		const triggerId = this.generateTriggerId(appId);
+		// Get rid from interaction, or fallback to the rid stored for the view
+		let rid = 'rid' in userInteraction ? userInteraction.rid : undefined;
+		if (!rid && 'viewId' in userInteraction && userInteraction.viewId) {
+			rid = this.getRidByViewId(userInteraction.viewId);
+		}
+		const triggerId = this.generateTriggerId(appId, rid);
 
 		return this.runWithTimeout(
 			async () => {
@@ -138,11 +144,13 @@ export class ActionManager implements IActionManager {
 	public handleServerInteraction(interaction: UiKit.ServerInteraction): UiKit.ServerInteraction['type'] | undefined {
 		const { triggerId } = interaction;
 
-		const appId = this.invalidateTriggerId(triggerId);
-		if (!appId) {
+		const triggerInfo = this.invalidateTriggerId(triggerId);
+		if (!triggerInfo?.appId) {
 			return;
 		}
 
+		const { rid } = triggerInfo;
+
 		switch (interaction.type) {
 			case 'errors': {
 				const { type, triggerId, viewId, appId, errors } = interaction;
@@ -158,7 +166,7 @@ export class ActionManager implements IActionManager {
 
 			case 'modal.open': {
 				const { view } = interaction;
-				this.openModal(view);
+				this.openModal(view, rid);
 				break;
 			}
 
@@ -230,6 +238,10 @@ export class ActionManager implements IActionManager {
 		return this.viewInstances.get(viewId)?.payload;
 	}
 
+	public getRidByViewId(viewId: string) {
+		return this.viewInstances.get(viewId)?.rid;
+	}
+
 	public openView(surface: 'modal', view: UiKit.ModalView): void;
 
 	public openView(surface: 'banner', view: UiKit.BannerView): void;
@@ -252,16 +264,18 @@ export class ActionManager implements IActionManager {
 		}
 	}
 
-	private openModal(view: UiKit.ModalView) {
+	private openModal(view: UiKit.ModalView, rid?: string) {
 		const instance = imperativeModal.open({
 			component: UiKitModal,
 			props: {
 				key: view.id,
 				initialView: view,
+				rid,
 			},
 		});
 
 		this.viewInstances.set(view.id, {
+			rid,
 			close: () => {
 				instance.close();
 				this.viewInstances.delete(view.id);

apps/meteor/client/views/modal/uikit/UiKitModal.tsx

@@ -3,25 +3,23 @@ import { UiKitContext } from '@rocket.chat/fuselage-ui-kit';
 import { MarkupInteractionContext } from '@rocket.chat/gazzodown';
 import type * as UiKit from '@rocket.chat/ui-kit';
 import type { FormEvent } from 'react';
-import { useContext } from 'react';
 
 import ModalBlock from './ModalBlock';
 import { detectEmoji } from '../../../lib/utils/detectEmoji';
 import { preventSyntheticEvent } from '../../../lib/utils/preventSyntheticEvent';
 import { useModalContextValue } from '../../../uikit/hooks/useModalContextValue';
 import { useUiKitActionManager } from '../../../uikit/hooks/useUiKitActionManager';
 import { useUiKitView } from '../../../uikit/hooks/useUiKitView';
-import { RoomContext } from '../../room/contexts/RoomContext';
 
 type UiKitModalProps = {
 	key: UiKit.ModalView['id']; // force re-mount when viewId changes
 	initialView: UiKit.ModalView;
+	rid?: string;
 };
 
-const UiKitModal = ({ initialView }: UiKitModalProps) => {
+const UiKitModal = ({ initialView, rid }: UiKitModalProps) => {
 	const actionManager = useUiKitActionManager();
 	const { view, errors, values, updateValues, state } = useUiKitView(initialView);
-	const rid = useContext(RoomContext)?.rid;
 	const contextValue = useModalContextValue({ view, errors, values, updateValues, rid });
 
 	const handleSubmit = useEffectEvent((e: FormEvent) => {

packages/ui-contexts/src/ActionManagerContext.ts

@@ -12,14 +12,15 @@ export interface IActionManager {
 	off(eventName: 'busy', listener: ({ busy }: { busy: boolean }) => void): void;
 	notifyBusy(): void;
 	notifyIdle(): void;
-	generateTriggerId(appId: string | undefined): string;
+	generateTriggerId(appId: string | undefined, rid?: string): string;
 	emitInteraction(appId: string, userInteraction: DistributiveOmit<UiKit.UserInteraction, 'triggerId'>): Promise<void>;
 	handleServerInteraction(interaction: UiKit.ServerInteraction): UiKit.ServerInteraction['type'] | undefined;
 	getInteractionPayloadByViewId(viewId: UiKit.ContextualBarView['id']):
 		| {
 				view: UiKit.ContextualBarView;
 		  }
 		| undefined;
+	getRidByViewId(viewId: string): string | undefined;
 	openView(surface: 'modal', view: UiKit.ModalView): void;
 	openView(surface: 'banner', view: UiKit.BannerView): void;
 	openView(surface: 'contextual_bar', view: UiKit.ContextualBarView): void;