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

fix: remove the deleted workspace from local storage (#5026)

Browse Source 
* fix: remove the deleted workspace from local storage

* fix: unable to get latest workspaces on mobile

* fix: unable to get latest workspaces on desktop

* chore: try to fix ios ci

* fix: user workspace menu flash

* Revert "chore: try to fix ios ci"

This reverts commit 4a1e8bcb9d.
This commit is contained in:
Lucas.Xu
2024-04-02 11:28:05 +08:00
committed by GitHub
parent 1816b15b55
commit 096a01ed44
9 changed files with 191 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
frontend/rust-lib/flowy-user/src/user_manager/manager_user_workspace.rs
View File

@ -332,14 +332,24 @@ pub fn save_user_workspaces(
) -> FlowyResult<()> {
let user_workspaces = user_workspaces
.iter()
.flat_map(|user_workspace| UserWorkspaceTable::try_from((uid, user_workspace)).ok())
.collect::<Vec<UserWorkspaceTable>>();
.map(|user_workspace| UserWorkspaceTable::try_from((uid, user_workspace)))
.collect::<Result<Vec<_>, _>>()?;
conn.immediate_transaction(|conn| {
for user_workspace in user_workspaces {
if let Err(err) = diesel::update(
let existing_ids = user_workspace_table::dsl::user_workspace_table
.select(user_workspace_table::id)
.load::<String>(conn)?;
let new_ids: Vec<String> = user_workspaces.iter().map(|w| w.id.clone()).collect();
let ids_to_delete: Vec<String> = existing_ids
.into_iter()
.filter(|id| !new_ids.contains(id))
.collect();
// insert or update the user workspaces
for user_workspace in &user_workspaces {
let affected_rows = diesel::update(
user_workspace_table::dsl::user_workspace_table
.filter(user_workspace_table::id.eq(user_workspace.id.clone())),
.filter(user_workspace_table::id.eq(&user_workspace.id)),
)
.set((
user_workspace_table::name.eq(&user_workspace.name),
@ -347,18 +357,24 @@ pub fn save_user_workspaces(
user_workspace_table::database_storage_id.eq(&user_workspace.database_storage_id),
user_workspace_table::icon.eq(&user_workspace.icon),
))
.execute(conn)
.and_then(|rows| {
if rows == 0 {
let _ = diesel::insert_into(user_workspace_table::table)
.values(user_workspace)
.execute(conn)?;
}
Ok(())
}) {
tracing::error!("Error saving user workspace: {:?}", err);
.execute(conn)?;
if affected_rows == 0 {
diesel::insert_into(user_workspace_table::table)
.values(user_workspace)
.execute(conn)?;
}
}
// delete the user workspaces that are not in the new list
if !ids_to_delete.is_empty() {
diesel::delete(
user_workspace_table::dsl::user_workspace_table
.filter(user_workspace_table::id.eq_any(ids_to_delete)),
)
.execute(conn)?;
}
Ok::<(), FlowyError>(())
})
}