fix: make url in topic in room intro clickable (#30686)

* fix: make url in topic in room intro clickable

* chore: remove extra line

* refactor: use tag instead variable

* test: add topic tests

* fix: update i18n key

test/unit-tests/components/views/rooms/NewRoomIntro-test.tsx

@@ -9,16 +9,24 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import { render, screen } from "jest-matrix-react";
-import { type MatrixClient, Room } from "matrix-js-sdk/src/matrix";
+import { EventTimeline, type MatrixClient, Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { LocalRoom } from "../../../../../src/models/LocalRoom";
-import { filterConsole, mkRoomMemberJoinEvent, mkThirdPartyInviteEvent, stubClient } from "../../../../test-utils";
+import {
+    filterConsole,
+    mkEvent,
+    mkRoomMemberJoinEvent,
+    mkThirdPartyInviteEvent,
+    stubClient,
+} from "../../../../test-utils";
 import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
 import NewRoomIntro from "../../../../../src/components/views/rooms/NewRoomIntro";
 import { type IRoomState } from "../../../../../src/components/structures/RoomView";
 import DMRoomMap from "../../../../../src/utils/DMRoomMap";
 import { DirectoryMember } from "../../../../../src/utils/direct-messages";
 import { ScopedRoomContextProvider } from "../../../../../src/contexts/ScopedRoomContext.tsx";
+import defaultDispatcher from "../../../../../src/dispatcher/dispatcher";
 
 const renderNewRoomIntro = (client: MatrixClient, room: Room | LocalRoom) => {
     render(
@@ -37,11 +45,15 @@ describe("NewRoomIntro", () => {
 
     filterConsole("Room !room:example.com does not have an m.room.create event");
 
-    beforeAll(() => {
+    beforeEach(() => {
         client = stubClient();
         DMRoomMap.makeShared(client);
     });
 
+    afterEach(() => {
+        jest.resetAllMocks();
+    });
+
     describe("for a DM Room", () => {
         beforeEach(() => {
             jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(userId);
@@ -88,4 +100,62 @@ describe("NewRoomIntro", () => {
             screen.getByText((id, element) => element?.tagName === "SPAN" && element?.textContent === expected);
         });
     });
+
+    describe("topic", () => {
+        let room: Room;
+
+        beforeEach(() => {
+            room = new Room(roomId, client, userId);
+            room.getLiveTimeline()
+                .getState(EventTimeline.FORWARDS)
+                ?.setStateEvents([mkRoomMemberJoinEvent(client.getSafeUserId(), room.roomId)]);
+            jest.spyOn(DMRoomMap.shared(), "getRoomIds").mockReturnValue(new Set([room.roomId]));
+        });
+
+        function addTopicToRoom(topic: string) {
+            const topicEvent = mkEvent({
+                type: "m.room.topic",
+                room: roomId,
+                user: userId,
+                content: {
+                    topic,
+                },
+                ts: 123,
+                event: true,
+            });
+
+            room.addLiveEvents([topicEvent], { addToState: true });
+        }
+
+        it("should render the topic", () => {
+            addTopicToRoom("Test topic");
+            renderNewRoomIntro(client, room);
+            screen.getByText("Test topic");
+        });
+
+        it("should render a link in the topic", () => {
+            addTopicToRoom("This is a link: https://matrix.org/");
+            renderNewRoomIntro(client, room);
+            expect(screen.getByTestId("topic")).toMatchSnapshot();
+        });
+
+        it("should be able to add a topic", () => {
+            addTopicToRoom("Test topic");
+            jest.spyOn(room, "getMyMembership").mockReturnValue(KnownMembership.Join);
+            jest.spyOn(room.getLiveTimeline().getState(EventTimeline.FORWARDS)!, "maySendStateEvent").mockReturnValue(
+                true,
+            );
+            const spyDispatcher = jest.spyOn(defaultDispatcher, "dispatch");
+
+            renderNewRoomIntro(client, room);
+            screen.getByRole("button", { name: "edit" }).click();
+            expect(spyDispatcher).toHaveBeenCalledWith(
+                {
+                    action: "open_room_settings",
+                    room_id: room.roomId,
+                },
+                true,
+            );
+        });
+    });
 });

test/unit-tests/components/views/rooms/__snapshots__/NewRoomIntro-test.tsx.snap

@@ -0,0 +1,24 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`NewRoomIntro topic should render a link in the topic 1`] = `
+<p
+  data-testid="topic"
+>
+  <span>
+    Topic: 
+    <span
+      dir="auto"
+    >
+      This is a link: 
+      <a
+        class="linkified"
+        href="https://matrix.org/"
+        rel="noreferrer noopener"
+        target="_blank"
+      >
+        https://matrix.org/
+      </a>
+    </span>
+  </span>
+</p>
+`;