Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't create a new RoomResource for the Room component, use the one from MatrixService #2173

Merged
merged 2 commits into from
Feb 19, 2025
Merged

Don't create a new RoomResource for the Room component, use the one from MatrixService #2173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1d6e1f
Don't create a new RoomResource for the Room component, use the one f…
lukemelia Feb 19, 2025
304b9ff
Lint fixes
lukemelia Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions packages/host/app/components/ai-assistant/panel.gts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,14 @@ export default class AiAssistantPanel extends Component<Signature> {
</div>
{{else if this.isReady}}
{{! below if statement is covered in 'isReady' check above but added due to glint not realizing it }}
{{#if this.matrixService.currentRoomId}}
<Room
@roomId={{this.matrixService.currentRoomId}}
@monacoSDK={{this.monacoSDK}}
/>
{{#if this.roomResource}}
{{#if this.matrixService.currentRoomId}}
<Room
@roomId={{this.matrixService.currentRoomId}}
@roomResource={{this.roomResource}}
@monacoSDK={{this.monacoSDK}}
/>
{{/if}}
{{/if}}
{{else}}
<LoadingIndicator
Expand Down
28 changes: 12 additions & 16 deletions packages/host/app/components/matrix/room.gts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import UpdateSkillActivationCommand from '@cardstack/host/commands/update-skill-
import { Message } from '@cardstack/host/lib/matrix-classes/message';
import type { StackItem } from '@cardstack/host/lib/stack-item';
import { getAutoAttachment } from '@cardstack/host/resources/auto-attached-card';
import { getRoom } from '@cardstack/host/resources/room';
import { RoomResource } from '@cardstack/host/resources/room';

import type CardService from '@cardstack/host/services/card-service';
import type CommandService from '@cardstack/host/services/command-service';
Expand Down Expand Up @@ -67,6 +67,7 @@ import type { Skill } from '../ai-assistant/skill-menu';
interface Signature {
Args: {
roomId: string;
roomResource: RoomResource;
monacoSDK: MonacoSDK;
};
}
Expand All @@ -78,7 +79,7 @@ export default class Room extends Component<Signature> {
class='room'
data-room-settled={{this.doWhenRoomChanges.isIdle}}
data-test-room-settled={{this.doWhenRoomChanges.isIdle}}
data-test-room-name={{this.roomResource.name}}
data-test-room-name={{@roomResource.name}}
data-test-room={{@roomId}}
>
<AiAssistantConversation
Expand Down Expand Up @@ -149,10 +150,10 @@ export default class Room extends Component<Signature> {
@filesToAttach={{this.filesToAttach}}
/>
<LLMSelect
@selected={{this.roomResource.activeLLM}}
@onChange={{this.roomResource.activateLLM}}
@selected={{@roomResource.activeLLM}}
@onChange={{@roomResource.activateLLM}}
@options={{this.supportedLLMs}}
@disabled={{this.roomResource.isActivatingLLM}}
@disabled={{@roomResource.isActivatingLLM}}
/>
</div>
</div>
Expand Down Expand Up @@ -215,11 +216,6 @@ export default class Room extends Component<Signature> {
@service private declare operatorModeStateService: OperatorModeStateService;
@service private declare loaderService: LoaderService;

private roomResource = getRoom(
this,
() => this.args.roomId,
() => this.matrixService.getRoomData(this.args.roomId)?.events,
);
private autoAttachmentResource = getAutoAttachment(
this,
() => this.topMostStackItems,
Expand Down Expand Up @@ -515,25 +511,25 @@ export default class Room extends Component<Signature> {
};

private isDisplayingCode = (message: Message) => {
return this.roomResource?.isDisplayingCode(message);
return this.args.roomResource.isDisplayingCode(message);
};

private toggleViewCode = (message: Message) => {
this.roomResource.toggleViewCode(message);
this.args.roomResource.toggleViewCode(message);
};

private doMatrixEventFlush = restartableTask(async () => {
await this.matrixService.flushMembership;
await this.matrixService.flushTimeline;
await this.roomResource.loading;
await this.args.roomResource.loading;
});

private get messages() {
return this.roomResource.messages;
return this.args.roomResource.messages;
}

private get skills(): Skill[] {
return this.roomResource.skills;
return this.args.roomResource.skills;
}

private get supportedLLMs(): string[] {
Expand All @@ -551,7 +547,7 @@ export default class Room extends Component<Signature> {
}

private get room() {
let room = this.roomResource.matrixRoom;
let room = this.args.roomResource.matrixRoom;
return room;
}

Expand Down