Fix message edition and reply when multiple rooms at displayed the same moment (#31280)
* feat: implement `ExtrasApi#setRoomIdsForSpace` * fix: message reply with multiple room views * fix: message edition when multiple rooms are displayed * test: check that the view room action is not dispatch when replying * test: check that the view room action is not dispatch when editing * refactor: use `ExtraApis#getVisibleRoomBySpaceKey` instead of `ExtraApis#setRoomIdsForSpace` * test: update tests to use `getVisibleRoomBySpaceKey`
This commit is contained in:
@@ -78,6 +78,8 @@ import MediaDeviceHandler, { MediaDeviceKindEnum } from "../../../../src/MediaDe
|
||||
import Modal, { type ComponentProps } from "../../../../src/Modal.tsx";
|
||||
import ErrorDialog from "../../../../src/components/views/dialogs/ErrorDialog.tsx";
|
||||
import * as pinnedEventHooks from "../../../../src/hooks/usePinnedEvents";
|
||||
import { TimelineRenderingType } from "../../../../src/contexts/RoomContext";
|
||||
import { ModuleApi } from "../../../../src/modules/Api";
|
||||
|
||||
// Used by group calls
|
||||
jest.spyOn(MediaDeviceHandler, "getDevices").mockResolvedValue({
|
||||
@@ -1006,4 +1008,52 @@ describe("RoomView", () => {
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
it("should not change room when editing event in a room displayed in module", async () => {
|
||||
const room2 = new Room("!room2:example.org", cli, "@alice:example.org");
|
||||
rooms.set(room2.roomId, room2);
|
||||
room.getMyMembership = jest.fn().mockReturnValue(KnownMembership.Join);
|
||||
room2.getMyMembership = jest.fn().mockReturnValue(KnownMembership.Join);
|
||||
|
||||
await mountRoomView();
|
||||
|
||||
// Mock the spaceStore activeSpace and ModuleApi setup
|
||||
jest.spyOn(stores.spaceStore, "activeSpace", "get").mockReturnValue("space1");
|
||||
// Mock that room2 is displayed in a module
|
||||
ModuleApi.instance.extras.getVisibleRoomBySpaceKey("space1", () => [room2.roomId]);
|
||||
|
||||
// Mock the roomViewStore method
|
||||
jest.spyOn(stores.roomViewStore, "isRoomDisplayedInModule").mockReturnValue(true);
|
||||
|
||||
// Create an event in room2 to edit
|
||||
const eventInRoom2 = new MatrixEvent({
|
||||
type: "m.room.message",
|
||||
event_id: "$edit-event:example.org",
|
||||
room_id: room2.roomId,
|
||||
sender: "@alice:example.org",
|
||||
content: {
|
||||
body: "Original message",
|
||||
msgtype: "m.text",
|
||||
},
|
||||
});
|
||||
|
||||
const dispatchSpy = jest.spyOn(defaultDispatcher, "dispatch");
|
||||
|
||||
// Dispatch EditEvent for event in room2 (which is displayed in module)
|
||||
defaultDispatcher.dispatch({
|
||||
action: Action.EditEvent,
|
||||
event: eventInRoom2,
|
||||
timelineRenderingType: TimelineRenderingType.Room,
|
||||
});
|
||||
|
||||
await flushPromises();
|
||||
|
||||
// Should not dispatch ViewRoom action since room2 is displayed in module
|
||||
expect(dispatchSpy).not.toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
action: Action.ViewRoom,
|
||||
room_id: room2.roomId,
|
||||
}),
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -18,6 +18,7 @@ import EventEmitter from "events";
|
||||
import { RoomViewStore } from "../../../src/stores/RoomViewStore";
|
||||
import { Action } from "../../../src/dispatcher/actions";
|
||||
import {
|
||||
flushPromises,
|
||||
getMockClientWithEventEmitter,
|
||||
setupAsyncStoreWithClient,
|
||||
untilDispatch,
|
||||
@@ -45,6 +46,7 @@ import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
|
||||
import MediaDeviceHandler, { MediaDeviceKindEnum } from "../../../src/MediaDeviceHandler";
|
||||
import { storeRoomAliasInCache } from "../../../src/RoomAliasCache.ts";
|
||||
import { type Call } from "../../../src/models/Call.ts";
|
||||
import { ModuleApi } from "../../../src/modules/Api";
|
||||
|
||||
jest.mock("../../../src/Modal");
|
||||
|
||||
@@ -201,6 +203,12 @@ describe("RoomViewStore", function () {
|
||||
// @ts-expect-error
|
||||
MockPosthogAnalytics.instance = stores._PosthogAnalytics;
|
||||
stores._SpaceStore = new MockSpaceStore();
|
||||
// Add activeSpace property to the mock
|
||||
Object.defineProperty(stores._SpaceStore, "activeSpace", {
|
||||
value: null,
|
||||
writable: true,
|
||||
configurable: true,
|
||||
});
|
||||
roomViewStore = new RoomViewStore(dis, stores);
|
||||
stores._RoomViewStore = roomViewStore;
|
||||
});
|
||||
@@ -351,6 +359,37 @@ describe("RoomViewStore", function () {
|
||||
},
|
||||
);
|
||||
|
||||
it("does not change room when replying to event in a room displayed in module", async () => {
|
||||
// Spy on dispatch to check later if ViewRoom was dispatched
|
||||
jest.spyOn(dis, "dispatch");
|
||||
|
||||
// Set up current room
|
||||
dis.dispatch({ action: Action.ViewRoom, room_id: roomId });
|
||||
await untilDispatch(Action.ActiveRoomChanged, dis);
|
||||
expect(roomViewStore.getRoomId()).toEqual(roomId);
|
||||
|
||||
ModuleApi.instance.extras.getVisibleRoomBySpaceKey("space1", () => [roomId, roomId2]);
|
||||
// @ts-ignore
|
||||
stores.spaceStore.activeSpace = "space1";
|
||||
|
||||
// Create reply event for roomId2 (which is displayed in module)
|
||||
const replyToEvent = {
|
||||
getRoomId: () => roomId2,
|
||||
};
|
||||
|
||||
// Dispatch reply_to_event - should not change room since roomId2 is in module
|
||||
dis.dispatch({ action: "reply_to_event", event: replyToEvent, context: TimelineRenderingType.Room });
|
||||
await flushPromises();
|
||||
|
||||
// Room should remain the same (roomId), not change to roomId2
|
||||
expect(dis.dispatch).not.toHaveBeenCalledWith({
|
||||
action: Action.ViewRoom,
|
||||
room_id: roomId2,
|
||||
replyingToEvent: replyToEvent,
|
||||
metricsTrigger: undefined,
|
||||
});
|
||||
});
|
||||
|
||||
it("removes the roomId on ViewHomePage", async () => {
|
||||
dis.dispatch({ action: Action.ViewRoom, room_id: roomId });
|
||||
await untilDispatch(Action.ActiveRoomChanged, dis);
|
||||
|
||||
Reference in New Issue
Block a user