Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
chore: bump collab (#4224)
Nathan.fooof5db384fc221
diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lockindex b963afbaaa..fd30309c55 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.lock+++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock@@ -883,7 +883,7 @@ dependencies = [[[package]]name = "collab"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["anyhow","async-trait",@@ -902,7 +902,7 @@ dependencies = [[[package]]name = "collab-database"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["anyhow","async-trait",@@ -932,7 +932,7 @@ dependencies = [[[package]]name = "collab-derive"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["proc-macro2","quote",@@ -944,7 +944,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["anyhow","collab",@@ -963,7 +963,7 @@ dependencies = [[[package]]name = "collab-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["anyhow","bytes",@@ -977,7 +977,7 @@ dependencies = [[[package]]name = "collab-folder"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["anyhow","chrono",@@ -1019,7 +1019,7 @@ dependencies = [[[package]]name = "collab-persistence"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["anyhow","async-trait",@@ -1040,7 +1040,7 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["anyhow","async-trait",@@ -1066,7 +1066,7 @@ dependencies = [[[package]]name = "collab-user"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["anyhow","collab",diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.tomlindex af7759ba7b..a3d4fdb0bb 100644--- a/frontend/appflowy_tauri/src-tauri/Cargo.toml+++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml@@ -67,14 +67,14 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "a45# To switch to the local path, run:# scripts/tool/update_collab_source.sh# ⚠️⚠️⚠️️-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d5324139e6450e32246520416af768202f544869" }-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d5324139e6450e32246520416af768202f544869" }-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d5324139e6450e32246520416af768202f544869" }-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d5324139e6450e32246520416af768202f544869" }-collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d5324139e6450e32246520416af768202f544869" }-collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d5324139e6450e32246520416af768202f544869" }-collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d5324139e6450e32246520416af768202f544869" }-collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d5324139e6450e32246520416af768202f544869" }+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c74b3c3fe500305cc114a06fce911be9269b61bd" }+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c74b3c3fe500305cc114a06fce911be9269b61bd" }+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c74b3c3fe500305cc114a06fce911be9269b61bd" }+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c74b3c3fe500305cc114a06fce911be9269b61bd" }+collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c74b3c3fe500305cc114a06fce911be9269b61bd" }+collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c74b3c3fe500305cc114a06fce911be9269b61bd" }+collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c74b3c3fe500305cc114a06fce911be9269b61bd" }+collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c74b3c3fe500305cc114a06fce911be9269b61bd" }diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lockindex fb8c99bd5a..b61fa16ff0 100644--- a/frontend/rust-lib/Cargo.lock+++ b/frontend/rust-lib/Cargo.lock@@ -733,7 +733,7 @@ dependencies = [[[package]]name = "collab"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["anyhow","async-trait",@@ -752,7 +752,7 @@ dependencies = [[[package]]name = "collab-database"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["anyhow","async-trait",@@ -782,7 +782,7 @@ dependencies = [[[package]]name = "collab-derive"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["proc-macro2","quote",@@ -794,7 +794,7 @@ dependencies = [[[package]]name = "collab-document"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["anyhow","collab",@@ -813,7 +813,7 @@ dependencies = [[[package]]name = "collab-entity"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["anyhow","bytes",@@ -827,7 +827,7 @@ dependencies = [[[package]]name = "collab-folder"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["anyhow","chrono",@@ -869,7 +869,7 @@ dependencies = [[[package]]name = "collab-persistence"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["anyhow","async-trait",@@ -890,7 +890,7 @@ dependencies = [[[package]]name = "collab-plugins"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["anyhow","async-trait",@@ -916,7 +916,7 @@ dependencies = [[[package]]name = "collab-user"version = "0.1.0"-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=d5324139e6450e32246520416af768202f544869#d5324139e6450e32246520416af768202f544869"+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c74b3c3fe500305cc114a06fce911be9269b61bd#c74b3c3fe500305cc114a06fce911be9269b61bd"dependencies = ["anyhow","collab",diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.tomlindex 47b0ca95b0..4ef5d4dabd 100644--- a/frontend/rust-lib/Cargo.toml+++ b/frontend/rust-lib/Cargo.toml@@ -109,11 +109,11 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "a45# To switch to the local path, run:# scripts/tool/update_collab_source.sh# ⚠️⚠️⚠️️-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d5324139e6450e32246520416af768202f544869" }-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d5324139e6450e32246520416af768202f544869" }-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d5324139e6450e32246520416af768202f544869" }-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d5324139e6450e32246520416af768202f544869" }-collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d5324139e6450e32246520416af768202f544869" }-collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d5324139e6450e32246520416af768202f544869" }-collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d5324139e6450e32246520416af768202f544869" }-collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "d5324139e6450e32246520416af768202f544869" }+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c74b3c3fe500305cc114a06fce911be9269b61bd" }+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c74b3c3fe500305cc114a06fce911be9269b61bd" }+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c74b3c3fe500305cc114a06fce911be9269b61bd" }+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c74b3c3fe500305cc114a06fce911be9269b61bd" }+collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c74b3c3fe500305cc114a06fce911be9269b61bd" }+collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c74b3c3fe500305cc114a06fce911be9269b61bd" }+collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c74b3c3fe500305cc114a06fce911be9269b61bd" }+collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c74b3c3fe500305cc114a06fce911be9269b61bd" }diff --git a/frontend/rust-lib/flowy-database2/src/entities/database_entities.rs b/frontend/rust-lib/flowy-database2/src/entities/database_entities.rsindex e42c2df2dd..2a61d6d0ed 100644--- a/frontend/rust-lib/flowy-database2/src/entities/database_entities.rs+++ b/frontend/rust-lib/flowy-database2/src/entities/database_entities.rs@@ -1,6 +1,6 @@use collab::core::collab_state::SyncState;use collab_database::rows::RowId;-use collab_database::user::DatabaseWithViews;+use collab_database::user::DatabaseViewTracker;use collab_database::views::DatabaseLayout;use flowy_derive::ProtoBuf;@@ -195,16 +195,12 @@ impl TryInto<MoveGroupRowParams> for MoveGroupRowPayloadPB {#[derive(Debug, Default, ProtoBuf)]pub struct DatabaseDescriptionPB {#[pb(index = 1)]- pub name: String,-- #[pb(index = 2)]pub database_id: String,}-impl From<DatabaseWithViews> for DatabaseDescriptionPB {- fn from(data: DatabaseWithViews) -> Self {+impl From<DatabaseViewTracker> for DatabaseDescriptionPB {+ fn from(data: DatabaseViewTracker) -> Self {Self {- name: data.name,database_id: data.database_id,}}diff --git a/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs b/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rsindex edfb0bafac..9ca7389c25 100644--- a/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs@@ -1062,7 +1062,7 @@ impl DatabaseEditor {&self,changeset: DatabaseFieldChangesetPB,) -> FlowyResult<()> {- let views = self.database.lock().get_all_views_description();+ let views = self.database.lock().get_all_database_views_meta();for view in views {send_notification(&view.id, DatabaseNotification::DidUpdateFields).payload(changeset.clone())@@ -1618,7 +1618,7 @@ fn notify_did_update_database_field(.ok_or(FlowyError::internal().with_context("fail to acquire the lock of database"))?;let database_id = database.get_database_id();let field = database.fields.get_field(field_id);- let views = database.get_all_views_description();+ let views = database.get_all_database_views_meta();(database_id, field, views)};diff --git a/frontend/rust-lib/flowy-database2/src/services/share/csv/import.rs b/frontend/rust-lib/flowy-database2/src/services/share/csv/import.rsindex d745211c54..57d2931cd3 100644--- a/frontend/rust-lib/flowy-database2/src/services/share/csv/import.rs+++ b/frontend/rust-lib/flowy-database2/src/services/share/csv/import.rs@@ -129,7 +129,7 @@ fn database_from_fields_and_rows(CreateDatabaseParams {database_id,view_id: view_id.to_string(),- name: "".to_string(),+ view_name: "".to_string(),layout: DatabaseLayout::Grid,layout_settings: Default::default(),filters: vec![],diff --git a/frontend/rust-lib/flowy-database2/src/template.rs b/frontend/rust-lib/flowy-database2/src/template.rsindex bc3f23bc05..d257e02efa 100644--- a/frontend/rust-lib/flowy-database2/src/template.rs+++ b/frontend/rust-lib/flowy-database2/src/template.rs@@ -34,7 +34,7 @@ pub fn make_default_grid(view_id: &str, name: &str) -> CreateDatabaseParams {CreateDatabaseParams {database_id: gen_database_id(),view_id: view_id.to_string(),- name: name.to_string(),+ view_name: name.to_string(),layout: DatabaseLayout::Grid,layout_settings: Default::default(),filters: vec![],@@ -97,7 +97,7 @@ pub fn make_default_board(view_id: &str, name: &str) -> CreateDatabaseParams {CreateDatabaseParams {database_id: gen_database_id(),view_id: view_id.to_string(),- name: name.to_string(),+ view_name: name.to_string(),layout: DatabaseLayout::Board,layout_settings,filters: vec![],@@ -143,7 +143,7 @@ pub fn make_default_calendar(view_id: &str, name: &str) -> CreateDatabaseParamsCreateDatabaseParams {database_id: gen_database_id(),view_id: view_id.to_string(),- name: name.to_string(),+ view_name: name.to_string(),layout: DatabaseLayout::Calendar,layout_settings,filters: vec![],diff --git a/frontend/rust-lib/flowy-user/src/anon_user_upgrade/sync_af_user_collab.rs b/frontend/rust-lib/flowy-user/src/anon_user_upgrade/sync_af_user_collab.rsindex 52f8521f70..3997bfb3fc 100644--- a/frontend/rust-lib/flowy-user/src/anon_user_upgrade/sync_af_user_collab.rs+++ b/frontend/rust-lib/flowy-user/src/anon_user_upgrade/sync_af_user_collab.rs@@ -8,7 +8,7 @@ use collab::core::collab::MutexCollab;use collab::preclude::Collab;use collab_database::database::get_database_row_ids;use collab_database::rows::database_row_document_id_from_row_id;-use collab_database::user::{get_database_with_views, DatabaseWithViews};+use collab_database::user::{get_database_with_views, DatabaseViewTracker};use collab_entity::{CollabObject, CollabType};use collab_folder::{Folder, View, ViewLayout};use parking_lot::Mutex;@@ -78,7 +78,7 @@ pub async fn sync_af_user_data_to_cloud(fn sync_view(uid: i64,folder: Arc<MutexFolder>,- database_records: Vec<Arc<DatabaseWithViews>>,+ database_view_tracker: Vec<Arc<DatabaseViewTracker>>,workspace_id: String,device_id: String,view: Arc<View>,@@ -88,8 +88,7 @@ fn sync_view() -> Pin<Box<dyn Future<Output = Result<(), Error>> + Send + Sync>> {Box::pin(async move {let collab_type = collab_type_from_view_layout(&view.layout);- let object_id = object_id_from_view(&view, &database_records)?;-+ let object_id = object_id_from_view(&view, &database_view_tracker)?;tracing::debug!("sync view: {:?}:{} with object_id: {}",view.layout,@@ -190,7 +189,7 @@ fn sync_view(if let Err(err) = Box::pin(sync_view(uid,folder.clone(),- database_records.clone(),+ database_view_tracker.clone(),workspace_id.clone(),device_id.to_string(),child_view,@@ -298,7 +297,7 @@ async fn sync_database_views(database_views_aggregate_id: &str,collab_db: &Arc<RocksCollabDB>,user_service: Arc<dyn UserCloudService>,-) -> Vec<Arc<DatabaseWithViews>> {+) -> Vec<Arc<DatabaseViewTracker>> {let collab_object = CollabObject::new(uid,database_views_aggregate_id.to_string(),@@ -361,7 +360,7 @@ fn collab_type_from_view_layout(view_layout: &ViewLayout) -> CollabType {fn object_id_from_view(view: &Arc<View>,- database_records: &[Arc<DatabaseWithViews>],+ database_records: &[Arc<DatabaseViewTracker>],) -> Result<String, Error> {if view.layout.is_database() {match database_recordsdiff --git a/frontend/rust-lib/flowy-user/src/anon_user_upgrade/sync_supabase_user_collab.rs b/frontend/rust-lib/flowy-user/src/anon_user_upgrade/sync_supabase_user_collab.rsindex a1cc335402..92f1dc8d83 100644--- a/frontend/rust-lib/flowy-user/src/anon_user_upgrade/sync_supabase_user_collab.rs+++ b/frontend/rust-lib/flowy-user/src/anon_user_upgrade/sync_supabase_user_collab.rs@@ -8,7 +8,7 @@ use collab::core::collab::MutexCollab;use collab::preclude::Collab;use collab_database::database::get_database_row_ids;use collab_database::rows::database_row_document_id_from_row_id;-use collab_database::user::{get_database_with_views, DatabaseWithViews};+use collab_database::user::{get_database_with_views, DatabaseViewTracker};use collab_entity::{CollabObject, CollabType};use collab_folder::{Folder, View, ViewLayout};use parking_lot::Mutex;@@ -75,7 +75,7 @@ pub async fn sync_supabase_user_data_to_cloud(fn sync_view(uid: i64,folder: Arc<MutexFolder>,- database_records: Vec<Arc<DatabaseWithViews>>,+ database_records: Vec<Arc<DatabaseViewTracker>>,workspace_id: String,device_id: String,view: Arc<View>,@@ -297,7 +297,7 @@ async fn sync_database_views(database_views_aggregate_id: &str,collab_db: &Arc<RocksCollabDB>,user_service: Arc<dyn UserCloudService>,-) -> Vec<Arc<DatabaseWithViews>> {+) -> Vec<Arc<DatabaseViewTracker>> {let collab_object = CollabObject::new(uid,database_views_aggregate_id.to_string(),@@ -357,7 +357,7 @@ fn collab_type_from_view_layout(view_layout: &ViewLayout) -> CollabType {fn object_id_from_view(view: &Arc<View>,- database_records: &[Arc<DatabaseWithViews>],+ database_records: &[Arc<DatabaseViewTracker>],) -> Result<String, Error> {if view.layout.is_database() {match database_records