chore: Bump collab (#5136)

* chore: bump collab

* chore: bump collab

* chore: bump collab

* chore: fix test

* chore: disable supabse test
This commit is contained in:
Nathan.fooo
2024-04-15 14:50:28 +08:00
committed by GitHub
parent e9e483291e
commit d758e62c1a
41 changed files with 633 additions and 232 deletions

View File

@ -16,7 +16,7 @@ use crate::util::{
folder_not_init_error, insert_parent_child_views, workspace_data_not_sync_error,
};
use crate::view_operation::{create_view, FolderOperationHandler, FolderOperationHandlers};
use collab::core::collab::{DocStateSource, MutexCollab};
use collab::core::collab::{DataSource, MutexCollab};
use collab_entity::CollabType;
use collab_folder::error::FolderError;
use collab_folder::{
@ -167,7 +167,7 @@ impl FolderManager {
uid: i64,
workspace_id: &str,
collab_db: Weak<CollabKVDB>,
doc_state: DocStateSource,
doc_state: DataSource,
folder_notifier: T,
) -> Result<Folder, FlowyError> {
let folder_notifier = folder_notifier.into();
@ -212,7 +212,7 @@ impl FolderManager {
workspace_id,
CollabType::Folder,
collab_db,
DocStateSource::FromDisk,
DataSource::Disk,
CollabPersistenceConfig::new()
.enable_snapshot(true)
.snapshot_per_update(50),

View File

@ -8,7 +8,7 @@ use collab_integrate::CollabKVDB;
use flowy_error::{FlowyError, FlowyResult};
use collab::core::collab::DocStateSource;
use collab::core::collab::DataSource;
use std::sync::{Arc, Weak};
use crate::manager::{FolderInitDataSource, FolderManager};
@ -60,7 +60,7 @@ impl FolderManager {
uid,
&workspace_id,
collab_db,
DocStateSource::FromDisk,
DataSource::Disk,
folder_notifier,
)
.await?
@ -84,7 +84,7 @@ impl FolderManager {
uid,
&workspace_id,
collab_db.clone(),
DocStateSource::FromDocState(doc_state),
DataSource::DocStateV1(doc_state),
folder_notifier.clone(),
)
.await?
@ -98,7 +98,7 @@ impl FolderManager {
uid,
&workspace_id,
collab_db,
DocStateSource::FromDisk,
DataSource::Disk,
folder_notifier,
)
.await?
@ -109,7 +109,7 @@ impl FolderManager {
uid,
&workspace_id,
collab_db.clone(),
DocStateSource::FromDocState(doc_state),
DataSource::DocStateV1(doc_state),
folder_notifier.clone(),
)
.await?