New room list: video room and video call decoration (#29693)

* feat: add video call and EC call to room list item vm * feat: add video call notification decoration to notification decoration component * feat: add video call support to room list item view * feat: add new RoomAvatarView component * feat: deprecate `DecoratedRoomAvatar` * feat: use `RoomAvatarView` in room list item * feat: allow custom class for `RoomAvatar` * test: update notification decoration * test: update room list item view * test: update room list snapshot * test: add tests for room avatar vm * test: add tests for room avatar view * test(e2e): update snapshots * fix: video room creation rights * test: e2e add test for public and video room
2025-04-14 09:27:43 +00:00
parent 1430fd5af6
commit 07d5a72f26
35 changed files with 1257 additions and 278 deletions
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import { renderHook, waitFor, act } from "jest-matrix-react";
+import {
+    JoinRule,
+    type MatrixClient,
+    MatrixEvent,
+    type Room,
+    type RoomMember,
+    User,
+    UserEvent,
+} from "matrix-js-sdk/src/matrix";
+import { mocked } from "jest-mock";
+
+import { useRoomAvatarViewModel } from "../../../../../src/components/viewmodels/avatars/RoomAvatarViewModel";
+import { createTestClient, mkStubRoom } from "../../../../test-utils";
+import DMRoomMap from "../../../../../src/utils/DMRoomMap";
+import { getJoinedNonFunctionalMembers } from "../../../../../src/utils/room/getJoinedNonFunctionalMembers";
+import { isPresenceEnabled } from "../../../../../src/utils/presence";
+
+jest.mock("../../../../../src/utils/room/getJoinedNonFunctionalMembers", () => ({
+    getJoinedNonFunctionalMembers: jest.fn().mockReturnValue([]),
+}));
+
+jest.mock("../../../../../src/utils/presence", () => ({
+    isPresenceEnabled: jest.fn().mockReturnValue(false),
+}));
+
+describe("RoomAvatarViewModel", () => {
+    let matrixClient: MatrixClient;
+    let room: Room;
+
+    beforeEach(() => {
+        matrixClient = createTestClient();
+        room = mkStubRoom("roomId", "roomName", matrixClient);
+
+        DMRoomMap.makeShared(matrixClient);
+        jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(null);
+    });
+
+    it("should has hasDecoration to false", async () => {
+        const { result: vm } = renderHook(() => useRoomAvatarViewModel(room));
+        expect(vm.current.hasDecoration).toBe(false);
+    });
+
+    it("should has isVideoRoom set to true", () => {
+        jest.spyOn(room, "isCallRoom").mockReturnValue(true);
+        const { result: vm } = renderHook(() => useRoomAvatarViewModel(room));
+        expect(vm.current.isVideoRoom).toBe(true);
+        expect(vm.current.hasDecoration).toBe(true);
+    });
+
+    it("should has isPublic set to true", () => {
+        jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Public);
+
+        const { result: vm } = renderHook(() => useRoomAvatarViewModel(room));
+        expect(vm.current.isPublic).toBe(true);
+        expect(vm.current.hasDecoration).toBe(true);
+    });
+
+    describe("presence", () => {
+        let user: User;
+
+        beforeEach(() => {
+            jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue("userId");
+            mocked(getJoinedNonFunctionalMembers).mockReturnValue([{}, {}] as RoomMember[]);
+            mocked(isPresenceEnabled).mockReturnValue(true);
+
+            user = User.createUser("userId", matrixClient);
+            jest.spyOn(matrixClient, "getUser").mockReturnValue(user);
+        });
+
+        it("should has presence set to null", () => {
+            jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(null);
+
+            const { result: vm } = renderHook(() => useRoomAvatarViewModel(room));
+            expect(vm.current.presence).toBe(null);
+        });
+
+        it("should has online presence", async () => {
+            const { result: vm } = renderHook(() => useRoomAvatarViewModel(room));
+            expect(vm.current.presence).toBe("offline");
+
+            user.presence = "online";
+
+            await act(() => user.emit(UserEvent.Presence, new MatrixEvent(), user));
+            await waitFor(() => expect(vm.current.presence).toBe("online"));
+
+            user.currentlyActive = true;
+            user.presence = "offline";
+
+            await act(() => user.emit(UserEvent.CurrentlyActive, new MatrixEvent(), user));
+            await waitFor(() => expect(vm.current.presence).toBe("online"));
+        });
+
+        it("should has busy presence", async () => {
+            user.presence = "busy";
+            const { result: vm } = renderHook(() => useRoomAvatarViewModel(room));
+            expect(vm.current.presence).toBe("busy");
+        });
+
+        it("should has offline presence", async () => {
+            user.presence = "offline";
+            const { result: vm } = renderHook(() => useRoomAvatarViewModel(room));
+            expect(vm.current.presence).toBe("offline");
+        });
+
+        it("should has unavailable presence", async () => {
+            user.presence = "unavailable";
+            const { result: vm } = renderHook(() => useRoomAvatarViewModel(room));
+            expect(vm.current.presence).toBe("unavailable");
+        });
+
+        it("should has hasDecoration to true", async () => {
+            const { result: vm } = renderHook(() => useRoomAvatarViewModel(room));
+            expect(vm.current.hasDecoration).toBe(true);
+        });
+    });
+});
@@ -80,14 +80,6 @@ describe("useRoomListHeaderViewModel", () => {
        expect(result.current.canCreateRoom).toBe(true);
    });

-    it("should be displayComposeMenu=true if the user can creates video room", () => {
-        mocked(hasCreateRoomRights).mockReturnValue(false);
-        jest.spyOn(SettingsStore, "getValue").mockReturnValue(true);
-
-        const { result } = render();
-        expect(result.current.displayComposeMenu).toBe(true);
-    });
-
    it("should be displaySpaceMenu=true if the user is in a space", () => {
        jest.spyOn(SpaceStore.instance, "activeSpaceRoom", "get").mockReturnValue(space);
        const { result } = render();
@@ -118,8 +110,10 @@ describe("useRoomListHeaderViewModel", () => {
        expect(result.current.canAccessSpaceSettings).toBe(true);
    });

-    it("should be canCreateVideoRoom=true if feature_video_rooms is enabled", () => {
+    it("should be canCreateVideoRoom=true if feature_video_rooms is enabled and can create room", () => {
+        mocked(hasCreateRoomRights).mockReturnValue(true);
        jest.spyOn(SettingsStore, "getValue").mockReturnValue(true);
+
        const { result } = render();
        expect(result.current.canCreateVideoRoom).toBe(true);
    });