Fix soft crash of room list when trying to open a room (#32864)

* fix: soft crash of room list trying to get item vm * test: add test to check roomMap recovery and cleared when needed
2026-03-20 14:36:58 +01:00
parent 8f01b2b3db
commit 9358096ac6
2 changed files with 79 additions and 6 deletions
@@ -180,6 +180,25 @@ describe("RoomListViewModel", () => {
            expect(disposeSpy1).toHaveBeenCalled();
            expect(disposeSpy2).toHaveBeenCalled();
        });
+
+        it("should clear roomsMap when space changes and repopulate with new rooms", () => {
+            viewModel = new RoomListViewModel({ client: matrixClient });
+
+            const newSpaceRoom = mkStubRoom("!spaceroom:server", "Space Room", matrixClient);
+
+            jest.spyOn(RoomListStoreV3.instance, "getSortedRoomsInActiveSpace").mockReturnValue({
+                spaceId: "!space:server",
+                rooms: [newSpaceRoom],
+            });
+            jest.spyOn(SpaceStore.instance, "getLastSelectedRoomIdForSpace").mockReturnValue(null);
+
+            RoomListStoreV3.instance.emit(RoomListStoreV3Event.ListsUpdate);
+
+            // New space room should be accessible
+            expect(() => viewModel.getRoomItemViewModel("!spaceroom:server")).not.toThrow();
+            // Old rooms from the home space should not be accessible
+            expect(() => viewModel.getRoomItemViewModel("!room1:server")).toThrow();
+        });
    });

    describe("Active room tracking", () => {
@@ -342,6 +361,49 @@ describe("RoomListViewModel", () => {
            }).toThrow();
        });

+        it("should not throw when requesting view model for a room removed from the list but still in roomsMap", () => {
+            viewModel = new RoomListViewModel({ client: matrixClient });
+
+            // Normal list update removes room2 from the list
+            jest.spyOn(RoomListStoreV3.instance, "getSortedRoomsInActiveSpace").mockReturnValue({
+                spaceId: "home",
+                rooms: [room1, room3],
+            });
+
+            RoomListStoreV3.instance.emit(RoomListStoreV3Event.ListsUpdate);
+
+            expect(() => viewModel.getRoomItemViewModel("!room2:server")).not.toThrow();
+        });
+
+        it("should throw when requesting view model for a room from old space after space change", () => {
+            viewModel = new RoomListViewModel({ client: matrixClient });
+
+            const spaceRoom = mkStubRoom("!newroom:server", "New Room", matrixClient);
+
+            // Space change: new space only has spaceRoom
+            jest.spyOn(RoomListStoreV3.instance, "getSortedRoomsInActiveSpace").mockReturnValue({
+                spaceId: "!space:server",
+                rooms: [spaceRoom],
+            });
+            jest.spyOn(SpaceStore.instance, "getLastSelectedRoomIdForSpace").mockReturnValue(null);
+
+            RoomListStoreV3.instance.emit(RoomListStoreV3Event.ListsUpdate);
+
+            expect(() => viewModel.getRoomItemViewModel("!room1:server")).toThrow(
+                "Room !room1:server not found in roomsMap",
+            );
+        });
+
+        it("should recover when roomsMap is stale but roomsResult has the room", () => {
+            viewModel = new RoomListViewModel({ client: matrixClient });
+
+            // Manually clear roomsMap to simulate stale cache, but keep roomsResult intact
+            (viewModel as any).roomsMap.clear();
+
+            // getRoomItemViewModel should retry by re-populating roomsMap from roomsResult
+            expect(() => viewModel.getRoomItemViewModel("!room1:server")).not.toThrow();
+        });
+
        it("should dispose view models for rooms no longer visible", () => {
            viewModel = new RoomListViewModel({ client: matrixClient });