Fix Sonar Cloud issues

Author: rbondesson

apps/web/src/components/structures/MessagePanel.tsx

@@ -367,11 +367,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
 
     /* get the DOM node representing the given event */
     public getNodeForEventId(eventId: string): HTMLElement | undefined {
-        if (!this.eventTiles) {
-            return undefined;
-        }
-
-        return this.eventTiles[eventId]?.ref?.current ?? undefined;
+        return this.getTileForEventId(eventId)?.ref?.current ?? undefined;
     }
 
     public getTileForEventId(eventId?: string): EventTileHandle | undefined {
@@ -968,7 +964,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
         return receiptsByEvent;
     }
 
-    private collectEventTile = (eventId: string, node: EventTileHandle): void => {
+    private readonly collectEventTile = (eventId: string, node: EventTileHandle): void => {
         this.eventTiles[eventId] = node;
     };
 

apps/web/src/viewmodels/room/timeline/event-tile/EventTileViewModel.ts

@@ -644,7 +644,7 @@ export class EventTileViewModel extends BaseViewModel<EventTileViewSnapshot, Eve
         if (this.currentCli && this.isListeningForUserTrust) {
             const entry = EventTileViewModel.cliTrustListenerRegistry.get(this.currentCli);
             entry?.listeners.delete(this.onUserVerificationChanged);
-            if (entry && entry.listeners.size === 0) {
+            if (entry?.listeners.size === 0) {
                 this.currentCli.off(CryptoEvent.UserTrustStatusChanged, entry.handler);
                 EventTileViewModel.cliTrustListenerRegistry.delete(this.currentCli);
             }
@@ -714,10 +714,10 @@ export class EventTileViewModel extends BaseViewModel<EventTileViewSnapshot, Eve
         const eventId = this.currentRoomThreadEventId;
         const listeners = eventId ? entry?.listenersByEventId.get(eventId) : undefined;
         listeners?.delete(this.onNewThread);
-        if (listeners && listeners.size === 0 && eventId) {
+        if (eventId && listeners?.size === 0) {
             entry?.listenersByEventId.delete(eventId);
         }
-        if (entry && entry.listenersByEventId.size === 0) {
+        if (entry?.listenersByEventId.size === 0) {
             this.currentRoom.off(ThreadEvent.New, entry.handler);
             EventTileViewModel.roomThreadListenerRegistry.delete(this.currentRoom);
         }

apps/web/test/unit-tests/components/views/rooms/EventTile/EventTile-test.tsx

@@ -181,7 +181,7 @@ describe("EventTile", () => {
 
     afterEach(() => {
         jest.spyOn(PinningUtils, "isPinned").mockReturnValue(false);
-        document.body.removeAttribute("data-whatinput");
+        delete document.body.dataset.whatinput;
     });
 
     describe("EventTile thread summary", () => {

apps/web/test/viewmodels/room/timeline/event-tile/EventTileViewModel-test.ts

@@ -57,6 +57,21 @@ jest.mock("../../../../../src/utils/EventRenderingUtils", () => ({
 const mockGetEventDisplayInfo = jest.requireMock("../../../../../src/utils/EventRenderingUtils")
     .getEventDisplayInfo as jest.Mock;
 
+function createTimestampedViewModel(
+    room: Room,
+    createViewModel: (overrides?: Partial<EventTileViewModelProps>) => EventTileViewModel,
+): EventTileViewModel {
+    const timestampedEvent = mkMessage({
+        room: room.roomId,
+        user: "@alice:example.org",
+        msg: "timestamped",
+        event: true,
+        ts: 123,
+    });
+
+    return createViewModel({ mxEvent: timestampedEvent });
+}
+
 describe("EventTileViewModel", () => {
     const ROOM_ID = "!roomId:example.org";
     let mxEvent: MatrixEvent;
@@ -455,20 +470,8 @@ describe("EventTileViewModel", () => {
     });
 
     describe("interaction state", () => {
-        function createTimestampedViewModel(): EventTileViewModel {
-            const timestampedEvent = mkMessage({
-                room: room.roomId,
-                user: "@alice:example.org",
-                msg: "timestamped",
-                event: true,
-                ts: 123,
-            });
-
-            return createViewModel({ mxEvent: timestampedEvent });
-        }
-
         it("shows and hides timestamps when hover changes", () => {
-            const vm = createTimestampedViewModel();
+            const vm = createTimestampedViewModel(room, createViewModel);
 
             expect(vm.getSnapshot().showTimestamp).toBe(false);
             expect(vm.getSnapshot().shouldRenderActionBar).toBe(false);
@@ -485,7 +488,7 @@ describe("EventTileViewModel", () => {
         });
 
         it("shows timestamps when focus enters the tile", () => {
-            const vm = createTimestampedViewModel();
+            const vm = createTimestampedViewModel(room, createViewModel);
 
             vm.onFocusEnter(false);
 
@@ -494,7 +497,7 @@ describe("EventTileViewModel", () => {
         });
 
         it("shows the action bar when focus enters via keyboard", () => {
-            const vm = createTimestampedViewModel();
+            const vm = createTimestampedViewModel(room, createViewModel);
 
             vm.onFocusEnter(true);
 
@@ -505,7 +508,7 @@ describe("EventTileViewModel", () => {
         });
 
         it("shows timestamps when the action bar is focused", () => {
-            const vm = createTimestampedViewModel();
+            const vm = createTimestampedViewModel(room, createViewModel);
 
             vm.onActionBarFocusChange(true, false);
 
@@ -515,7 +518,7 @@ describe("EventTileViewModel", () => {
         });
 
         it("keeps action bar focus in sync with the context menu state", () => {
-            const vm = createTimestampedViewModel();
+            const vm = createTimestampedViewModel(room, createViewModel);
 
             vm.onContextMenuOpen();
 
@@ -533,7 +536,7 @@ describe("EventTileViewModel", () => {
         });
 
         it("preserves keyboard-triggered action bar visibility when the context menu closes", () => {
-            const vm = createTimestampedViewModel();
+            const vm = createTimestampedViewModel(room, createViewModel);
 
             vm.onFocusEnter(true);
             vm.onContextMenuOpen();
@@ -546,7 +549,7 @@ describe("EventTileViewModel", () => {
         });
 
         it("applies focus enter and leave as a single VM transition", () => {
-            const vm = createTimestampedViewModel();
+            const vm = createTimestampedViewModel(room, createViewModel);
 
             vm.onFocusEnter(true);
 
@@ -562,7 +565,7 @@ describe("EventTileViewModel", () => {
         });
 
         it("resets hover when action bar focus is lost through the VM helper", () => {
-            const vm = createTimestampedViewModel();
+            const vm = createTimestampedViewModel(room, createViewModel);
 
             vm.setHover(true);
             vm.onActionBarFocusChange(true, true);
@@ -578,7 +581,7 @@ describe("EventTileViewModel", () => {
         });
 
         it("opens and closes the context menu through VM helpers", () => {
-            const vm = createTimestampedViewModel();
+            const vm = createTimestampedViewModel(room, createViewModel);
 
             vm.onContextMenuOpen();
 
@@ -594,7 +597,7 @@ describe("EventTileViewModel", () => {
         });
 
         it("stores and clears context menu state through VM command helpers", () => {
-            const vm = createTimestampedViewModel();
+            const vm = createTimestampedViewModel(room, createViewModel);
             const target = document.createElement("div");
 
             vm.openContextMenu({