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

refactor: add grid view info

Browse Source
This commit is contained in:
appflowy
2022-06-15 17:24:46 +08:00
parent a13e6798ee
commit 820b7fcb75
56 changed files with 2673 additions and 2506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,6 @@ pub fn create(folder: Arc<FolderManager>) -> Module {
.event(FolderEvent::ReadView, read_view_handler)
.event(FolderEvent::UpdateView, update_view_handler)
.event(FolderEvent::ReadViewInfo, read_view_info_handler)
.event(FolderEvent::UpdateViewInfo, update_view_info_handler)
.event(FolderEvent::DeleteView, delete_view_handler)
.event(FolderEvent::DuplicateView, duplicate_view_handler)
.event(FolderEvent::SetLatestView, set_latest_view_handler)
@ -136,9 +135,6 @@ pub enum FolderEvent {
#[event(input = "ViewId", output = "ViewInfo")]
ReadViewInfo = 207,
#[event(input = "UpdateViewInfoPayload", output = "ViewInfo")]
UpdateViewInfo = 208,
#[event()]
CopyLink = 220,

7
frontend/rust-lib/flowy-folder/src/manager.rs
View File

@ -9,15 +9,12 @@ use crate::{
},
};
use bytes::Bytes;
use flowy_sync::client_document::default::{initial_quill_delta_string, initial_read_me};
use flowy_error::FlowyError;
use flowy_folder_data_model::entities::view::ViewDataType;
use flowy_folder_data_model::entities::UpdateViewInfoParams;
use flowy_folder_data_model::user_default;
use flowy_revision::disk::SQLiteTextBlockRevisionPersistence;
use flowy_revision::{RevisionManager, RevisionPersistence, RevisionWebSocket};
use flowy_sync::client_document::default::{initial_quill_delta_string, initial_read_me};
use flowy_sync::{client_folder::FolderPad, entities::ws_data::ServerRevisionWSData};
use lazy_static::lazy_static;
use lib_infra::future::FutureResult;
@ -256,8 +253,6 @@ pub trait ViewDataProcessor {
data: Vec<u8>,
) -> FutureResult<Bytes, FlowyError>;
fn handle_view_info_updated(&self, params: UpdateViewInfoParams) -> FutureResult<(), FlowyError>;
fn data_type(&self) -> ViewDataType;
}

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

@ -42,7 +42,6 @@ pub enum FolderEvent {
DuplicateView = 205,
CloseView = 206,
ReadViewInfo = 207,
UpdateViewInfo = 208,
CopyLink = 220,
SetLatestView = 221,
MoveFolderItem = 230,
@ -77,7 +76,6 @@ impl ::protobuf::ProtobufEnum for FolderEvent {
205 => ::std::option::Option::Some(FolderEvent::DuplicateView),
206 => ::std::option::Option::Some(FolderEvent::CloseView),
207 => ::std::option::Option::Some(FolderEvent::ReadViewInfo),
208 => ::std::option::Option::Some(FolderEvent::UpdateViewInfo),
220 => ::std::option::Option::Some(FolderEvent::CopyLink),
221 => ::std::option::Option::Some(FolderEvent::SetLatestView),
230 => ::std::option::Option::Some(FolderEvent::MoveFolderItem),
@ -109,7 +107,6 @@ impl ::protobuf::ProtobufEnum for FolderEvent {
FolderEvent::DuplicateView,
FolderEvent::CloseView,
FolderEvent::ReadViewInfo,
FolderEvent::UpdateViewInfo,
FolderEvent::CopyLink,
FolderEvent::SetLatestView,
FolderEvent::MoveFolderItem,
@ -146,7 +143,7 @@ impl ::protobuf::reflect::ProtobufValue for FolderEvent {
}
static file_descriptor_proto_data: &'static [u8] = b"\
\n\x0fevent_map.proto*\xeb\x03\n\x0bFolderEvent\x12\x13\n\x0fCreateWorks\
\n\x0fevent_map.proto*\xd6\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\
@ -154,12 +151,11 @@ static file_descriptor_proto_data: &'static [u8] = b"\
\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\x0e\n\tCloseView\x10\xce\x01\x12\
\x11\n\x0cReadViewInfo\x10\xcf\x01\x12\x13\n\x0eUpdateViewInfo\x10\xd0\
\x01\x12\r\n\x08CopyLink\x10\xdc\x01\x12\x12\n\rSetLatestView\x10\xdd\
\x01\x12\x13\n\x0eMoveFolderItem\x10\xe6\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\x0eDelet\
eAllTrash\x10\xb0\x02b\x06proto3\
\x11\n\x0cReadViewInfo\x10\xcf\x01\x12\r\n\x08CopyLink\x10\xdc\x01\x12\
\x12\n\rSetLatestView\x10\xdd\x01\x12\x13\n\x0eMoveFolderItem\x10\xe6\
\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\x02b\x06proto3\
";
static file_descriptor_proto_lazy: ::protobuf::rt::LazyV2<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::rt::LazyV2::INIT;

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

@ -18,7 +18,6 @@ enum FolderEvent {
DuplicateView = 205;
CloseView = 206;
ReadViewInfo = 207;
UpdateViewInfo = 208;
CopyLink = 220;
SetLatestView = 221;
MoveFolderItem = 230;

12
frontend/rust-lib/flowy-folder/src/services/folder_editor.rs
View File

@ -1,16 +1,14 @@
use flowy_sync::{
client_folder::{FolderChange, FolderPad},
entities::{revision::Revision, ws_data::ServerRevisionWSData},
};
use crate::manager::FolderId;
use bytes::Bytes;
use flowy_error::{FlowyError, FlowyResult};
use flowy_sync::util::make_delta_from_revisions;
use flowy_revision::{
RevisionCloudService, RevisionCompactor, RevisionManager, RevisionObjectBuilder, RevisionWebSocket,
};
use flowy_sync::util::make_delta_from_revisions;
use flowy_sync::{
client_folder::{FolderChange, FolderPad},
entities::{revision::Revision, ws_data::ServerRevisionWSData},
};
use lib_infra::future::FutureResult;
use lib_ot::core::PlainTextAttributes;

10
frontend/rust-lib/flowy-folder/src/services/view/controller.rs
View File

@ -15,7 +15,7 @@ use crate::{
use bytes::Bytes;
use flowy_database::kv::KV;
use flowy_folder_data_model::entities::view::{gen_view_id, ViewDataType};
use flowy_folder_data_model::entities::{UpdateViewInfoParams, ViewExtData, ViewInfo};
use flowy_folder_data_model::entities::ViewInfo;
use flowy_folder_data_model::revision::ViewRevision;
use flowy_sync::entities::text_block_info::TextBlockId;
use futures::{FutureExt, StreamExt};
@ -135,7 +135,6 @@ impl ViewController {
.map(|view_rev| view_rev.into())
.collect();
let ext_data = ViewExtData::from(view_rev.ext_data);
let view_info = ViewInfo {
id: view_rev.id,
belong_to_id: view_rev.belong_to_id,
@ -143,7 +142,7 @@ impl ViewController {
desc: view_rev.desc,
data_type: view_rev.data_type,
belongings: RepeatedView { items },
ext_data,
ext_data: view_rev.ext_data,
};
Ok(view_info)
})
@ -259,11 +258,6 @@ impl ViewController {
Ok(view_rev)
}
#[tracing::instrument(level = "debug", skip(self, _params), err)]
pub(crate) async fn update_view_info(&self, _params: UpdateViewInfoParams) -> Result<(), FlowyError> {
todo!()
}
pub(crate) async fn latest_visit_view(&self) -> FlowyResult<Option<ViewRevision>> {
match KV::get_str(LATEST_VIEW_ID) {
None => Ok(None),

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

@ -11,7 +11,7 @@ use crate::{
services::{TrashController, ViewController},
};
use flowy_folder_data_model::entities::view::{MoveFolderItemParams, MoveFolderItemPayload, MoveFolderItemType};
use flowy_folder_data_model::entities::{UpdateViewInfoParams, UpdateViewInfoPayload, ViewInfo};
use flowy_folder_data_model::entities::ViewInfo;
use flowy_folder_data_model::revision::TrashRevision;
use lib_dispatch::prelude::{data_result, AppData, Data, DataResult};
use std::{convert::TryInto, sync::Arc};
@ -54,17 +54,6 @@ pub(crate) async fn update_view_handler(
Ok(())
}
#[tracing::instrument(level = "debug", skip(data, controller), err)]
pub(crate) async fn update_view_info_handler(
data: Data<UpdateViewInfoPayload>,
controller: AppData<Arc<ViewController>>,
) -> Result<(), FlowyError> {
let params: UpdateViewInfoParams = data.into_inner().try_into()?;
let _ = controller.update_view_info(params).await?;
Ok(())
}
pub(crate) async fn delete_view_handler(
data: Data<RepeatedViewId>,
view_controller: AppData<Arc<ViewController>>,