refactor: crates (#4258)

* chore: rename flowy-folder2 to flowy-folder

* chore: rename flowy-document2 to flowy-document

* chore: fix test

* chore: move lib-infra crate

* chore: remove shared-lib

* chore: fix clippy
This commit is contained in:
Nathan.fooo
2023-12-31 07:29:40 +08:00
committed by GitHub
parent 2f6a4f8c7b
commit 5facb61e23
460 changed files with 498 additions and 11141 deletions

View File

@ -1,6 +1,6 @@
use collab_folder::ViewLayout;
use flowy_folder2::entities::icon::{ViewIconPB, ViewIconTypePB};
use flowy_folder::entities::icon::{ViewIconPB, ViewIconTypePB};
use crate::folder::local_test::script::FolderScript::*;
use crate::folder::local_test::script::FolderTest;

View File

@ -2,9 +2,9 @@ use collab_folder::ViewLayout;
use event_integration::event_builder::EventBuilder;
use event_integration::EventIntegrationTest;
use flowy_folder2::entities::icon::{UpdateViewIconPayloadPB, ViewIconPB};
use flowy_folder2::entities::*;
use flowy_folder2::event_map::FolderEvent::*;
use flowy_folder::entities::icon::{UpdateViewIconPayloadPB, ViewIconPB};
use flowy_folder::entities::*;
use flowy_folder::event_map::FolderEvent::*;
pub enum FolderScript {
#[allow(dead_code)]

View File

@ -1,8 +1,8 @@
use std::time::Duration;
use event_integration::EventIntegrationTest;
use flowy_folder2::entities::{ChildViewUpdatePB, RepeatedViewPB, UpdateViewPayloadPB};
use flowy_folder2::notification::FolderNotification;
use flowy_folder::entities::{ChildViewUpdatePB, RepeatedViewPB, UpdateViewPayloadPB};
use flowy_folder::notification::FolderNotification;
use crate::util::receive_with_timeout;

View File

@ -1,7 +1,7 @@
use event_integration::event_builder::EventBuilder;
use event_integration::EventIntegrationTest;
use flowy_folder2::entities::icon::{UpdateViewIconPayloadPB, ViewIconPB, ViewIconTypePB};
use flowy_folder2::entities::*;
use flowy_folder::entities::icon::{UpdateViewIconPayloadPB, ViewIconPB, ViewIconTypePB};
use flowy_folder::entities::*;
use flowy_user::errors::ErrorCode;
#[tokio::test]
@ -12,7 +12,7 @@ async fn create_workspace_event_test() {
desc: "".to_owned(),
};
let resp = EventBuilder::new(test)
.event(flowy_folder2::event_map::FolderEvent::CreateWorkspace)
.event(flowy_folder::event_map::FolderEvent::CreateWorkspace)
.payload(request)
.async_send()
.await
@ -30,22 +30,22 @@ async fn create_workspace_event_test() {
// };
// // create a workspace
// let resp_1 = EventBuilder::new(test.clone())
// .event(flowy_folder2::event_map::FolderEvent::CreateWorkspace)
// .event(flowy_folder::event_map::FolderEvent::CreateWorkspace)
// .payload(payload)
// .async_send()
// .await
// .parse::<flowy_folder2::entities::WorkspacePB>();
// .parse::<flowy_folder::entities::WorkspacePB>();
//
// // open the workspace
// let payload = WorkspaceIdPB {
// value: Some(resp_1.id.clone()),
// };
// let resp_2 = EventBuilder::new(test)
// .event(flowy_folder2::event_map::FolderEvent::OpenWorkspace)
// .event(flowy_folder::event_map::FolderEvent::OpenWorkspace)
// .payload(payload)
// .async_send()
// .await
// .parse::<flowy_folder2::entities::WorkspacePB>();
// .parse::<flowy_folder::entities::WorkspacePB>();
//
// assert_eq!(resp_1.id, resp_2.id);
// assert_eq!(resp_1.name, resp_2.name);
@ -122,7 +122,7 @@ async fn delete_view_event_test() {
value: view.id.clone(),
};
let error = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::GetView)
.event(flowy_folder::event_map::FolderEvent::GetView)
.payload(payload)
.async_send()
.await
@ -145,7 +145,7 @@ async fn put_back_trash_event_test() {
value: view.id.clone(),
};
let error = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::GetView)
.event(flowy_folder::event_map::FolderEvent::GetView)
.payload(payload)
.async_send()
.await
@ -157,7 +157,7 @@ async fn put_back_trash_event_test() {
id: view.id.clone(),
};
EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::RestoreTrashItem)
.event(flowy_folder::event_map::FolderEvent::RestoreTrashItem)
.payload(payload)
.async_send()
.await;
@ -166,7 +166,7 @@ async fn put_back_trash_event_test() {
value: view.id.clone(),
};
let error = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::GetView)
.event(flowy_folder::event_map::FolderEvent::GetView)
.payload(payload)
.async_send()
.await
@ -187,16 +187,16 @@ async fn delete_view_permanently_event_test() {
// delete the view. the view will be moved to trash
EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::DeleteView)
.event(flowy_folder::event_map::FolderEvent::DeleteView)
.payload(payload)
.async_send()
.await;
let trash = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::ListTrashItems)
.event(flowy_folder::event_map::FolderEvent::ListTrashItems)
.async_send()
.await
.parse::<flowy_folder2::entities::RepeatedTrashPB>()
.parse::<flowy_folder::entities::RepeatedTrashPB>()
.items;
assert_eq!(trash.len(), 1);
assert_eq!(trash[0].id, view.id);
@ -208,17 +208,17 @@ async fn delete_view_permanently_event_test() {
}],
};
EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::PermanentlyDeleteTrashItem)
.event(flowy_folder::event_map::FolderEvent::PermanentlyDeleteTrashItem)
.payload(payload)
.async_send()
.await;
// After delete the last view, the trash should be empty
let trash = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::ListTrashItems)
.event(flowy_folder::event_map::FolderEvent::ListTrashItems)
.async_send()
.await
.parse::<flowy_folder2::entities::RepeatedTrashPB>()
.parse::<flowy_folder::entities::RepeatedTrashPB>()
.items;
assert!(trash.is_empty());
}
@ -237,32 +237,32 @@ async fn delete_all_trash_test() {
};
// delete the view. the view will be moved to trash
EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::DeleteView)
.event(flowy_folder::event_map::FolderEvent::DeleteView)
.payload(payload)
.async_send()
.await;
}
let trash = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::ListTrashItems)
.event(flowy_folder::event_map::FolderEvent::ListTrashItems)
.async_send()
.await
.parse::<flowy_folder2::entities::RepeatedTrashPB>()
.parse::<flowy_folder::entities::RepeatedTrashPB>()
.items;
assert_eq!(trash.len(), 3);
// Delete all the trash
EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::PermanentlyDeleteAllTrashItem)
.event(flowy_folder::event_map::FolderEvent::PermanentlyDeleteAllTrashItem)
.async_send()
.await;
// After delete the last view, the trash should be empty
let trash = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::ListTrashItems)
.event(flowy_folder::event_map::FolderEvent::ListTrashItems)
.async_send()
.await
.parse::<flowy_folder2::entities::RepeatedTrashPB>()
.parse::<flowy_folder::entities::RepeatedTrashPB>()
.items;
assert!(trash.is_empty());
}
@ -323,11 +323,11 @@ async fn multiple_hierarchy_view_test() {
};
let child = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::GetView)
.event(flowy_folder::event_map::FolderEvent::GetView)
.payload(payload)
.async_send()
.await
.parse::<flowy_folder2::entities::ViewPB>();
.parse::<flowy_folder::entities::ViewPB>();
assert_eq!(child.name, format!("My {}-{} view", i + 1, j + 1));
assert_eq!(child.child_views.len(), 1);
// By default only the first level of child views will be loaded
@ -370,7 +370,7 @@ async fn move_view_event_test() {
to: 2,
};
let _ = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::MoveView)
.event(flowy_folder::event_map::FolderEvent::MoveView)
.payload(payload)
.async_send()
.await;
@ -411,7 +411,7 @@ async fn move_view_event_after_delete_view_test() {
to: 3,
};
let _ = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::MoveView)
.event(flowy_folder::event_map::FolderEvent::MoveView)
.payload(payload)
.async_send()
.await;
@ -452,7 +452,7 @@ async fn move_view_event_after_delete_view_test2() {
to: 2,
};
let _ = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::MoveView)
.event(flowy_folder::event_map::FolderEvent::MoveView)
.payload(payload)
.async_send()
.await;
@ -474,7 +474,7 @@ async fn create_parent_view_with_invalid_name() {
};
assert_eq!(
EventBuilder::new(sdk)
.event(flowy_folder2::event_map::FolderEvent::CreateWorkspace)
.event(flowy_folder::event_map::FolderEvent::CreateWorkspace)
.payload(request)
.async_send()
.await
@ -551,7 +551,7 @@ async fn move_folder_nested_view(
prev_view_id,
};
EventBuilder::new(sdk)
.event(flowy_folder2::event_map::FolderEvent::MoveNestedView)
.event(flowy_folder::event_map::FolderEvent::MoveNestedView)
.payload(payload)
.async_send()
.await;

View File

@ -9,8 +9,8 @@ use collab_entity::CollabType;
use collab_folder::FolderData;
use event_integration::event_builder::EventBuilder;
use flowy_folder2::entities::{FolderSnapshotPB, RepeatedFolderSnapshotPB, WorkspaceIdPB};
use flowy_folder2::event_map::FolderEvent::GetFolderSnapshots;
use flowy_folder::entities::{FolderSnapshotPB, RepeatedFolderSnapshotPB, WorkspaceIdPB};
use flowy_folder::event_map::FolderEvent::GetFolderSnapshots;
use crate::util::FlowySupabaseTest;

View File

@ -3,8 +3,8 @@ use std::time::Duration;
use assert_json_diff::assert_json_eq;
use serde_json::json;
use flowy_folder2::entities::{FolderSnapshotStatePB, FolderSyncStatePB};
use flowy_folder2::notification::FolderNotification::DidUpdateFolderSnapshotState;
use flowy_folder::entities::{FolderSnapshotStatePB, FolderSyncStatePB};
use flowy_folder::notification::FolderNotification::DidUpdateFolderSnapshotState;
use crate::folder::supabase_test::helper::{assert_folder_collab_content, FlowySupabaseFolderTest};
use crate::util::{get_folder_data_from_server, receive_with_timeout};