Revert unnecessary updates

Author: FadhlanR

packages/host/app/components/matrix/room.gts

@@ -29,7 +29,7 @@ import { TrackedObject, TrackedSet } from 'tracked-built-ins';
 import { v4 as uuidv4 } from 'uuid';
 
 import { BoxelButton, LoadingIndicator } from '@cardstack/boxel-ui/components';
-import { eq, not, or } from '@cardstack/boxel-ui/helpers';
+import { and, eq, not, or } from '@cardstack/boxel-ui/helpers';
 
 import {
   type getCard,
@@ -87,8 +87,14 @@ export default class Room extends Component<Signature> {
     {{#if (not this.doMatrixEventFlush.isRunning)}}
       <section
         class='room'
-        data-room-settled={{this.doWhenRoomChanges.isIdle}}
-        data-test-room-settled={{this.doWhenRoomChanges.isIdle}}
+        data-room-settled={{(and
+          this.doWhenRoomChanges.isIdle
+          (not this.matrixService.isLoadingTimeline)
+        )}}
+        data-test-room-settled={{(and
+          this.doWhenRoomChanges.isIdle
+          (not this.matrixService.isLoadingTimeline)
+        )}}
         data-test-room-name={{@roomResource.name}}
         data-test-room={{@roomId}}
       >

packages/host/app/services/matrix-service.ts

@@ -200,6 +200,7 @@ export default class MatrixService extends Service {
     this._currentRoomId = value;
     if (value) {
       this.loadAllTimelineEvents.perform(value);
+      window.localStorage.setItem(CurrentRoomIdPersistenceKey, value);
     } else {
       window.localStorage.removeItem(CurrentRoomIdPersistenceKey);
     }
@@ -1226,8 +1227,9 @@ export default class MatrixService extends Service {
   private loadAllTimelineEvents = restartableTask(async (roomId: string) => {
     let roomData = this.ensureRoomData(roomId);
     let room = this.client.getRoom(roomId);
+    let roomResource = this.roomResources.get(roomId);
 
-    if (!room) {
+    if (!room || !roomResource) {
       throw new Error(`Cannot find room with id ${roomId}`);
     }
 
@@ -1245,34 +1247,15 @@ export default class MatrixService extends Service {
         }
       }
 
-      let startTime = Date.now();
-      let checkCount = 0;
-
+      // Wait for all events to be loaded in roomResource
       let timeline = room.getLiveTimeline();
       let events = timeline.getEvents();
       await new Promise<void>((resolve) => {
         let checkEvents = () => {
-          checkCount++;
-          let elapsedTime = Date.now() - startTime;
           let allEventsConsumed = events.every((event) =>
             roomData.events.some((e) => e.event_id === event.getId()),
           );
-
-          console.log(
-            `[Matrix Service] Waiting for events... (${elapsedTime}ms, attempt ${checkCount})`,
-            `\n  - Events to consume: ${events.length}`,
-            `\n  - Events consumed: ${
-              events.filter((event) =>
-                roomData.events.some((e) => e.event_id === event.getId()),
-              ).length
-            }`,
-            `\n  - All consumed: ${allEventsConsumed}`,
-          );
-
           if (allEventsConsumed) {
-            console.log(
-              `[Matrix Service] All events consumed after ${elapsedTime}ms and ${checkCount} checks`,
-            );
             resolve();
           } else {
             setTimeout(checkEvents, 100);
@@ -1281,6 +1264,7 @@ export default class MatrixService extends Service {
 
         checkEvents();
       });
+      await this.roomResources.get(roomId)?.loading;
     } finally {
       this.timelineLoadingState.set(roomId, false);
     }

packages/host/tests/acceptance/ai-assistant-test.gts

@@ -183,7 +183,7 @@ module('Acceptance | AI Assistant tests', function (hooks) {
       ],
     });
     await click('[data-test-open-ai-assistant]');
-    await waitFor('[data-test-message-field]');
+    await waitFor(`[data-room-settled]`);
     const testCard = `${testRealmURL}Person/hassan`;
 
     for (let i = 1; i <= 3; i++) {
@@ -261,7 +261,7 @@ module('Acceptance | AI Assistant tests', function (hooks) {
       ],
     });
     await click('[data-test-open-ai-assistant]');
-
+    await waitFor(`[data-room-settled]`);
     assert
       .dom('[data-test-llm-select-selected]')
       .hasText(DEFAULT_LLM.split('/')[1]);
@@ -293,6 +293,7 @@ module('Acceptance | AI Assistant tests', function (hooks) {
     });
 
     await click('[data-test-open-ai-assistant]');
+    await waitFor(`[data-room-settled]`);
     await click('[data-test-submode-switcher] button');
     await click('[data-test-boxel-menu-item-text="Code"]');
     assert.dom('[data-test-llm-select-selected]').hasText('claude-3.5-sonnet');
@@ -326,6 +327,7 @@ module('Acceptance | AI Assistant tests', function (hooks) {
       '[data-test-cards-grid-item="http://test-realm/test/Person/fadhlan"]',
     );
     await click('[data-test-open-ai-assistant]');
+    await waitFor(`[data-room-settled]`);
     assert.dom('[data-test-autoattached-file]').doesNotExist();
     assert.dom('[data-test-autoattached-card]').exists();
     await click('[data-test-submode-switcher] > [data-test-boxel-button]');
@@ -348,6 +350,7 @@ module('Acceptance | AI Assistant tests', function (hooks) {
     });
 
     await click('[data-test-open-ai-assistant]');
+    await waitFor(`[data-room-settled]`);
     assert.dom('[data-test-choose-file-btn]').hasText('Attach File');
 
     await click('[data-test-choose-file-btn]');
@@ -412,6 +415,7 @@ module('Acceptance | AI Assistant tests', function (hooks) {
       ],
     });
     await click('[data-test-open-ai-assistant]');
+    await waitFor(`[data-room-settled]`);
     assert.dom('[data-test-choose-file-btn]').hasText('Attach File');
 
     await click('[data-test-file="person.gts"]');
@@ -453,6 +457,7 @@ module('Acceptance | AI Assistant tests', function (hooks) {
     });
 
     await click('[data-test-open-ai-assistant]');
+    await waitFor(`[data-room-settled]`);
     await click('[data-test-past-sessions-button]');
 
     assert.dom('[data-test-past-sessions]').exists();