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: rename structs

Browse Source
This commit is contained in:
appflowy
2022-02-24 20:36:24 +08:00
parent b855a1199d
commit 93695dc4be
19 changed files with 83 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/rust-lib/flowy-folder/src/event_map.rs
View File

@ -63,7 +63,7 @@ pub fn create(folder: Arc<FolderManager>) -> Module {
.event(FolderEvent::UpdateView, update_view_handler)
.event(FolderEvent::DeleteView, delete_view_handler)
.event(FolderEvent::DuplicateView, duplicate_view_handler)
.event(FolderEvent::OpenDocument, open_document_handler)
.event(FolderEvent::OpenView, open_document_handler)
.event(FolderEvent::CloseView, close_view_handler)
.event(FolderEvent::ApplyDocDelta, document_delta_handler);
@ -115,25 +115,25 @@ pub enum FolderEvent {
#[event(input = "CreateViewRequest", output = "View")]
CreateView = 201,
#[event(input = "QueryViewRequest", output = "View")]
#[event(input = "ViewId", output = "View")]
ReadView = 202,
#[event(input = "UpdateViewRequest", output = "View")]
UpdateView = 203,
#[event(input = "QueryViewRequest")]
#[event(input = "RepeatedViewId")]
DeleteView = 204,
#[event(input = "QueryViewRequest")]
#[event(input = "ViewId")]
DuplicateView = 205,
#[event()]
CopyLink = 206,
#[event(input = "QueryViewRequest", output = "DocumentDelta")]
OpenDocument = 207,
#[event(input = "ViewId", output = "DocumentDelta")]
OpenView = 207,
#[event(input = "QueryViewRequest")]
#[event(input = "ViewId")]
CloseView = 208,
#[event(output = "RepeatedTrash")]

20
frontend/rust-lib/flowy-folder/src/protobuf/model/event_map.rs
View File

@ -41,7 +41,7 @@ pub enum FolderEvent {
DeleteView = 204,
DuplicateView = 205,
CopyLink = 206,
OpenDocument = 207,
OpenView = 207,
CloseView = 208,
ReadTrash = 300,
PutbackTrash = 301,
@ -75,7 +75,7 @@ impl ::protobuf::ProtobufEnum for FolderEvent {
204 => ::std::option::Option::Some(FolderEvent::DeleteView),
205 => ::std::option::Option::Some(FolderEvent::DuplicateView),
206 => ::std::option::Option::Some(FolderEvent::CopyLink),
207 => ::std::option::Option::Some(FolderEvent::OpenDocument),
207 => ::std::option::Option::Some(FolderEvent::OpenView),
208 => ::std::option::Option::Some(FolderEvent::CloseView),
300 => ::std::option::Option::Some(FolderEvent::ReadTrash),
301 => ::std::option::Option::Some(FolderEvent::PutbackTrash),
@ -106,7 +106,7 @@ impl ::protobuf::ProtobufEnum for FolderEvent {
FolderEvent::DeleteView,
FolderEvent::DuplicateView,
FolderEvent::CopyLink,
FolderEvent::OpenDocument,
FolderEvent::OpenView,
FolderEvent::CloseView,
FolderEvent::ReadTrash,
FolderEvent::PutbackTrash,
@ -143,19 +143,19 @@ impl ::protobuf::reflect::ProtobufValue for FolderEvent {
}
static file_descriptor_proto_data: &'static [u8] = b"\
\n\x0fevent_map.proto*\xd6\x03\n\x0bFolderEvent\x12\x13\n\x0fCreateWorks\
\n\x0fevent_map.proto*\xd2\x03\n\x0bFolderEvent\x12\x13\n\x0fCreateWorks\
pace\x10\0\x12\x14\n\x10ReadCurWorkspace\x10\x01\x12\x12\n\x0eReadWorksp\
aces\x10\x02\x12\x13\n\x0fDeleteWorkspace\x10\x03\x12\x11\n\rOpenWorkspa\
ce\x10\x04\x12\x15\n\x11ReadWorkspaceApps\x10\x05\x12\r\n\tCreateApp\x10\
e\x12\r\n\tDeleteApp\x10f\x12\x0b\n\x07ReadApp\x10g\x12\r\n\tUpdateApp\
\x10h\x12\x0f\n\nCreateView\x10\xc9\x01\x12\r\n\x08ReadView\x10\xca\x01\
\x12\x0f\n\nUpdateView\x10\xcb\x01\x12\x0f\n\nDeleteView\x10\xcc\x01\x12\
\x12\n\rDuplicateView\x10\xcd\x01\x12\r\n\x08CopyLink\x10\xce\x01\x12\
\x11\n\x0cOpenDocument\x10\xcf\x01\x12\x0e\n\tCloseView\x10\xd0\x01\x12\
\x0e\n\tReadTrash\x10\xac\x02\x12\x11\n\x0cPutbackTrash\x10\xad\x02\x12\
\x10\n\x0bDeleteTrash\x10\xae\x02\x12\x14\n\x0fRestoreAllTrash\x10\xaf\
\x02\x12\x13\n\x0eDeleteAllTrash\x10\xb0\x02\x12\x12\n\rApplyDocDelta\
\x10\x90\x03\x12\x13\n\x0eExportDocument\x10\xf4\x03b\x06proto3\
\x12\n\rDuplicateView\x10\xcd\x01\x12\r\n\x08CopyLink\x10\xce\x01\x12\r\
\n\x08OpenView\x10\xcf\x01\x12\x0e\n\tCloseView\x10\xd0\x01\x12\x0e\n\tR\
eadTrash\x10\xac\x02\x12\x11\n\x0cPutbackTrash\x10\xad\x02\x12\x10\n\x0b\
DeleteTrash\x10\xae\x02\x12\x14\n\x0fRestoreAllTrash\x10\xaf\x02\x12\x13\
\n\x0eDeleteAllTrash\x10\xb0\x02\x12\x12\n\rApplyDocDelta\x10\x90\x03\
\x12\x13\n\x0eExportDocument\x10\xf4\x03b\x06proto3\
";
static file_descriptor_proto_lazy: ::protobuf::rt::LazyV2<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::rt::LazyV2::INIT;

2
frontend/rust-lib/flowy-folder/src/protobuf/proto/event_map.proto
View File

@ -17,7 +17,7 @@ enum FolderEvent {
DeleteView = 204;
DuplicateView = 205;
CopyLink = 206;
OpenDocument = 207;
OpenView = 207;
CloseView = 208;
ReadTrash = 300;
PutbackTrash = 301;

23
frontend/rust-lib/flowy-folder/src/services/view/event_handler.rs
View File

@ -2,8 +2,7 @@ use crate::{
entities::{
trash::Trash,
view::{
CreateViewParams, CreateViewRequest, QueryViewRequest, RepeatedViewId, UpdateViewParams, UpdateViewRequest,
View, ViewId,
CreateViewParams, CreateViewRequest, RepeatedViewId, UpdateViewParams, UpdateViewRequest, View, ViewId,
},
},
errors::FlowyError,
@ -24,10 +23,10 @@ pub(crate) async fn create_view_handler(
}
pub(crate) async fn read_view_handler(
data: Data<QueryViewRequest>,
data: Data<ViewId>,
controller: Unit<Arc<ViewController>>,
) -> DataResult<View, FlowyError> {
let params: ViewId = data.into_inner().try_into()?;
let params: ViewId = data.into_inner();
let mut view = controller.read_view(params.clone()).await?;
// For the moment, app and view can contains lots of views. Reading the view
// belongings using the view_id.
@ -56,11 +55,11 @@ pub(crate) async fn document_delta_handler(
}
pub(crate) async fn delete_view_handler(
data: Data<QueryViewRequest>,
data: Data<RepeatedViewId>,
view_controller: Unit<Arc<ViewController>>,
trash_controller: Unit<Arc<TrashController>>,
) -> Result<(), FlowyError> {
let params: RepeatedViewId = data.into_inner().try_into()?;
let params: RepeatedViewId = data.into_inner();
for view_id in &params.items {
let _ = view_controller.delete_view(view_id.into()).await;
}
@ -77,29 +76,29 @@ pub(crate) async fn delete_view_handler(
}
pub(crate) async fn open_document_handler(
data: Data<QueryViewRequest>,
data: Data<ViewId>,
controller: Unit<Arc<ViewController>>,
) -> DataResult<DocumentDelta, FlowyError> {
let params: ViewId = data.into_inner().try_into()?;
let params: ViewId = data.into_inner();
let doc = controller.open_document(&params.view_id).await?;
data_result(doc)
}
pub(crate) async fn close_view_handler(
data: Data<QueryViewRequest>,
data: Data<ViewId>,
controller: Unit<Arc<ViewController>>,
) -> Result<(), FlowyError> {
let params: ViewId = data.into_inner().try_into()?;
let params: ViewId = data.into_inner();
let _ = controller.close_view(&params.view_id).await?;
Ok(())
}
#[tracing::instrument(skip(data, controller), err)]
pub(crate) async fn duplicate_view_handler(
data: Data<QueryViewRequest>,
data: Data<ViewId>,
controller: Unit<Arc<ViewController>>,
) -> Result<(), FlowyError> {
let params: ViewId = data.into_inner().try_into()?;
let params: ViewId = data.into_inner();
let _ = controller.duplicate_view(&params.view_id).await?;
Ok(())
}

17
frontend/rust-lib/flowy-folder/tests/workspace/helper.rs
View File

@ -1,9 +1,10 @@
use flowy_collaboration::entities::document_info::DocumentInfo;
use flowy_folder::event_map::FolderEvent::*;
use flowy_folder_data_model::entities::view::{RepeatedViewId, ViewId};
use flowy_folder_data_model::entities::{
app::{App, AppId, CreateAppRequest, QueryAppRequest, UpdateAppRequest},
trash::{RepeatedTrash, TrashId, TrashType},
view::{CreateViewRequest, QueryViewRequest, UpdateViewRequest, View, ViewType},
view::{CreateViewRequest, UpdateViewRequest, View, ViewType},
workspace::{CreateWorkspaceRequest, QueryWorkspaceRequest, RepeatedWorkspace, Workspace},
};
use flowy_test::{event_builder::*, FlowySDKTest};
@ -124,8 +125,10 @@ pub async fn create_view(sdk: &FlowySDKTest, app_id: &str, name: &str, desc: &st
view
}
pub async fn read_view(sdk: &FlowySDKTest, view_ids: Vec<String>) -> View {
let request = QueryViewRequest { view_ids };
pub async fn read_view(sdk: &FlowySDKTest, view_id: &str) -> View {
let request = ViewId {
view_id: view_id.to_string(),
};
FolderEventBuilder::new(sdk.clone())
.event(ReadView)
.request(request)
@ -149,7 +152,7 @@ pub async fn update_view(sdk: &FlowySDKTest, view_id: &str, name: Option<String>
}
pub async fn delete_view(sdk: &FlowySDKTest, view_ids: Vec<String>) {
let request = QueryViewRequest { view_ids };
let request = RepeatedViewId { items: view_ids };
FolderEventBuilder::new(sdk.clone())
.event(DeleteView)
.request(request)
@ -158,11 +161,11 @@ pub async fn delete_view(sdk: &FlowySDKTest, view_ids: Vec<String>) {
}
pub async fn open_document(sdk: &FlowySDKTest, view_id: &str) -> DocumentInfo {
let request = QueryViewRequest {
view_ids: vec![view_id.to_owned()],
let request = ViewId {
view_id: view_id.to_string(),
};
FolderEventBuilder::new(sdk.clone())
.event(OpenDocument)
.event(OpenView)
.request(request)
.async_send()
.await

2
frontend/rust-lib/flowy-folder/tests/workspace/script.rs
View File

@ -153,7 +153,7 @@ impl FolderTest {
assert_eq!(self.view, view);
}
FolderScript::ReadView(view_id) => {
let view = read_view(sdk, vec![view_id]).await;
let view = read_view(sdk, &view_id).await;
self.view = view;
}
FolderScript::UpdateView { name, desc } => {