Skip to content

Commit 01dbc68

Browse files
committed
chore: fix open application error when upgrade to 0.0.5.1
1 parent b090aae commit 01dbc68

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

frontend/rust-lib/flowy-folder/src/services/persistence/migration.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl FolderMigration {
7878

7979
let folder = FolderPad::new(workspaces, trash)?;
8080
KV::set_bool(&key, true);
81-
tracing::trace!("Run folder v1 migration");
81+
tracing::info!("Run folder v1 migration");
8282
Ok(Some(folder))
8383
}
8484

@@ -89,19 +89,18 @@ impl FolderMigration {
8989
}
9090
let _ = self.migration_folder_rev_struct(folder_id).await?;
9191
KV::set_bool(&key, true);
92-
tracing::trace!("Run folder v2 migration");
92+
// tracing::info!("Run folder v2 migration");
9393
Ok(())
9494
}
9595

96-
#[allow(dead_code)]
9796
pub async fn run_v3_migration(&self, folder_id: &FolderId) -> FlowyResult<()> {
9897
let key = migration_flag_key(&self.user_id, V3_MIGRATION);
9998
if KV::get_bool(&key) {
10099
return Ok(());
101100
}
102101
let _ = self.migration_folder_rev_struct(folder_id).await?;
103102
KV::set_bool(&key, true);
104-
tracing::trace!("Run folder v3 migration");
103+
tracing::info!("Run folder v3 migration");
105104
Ok(())
106105
}
107106

frontend/rust-lib/flowy-folder/src/services/persistence/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ impl FolderPersistence {
101101
}
102102

103103
let _ = migrations.run_v2_migration(folder_id).await?;
104-
105-
// let _ = migrations.run_v3_migration(folder_id).await?;
104+
let _ = migrations.run_v3_migration(folder_id).await?;
106105
Ok(())
107106
}
108107

frontend/rust-lib/flowy-grid/src/services/field/type_options/text_type_option/text_type_option.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ impl TypeOptionBuilder for RichTextTypeOptionBuilder {
2929
#[derive(Debug, Clone, Default, Serialize, Deserialize, ProtoBuf)]
3030
pub struct RichTextTypeOptionPB {
3131
#[pb(index = 1)]
32+
#[serde(default)]
3233
data: String, //It's not used yet
3334
}
3435
impl_type_option!(RichTextTypeOptionPB, FieldType::RichText);

shared-lib/flowy-sync/src/client_grid/view_revision_pad.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,23 @@ impl std::ops::Deref for GridViewRevisionPad {
2323
}
2424

2525
impl GridViewRevisionPad {
26+
// For the moment, the view_id is equal to grid_id. The grid_id represents the database id.
27+
// A database can be referenced by multiple views.
2628
pub fn new(grid_id: String, view_id: String) -> Self {
2729
let view = Arc::new(GridViewRevision::new(grid_id, view_id));
2830
let json = serde_json::to_string(&view).unwrap();
2931
let delta = TextDeltaBuilder::new().insert(&json).build();
3032
Self { view, delta }
3133
}
3234

33-
pub fn from_delta(delta: TextDelta) -> CollaborateResult<Self> {
35+
pub fn from_delta(view_id: &str, delta: TextDelta) -> CollaborateResult<Self> {
36+
if delta.is_empty() {
37+
return Ok(GridViewRevisionPad::new(view_id.to_owned(), view_id.to_owned()));
38+
}
3439
let s = delta.content()?;
3540
let view: GridViewRevision = serde_json::from_str(&s).map_err(|e| {
3641
let msg = format!("Deserialize delta to GridViewRevision failed: {}", e);
37-
tracing::error!("{}", s);
42+
tracing::error!("parsing json: {}", s);
3843
CollaborateError::internal().context(msg)
3944
})?;
4045
Ok(Self {
@@ -43,9 +48,9 @@ impl GridViewRevisionPad {
4348
})
4449
}
4550

46-
pub fn from_revisions(_grid_id: &str, revisions: Vec<Revision>) -> CollaborateResult<Self> {
51+
pub fn from_revisions(view_id: &str, revisions: Vec<Revision>) -> CollaborateResult<Self> {
4752
let delta: TextDelta = make_text_delta_from_revisions(revisions)?;
48-
Self::from_delta(delta)
53+
Self::from_delta(view_id, delta)
4954
}
5055

5156
pub fn get_groups_by_field_revs(&self, field_revs: &[Arc<FieldRevision>]) -> Option<GroupConfigurationsByFieldId> {

0 commit comments

Comments
 (0)