Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump collab rev (#4096)

Browse Source
This commit is contained in:
Nathan.fooo 2023-12-05 10:04:23 -08:00 committed by GitHub
parent 48d6967d3b
commit 1a13de2ee9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 48 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/appflowy_flutter/lib/plugins/document/application/doc_bloc.dart
View File

@ -4,7 +4,6 @@ import 'package:appflowy/plugins/document/application/doc_service.dart';
import 'package:appflowy/plugins/document/application/document_data_pb_extension.dart';
import 'package:appflowy/plugins/document/application/editor_transaction_adapter.dart';
import 'package:appflowy/plugins/trash/application/trash_service.dart';
import 'package:appflowy/user/application/user_service.dart';
import 'package:appflowy/workspace/application/doc/doc_listener.dart';
import 'package:appflowy/workspace/application/view/view_listener.dart';
import 'package:appflowy_backend/protobuf/flowy-document2/protobuf.dart';
@ -124,12 +123,7 @@ class DocumentBloc extends Bloc<DocumentEvent, DocumentState> {
/// Fetch document
Future<DocumentState> _fetchDocumentState() async {
final result = await UserBackendService.getCurrentUserProfile().then(
(value) async => value.andThen(
// open the document
await _documentService.openDocument(viewId: view.id),
),
);
final result = await _documentService.openDocument(viewId: view.id);
return state.copyWith(
loadingState: DocumentLoadingState.finish(result),
);

18
frontend/appflowy_tauri/src-tauri/Cargo.lock generated
View File

@ -881,7 +881,7 @@ dependencies = [
[[package]]
name = "collab"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"anyhow",
"async-trait",
@ -900,7 +900,7 @@ dependencies = [
[[package]]
name = "collab-database"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"anyhow",
"async-trait",
@ -930,7 +930,7 @@ dependencies = [
[[package]]
name = "collab-derive"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"proc-macro2",
"quote",
@ -942,7 +942,7 @@ dependencies = [
[[package]]
name = "collab-document"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"anyhow",
"collab",
@ -961,7 +961,7 @@ dependencies = [
[[package]]
name = "collab-entity"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"anyhow",
"bytes",
@ -975,7 +975,7 @@ dependencies = [
[[package]]
name = "collab-folder"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"anyhow",
"chrono",
@ -1017,7 +1017,7 @@ dependencies = [
[[package]]
name = "collab-persistence"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"anyhow",
"async-trait",
@ -1038,7 +1038,7 @@ dependencies = [
[[package]]
name = "collab-plugins"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"anyhow",
"async-trait",
@ -1064,7 +1064,7 @@ dependencies = [
[[package]]
name = "collab-user"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"anyhow",
"collab",

16
frontend/appflowy_tauri/src-tauri/Cargo.toml
View File

@ -67,14 +67,14 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "f13
# To switch to the local path, run:
# scripts/tool/update_collab_source.sh
# ⚠️⚠️⚠️️
collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1" }
collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1" }
collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1" }
collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1" }
collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1" }
collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1" }
collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1" }
collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1" }
collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cc044fb676598a521e2fa7bf34fe58cdbc228cb8" }
collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cc044fb676598a521e2fa7bf34fe58cdbc228cb8" }
collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cc044fb676598a521e2fa7bf34fe58cdbc228cb8" }
collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cc044fb676598a521e2fa7bf34fe58cdbc228cb8" }
collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cc044fb676598a521e2fa7bf34fe58cdbc228cb8" }
collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cc044fb676598a521e2fa7bf34fe58cdbc228cb8" }
collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cc044fb676598a521e2fa7bf34fe58cdbc228cb8" }
collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cc044fb676598a521e2fa7bf34fe58cdbc228cb8" }

18
frontend/rust-lib/Cargo.lock generated
View File

@ -731,7 +731,7 @@ dependencies = [
[[package]]
name = "collab"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"anyhow",
"async-trait",
@ -750,7 +750,7 @@ dependencies = [
[[package]]
name = "collab-database"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"anyhow",
"async-trait",
@ -780,7 +780,7 @@ dependencies = [
[[package]]
name = "collab-derive"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"proc-macro2",
"quote",
@ -792,7 +792,7 @@ dependencies = [
[[package]]
name = "collab-document"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"anyhow",
"collab",
@ -811,7 +811,7 @@ dependencies = [
[[package]]
name = "collab-entity"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"anyhow",
"bytes",
@ -825,7 +825,7 @@ dependencies = [
[[package]]
name = "collab-folder"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"anyhow",
"chrono",
@ -867,7 +867,7 @@ dependencies = [
[[package]]
name = "collab-persistence"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"anyhow",
"async-trait",
@ -888,7 +888,7 @@ dependencies = [
[[package]]
name = "collab-plugins"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"anyhow",
"async-trait",
@ -914,7 +914,7 @@ dependencies = [
[[package]]
name = "collab-user"
version = "0.1.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1#c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cc044fb676598a521e2fa7bf34fe58cdbc228cb8#cc044fb676598a521e2fa7bf34fe58cdbc228cb8"
dependencies = [
"anyhow",
"collab",

16
frontend/rust-lib/Cargo.toml
View File

@ -109,11 +109,11 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "f13
# To switch to the local path, run:
# scripts/tool/update_collab_source.sh
# ⚠️⚠️⚠️️
collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1" }
collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1" }
collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1" }
collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1" }
collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1" }
collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1" }
collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1" }
collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "c6e9d6b9a0aed7e2d1b8de9328d64e3f8b04ded1" }
collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cc044fb676598a521e2fa7bf34fe58cdbc228cb8" }
collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cc044fb676598a521e2fa7bf34fe58cdbc228cb8" }
collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cc044fb676598a521e2fa7bf34fe58cdbc228cb8" }
collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cc044fb676598a521e2fa7bf34fe58cdbc228cb8" }
collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cc044fb676598a521e2fa7bf34fe58cdbc228cb8" }
collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cc044fb676598a521e2fa7bf34fe58cdbc228cb8" }
collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cc044fb676598a521e2fa7bf34fe58cdbc228cb8" }
collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cc044fb676598a521e2fa7bf34fe58cdbc228cb8" }

2
frontend/rust-lib/flowy-document2/src/event_handler.rs
View File

@ -9,6 +9,7 @@ use std::sync::{Arc, Weak};
use collab_document::blocks::{
BlockAction, BlockActionPayload, BlockActionType, BlockEvent, BlockEventPayload, DeltaType,
};
use tracing::instrument;
use flowy_error::{FlowyError, FlowyResult};
use lib_dispatch::prelude::{
@ -48,6 +49,7 @@ pub(crate) async fn create_document_handler(
}
// Handler for opening an existing document
#[instrument(level = "debug", skip_all, err)]
pub(crate) async fn open_document_handler(
data: AFPluginData<OpenDocumentPayloadPB>,
manager: AFPluginState<Weak<DocumentManager>>,

1
frontend/rust-lib/flowy-error/src/impl_from/collab.rs
View File

@ -7,6 +7,7 @@ use crate::{ErrorCode, FlowyError};
impl From<PersistenceError> for FlowyError {
fn from(err: PersistenceError) -> Self {
match err {
PersistenceError::UnexpectedEmptyUpdates => FlowyError::new(ErrorCode::RecordNotFound, err),
PersistenceError::RocksdbCorruption(_) => FlowyError::new(ErrorCode::RocksdbCorruption, err),
PersistenceError::RocksdbIOError(_) => FlowyError::new(ErrorCode::RocksdbIOError, err),
_ => FlowyError::new(ErrorCode::RocksdbInternal, err),

19
frontend/rust-lib/flowy-user/src/migrations/document_empty_content.rs
View File

@ -4,7 +4,6 @@ use collab::core::collab::MutexCollab;
use collab::core::origin::{CollabClient, CollabOrigin};
use collab_document::document::Document;
use collab_document::document_data::default_document_data;
use collab_document::error::DocumentError;
use collab_folder::{Folder, View};
use tracing::{event, instrument};
@ -44,8 +43,6 @@ impl UserDataMigration for HistoricalEmptyDocumentMigration {
"Failed to migrate document {}",
view.id
);
} else {
event!(tracing::Level::INFO, "Did migrate document {}", view.id);
}
}
@ -65,16 +62,16 @@ where
W: YrsDocAction<'a>,
PersistenceError: From<W::Error>,
{
let collab = Arc::new(MutexCollab::new(origin.clone(), &view.id, vec![]));
let result = Document::open(collab.clone());
if let Err(DocumentError::NoRequiredData) = result {
let document_data = default_document_data();
let document = Document::create_with_data(collab, document_data)?;
if load_collab(user_id, write_txn, &view.id).is_err() {
let collab = Arc::new(MutexCollab::new(origin.clone(), &view.id, vec![]));
let document = Document::create_with_data(collab, default_document_data())?;
let encode = document.get_collab().encode_collab_v1();
write_txn.flush_doc_with(user_id, &view.id, &encode.doc_state, &encode.state_vector)?;
} else {
result?;
event!(
tracing::Level::INFO,
"Did migrate empty document {}",
view.id
);
}
Ok(())

6
frontend/rust-lib/flowy-user/src/migrations/util.rs
View File

@ -4,7 +4,7 @@ use collab::core::collab::MutexCollab;
use collab::preclude::Collab;
use collab_integrate::{PersistenceError, YrsDocAction};
use flowy_error::{internal_error, FlowyResult};
use flowy_error::FlowyResult;
pub fn load_collab<'a, R>(
uid: i64,
@ -16,8 +16,6 @@ where
PersistenceError: From<R::Error>,
{
let collab = Collab::new(uid, object_id, "phantom", vec![]);
collab
.with_origin_transact_mut(|txn| collab_r_txn.load_doc_with_txn(uid, &object_id, txn))
.map_err(internal_error)?;
collab.with_origin_transact_mut(|txn| collab_r_txn.load_doc_with_txn(uid, &object_id, txn))?;
Ok(Arc::new(MutexCollab::from_collab(collab)))
}

3
frontend/rust-lib/flowy-user/src/services/database.rs
View File

@ -76,9 +76,6 @@ impl UserDB {
// If validation fails, attempt to restore from the latest backup.
error!("Restoring collab db failed: {:?}", err);
}
} else if let Err(err) = zip_backup.restore_latest_backup() {
// If collab database does not exist, attempt to restore from the latest backup.
error!("Restoring collab db failed: {:?}", err);
}
}
}