From 6eda85c56d865b5d5d35ed1332a4109d5d6aa1d1 Mon Sep 17 00:00:00 2001 From: Kristina Fefelova Date: Fri, 15 Nov 2024 15:27:56 +0400 Subject: [PATCH] Fix format Signed-off-by: Kristina Fefelova --- models/survey/src/index.ts | 2 +- plugins/chunter-resources/src/components/Channel.svelte | 7 ++----- plugins/love-resources/src/components/RoomPopup.svelte | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/models/survey/src/index.ts b/models/survey/src/index.ts index 463f900239..66dec5a80d 100644 --- a/models/survey/src/index.ts +++ b/models/survey/src/index.ts @@ -137,7 +137,7 @@ export function createModel (builder: Builder): void { builder.createDoc(activity.class.ActivityExtension, core.space.Model, { ofClass: survey.class.Poll, - components: { input: chunter.component.ChatMessageInput } + components: { input: { component: chunter.component.ChatMessageInput } } }) builder.mixin(survey.class.Poll, core.class.Class, view.mixin.CollectionEditor, { diff --git a/plugins/chunter-resources/src/components/Channel.svelte b/plugins/chunter-resources/src/components/Channel.svelte index 3eaa23bb45..195f3d1c23 100644 --- a/plugins/chunter-resources/src/components/Channel.svelte +++ b/plugins/chunter-resources/src/components/Channel.svelte @@ -72,9 +72,6 @@ async function updateDataProvider (attachedTo: Ref, selectedMessageId?: Ref): Promise { if (dataProvider === undefined) { - // For now loading all messages for documents with activity. Need to correct handle aggregation with pagination. - // Perhaps we should load all activity messages once, and keep loading in chunks only for ChatMessages then merge them correctly with activity messages - const loadAll = isDocChannel const ctx = context ?? (await client.findOne(notification.class.DocNotifyContext, { @@ -90,7 +87,7 @@ attachedTo, activity.class.ActivityMessage, selectedMessageId, - loadAll, + false, hasRefs, collection ) @@ -112,7 +109,7 @@ provider={dataProvider} {freeze} {autofocus} - loadMoreAllowed={!isDocChannel} + loadMoreAllowed {withInput} {readonly} {onReply} diff --git a/plugins/love-resources/src/components/RoomPopup.svelte b/plugins/love-resources/src/components/RoomPopup.svelte index 5128d28989..52f3cf6bbc 100644 --- a/plugins/love-resources/src/components/RoomPopup.svelte +++ b/plugins/love-resources/src/components/RoomPopup.svelte @@ -152,7 +152,6 @@ return _id !== meetingMinutes._id } -