yujunjun/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2025-10-31 01:54:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: rename folder event (#4205)

Browse Source
This commit is contained in:
Nathan.fooo 2023-12-24 07:44:08 +08:00 committed by GitHub
parent a4a21c7e94
commit c033d56978
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/appflowy_flutter/lib/plugins/trash/application/trash_service.dart
View File

@ -6,13 +6,13 @@ import 'package:appflowy_backend/protobuf/flowy-folder2/trash.pb.dart';
class TrashService { class TrashService {
Future<Either<RepeatedTrashPB, FlowyError>> readTrash() { Future<Either<RepeatedTrashPB, FlowyError>> readTrash() {
return FolderEventReadTrash().send(); return FolderEventListTrashItems().send();
} }
Future<Either<Unit, FlowyError>> putback(String trashId) { Future<Either<Unit, FlowyError>> putback(String trashId) {
final id = TrashIdPB.create()..id = trashId; final id = TrashIdPB.create()..id = trashId;
return FolderEventPutbackTrash(id).send(); return FolderEventRestoreTrashItem(id).send();
} }
Future<Either<Unit, FlowyError>> deleteViews(List<String> trash) { Future<Either<Unit, FlowyError>> deleteViews(List<String> trash) {
@ -21,14 +21,14 @@ class TrashService {
}); });
final ids = RepeatedTrashIdPB(items: items); final ids = RepeatedTrashIdPB(items: items);
return FolderEventDeleteTrash(ids).send(); return FolderEventPermanentlyDeleteTrashItem(ids).send();
} }
Future<Either<Unit, FlowyError>> restoreAll() { Future<Either<Unit, FlowyError>> restoreAll() {
return FolderEventRestoreAllTrash().send(); return FolderEventRecoverAllTrashItems().send();
} }
Future<Either<Unit, FlowyError>> deleteAll() { Future<Either<Unit, FlowyError>> deleteAll() {
return FolderEventDeleteAllTrash().send(); return FolderEventPermanentlyDeleteAllTrashItem().send();
} }
} }

2
frontend/appflowy_flutter/lib/workspace/application/home/home_service.dart
View File

@ -9,6 +9,6 @@ class HomeService {
Future<Either<ViewPB, FlowyError>> readApp({required String appId}) { Future<Either<ViewPB, FlowyError>> readApp({required String appId}) {
final payload = ViewIdPB.create()..value = appId; final payload = ViewIdPB.create()..value = appId;
return FolderEventReadView(payload).send(); return FolderEventGetView(payload).send();
} }
} }

6
frontend/appflowy_flutter/lib/workspace/application/view/view_service.dart
View File

@ -107,7 +107,7 @@ class ViewBackendService {
}) { }) {
final payload = ViewIdPB.create()..value = viewId; final payload = ViewIdPB.create()..value = viewId;
return FolderEventReadView(payload).send().then((result) { return FolderEventGetView(payload).send().then((result) {
return result.fold( return result.fold(
(view) => left(view.childViews), (view) => left(view.childViews),
(error) => right(error), (error) => right(error),
@ -247,7 +247,7 @@ class ViewBackendService {
String viewID, String viewID,
) async { ) async {
final payload = ViewIdPB.create()..value = viewID; final payload = ViewIdPB.create()..value = viewID;
return FolderEventReadView(payload).send(); return FolderEventGetView(payload).send();
} }
Future<Either<ViewPB, FlowyError>> getChildView({ Future<Either<ViewPB, FlowyError>> getChildView({
@ -255,7 +255,7 @@ class ViewBackendService {
required String childViewId, required String childViewId,
}) async { }) async {
final payload = ViewIdPB.create()..value = parentViewId; final payload = ViewIdPB.create()..value = parentViewId;
return FolderEventReadView(payload).send().then((result) { return FolderEventGetView(payload).send().then((result) {
return result.fold( return result.fold(
(app) => left( (app) => left(
app.childViews.firstWhere((e) => e.id == childViewId), app.childViews.firstWhere((e) => e.id == childViewId),

4
frontend/appflowy_tauri/src/appflowy_app/components/database/application/database_view/database_view_service.ts
View File

@ -2,7 +2,7 @@ import { CreateViewPayloadPB, RepeatedViewIdPB, UpdateViewPayloadPB, ViewIdPB, V
import { import {
FolderEventCreateView, FolderEventCreateView,
FolderEventDeleteView, FolderEventDeleteView,
FolderEventReadView, FolderEventGetView,
FolderEventUpdateView, FolderEventUpdateView,
} from '@/services/backend/events/flowy-folder2'; } from '@/services/backend/events/flowy-folder2';
import { databaseService } from '../database'; import { databaseService } from '../database';
@ -11,7 +11,7 @@ import { Page, parserViewPBToPage } from '$app_reducers/pages/slice';
export async function getDatabaseViews(viewId: string): Promise<Page[]> { export async function getDatabaseViews(viewId: string): Promise<Page[]> {
const payload = ViewIdPB.fromObject({ value: viewId }); const payload = ViewIdPB.fromObject({ value: viewId });
const result = await FolderEventReadView(payload); const result = await FolderEventGetView(payload);
if (result.ok) { if (result.ok) {
return [parserViewPBToPage(result.val), ...result.val.child_views.map(parserViewPBToPage)]; return [parserViewPBToPage(result.val), ...result.val.child_views.map(parserViewPBToPage)];

4
frontend/appflowy_tauri/src/appflowy_app/stores/effects/workspace/page/page_bd_svc.ts
View File

@ -1,5 +1,4 @@
import { import {
FolderEventReadView,
FolderEventCreateView, FolderEventCreateView,
FolderEventUpdateView, FolderEventUpdateView,
FolderEventDeleteView, FolderEventDeleteView,
@ -19,6 +18,7 @@ import {
FolderEventUpdateViewIcon, FolderEventUpdateViewIcon,
FolderEventCreateOrphanView, FolderEventCreateOrphanView,
CreateOrphanViewPayloadPB, CreateOrphanViewPayloadPB,
FolderEventGetView,
} from '@/services/backend/events/flowy-folder2'; } from '@/services/backend/events/flowy-folder2';
import { Page, PageIcon } from '$app_reducers/pages/slice'; import { Page, PageIcon } from '$app_reducers/pages/slice';
@ -32,7 +32,7 @@ export class PageBackendService {
value: viewId, value: viewId,
}); });
return FolderEventReadView(payload); return FolderEventGetView(payload);
}; };
movePage = async (params: { viewId: string; parentId: string; prevId?: string }) => { movePage = async (params: { viewId: string; parentId: string; prevId?: string }) => {

20
frontend/appflowy_tauri/src/appflowy_app/stores/effects/workspace/trash/bd_svc.ts
View File

@ -1,11 +1,11 @@
import { import {
FolderEventReadTrash,
FolderEventPutbackTrash,
FolderEventDeleteAllTrash,
FolderEventRestoreAllTrash,
FolderEventDeleteTrash,
TrashIdPB, TrashIdPB,
RepeatedTrashIdPB, RepeatedTrashIdPB,
FolderEventListTrashItems,
FolderEventRestoreTrashItem,
FolderEventPermanentlyDeleteTrashItem,
FolderEventPermanentlyDeleteAllTrashItem,
FolderEventRecoverAllTrashItems,
} from '@/services/backend/events/flowy-folder2'; } from '@/services/backend/events/flowy-folder2';
export class TrashBackendService { export class TrashBackendService {
@ -14,7 +14,7 @@ export class TrashBackendService {
} }
getTrash = async () => { getTrash = async () => {
return FolderEventReadTrash(); return FolderEventListTrashItems();
}; };
putback = async (id: string) => { putback = async (id: string) => {
@ -22,7 +22,7 @@ export class TrashBackendService {
id, id,
}); });
return FolderEventPutbackTrash(payload); return FolderEventRestoreTrashItem(payload);
}; };
delete = async (ids: string[]) => { delete = async (ids: string[]) => {
@ -31,14 +31,14 @@ export class TrashBackendService {
items, items,
}); });
return FolderEventDeleteTrash(payload); return FolderEventPermanentlyDeleteTrashItem(payload);
}; };
deleteAll = async () => { deleteAll = async () => {
return FolderEventDeleteAllTrash(); return FolderEventPermanentlyDeleteAllTrashItem();
}; };
restoreAll = async () => { restoreAll = async () => {
return FolderEventRestoreAllTrash(); return FolderEventRecoverAllTrashItems();
}; };
} }

4
frontend/rust-lib/event-integration/src/folder_event.rs
View File

@ -66,7 +66,7 @@ impl EventIntegrationTest {
pub async fn get_views(&self, parent_view_id: &str) -> ViewPB { pub async fn get_views(&self, parent_view_id: &str) -> ViewPB {
EventBuilder::new(self.clone()) EventBuilder::new(self.clone())
.event(FolderEvent::ReadView) .event(FolderEvent::GetView)
.payload(ViewIdPB { .payload(ViewIdPB {
value: parent_view_id.to_string(), value: parent_view_id.to_string(),
}) })
@ -129,7 +129,7 @@ impl EventIntegrationTest {
pub async fn get_view(&self, view_id: &str) -> ViewPB { pub async fn get_view(&self, view_id: &str) -> ViewPB {
EventBuilder::new(self.clone()) EventBuilder::new(self.clone())
.event(FolderEvent::ReadView) .event(FolderEvent::GetView)
.payload(ViewIdPB { .payload(ViewIdPB {
value: view_id.to_string(), value: view_id.to_string(),
}) })

10
frontend/rust-lib/event-integration/tests/folder/local_test/script.rs
View File

@ -258,7 +258,7 @@ pub async fn create_view(
pub async fn read_view(sdk: &EventIntegrationTest, view_id: &str) -> ViewPB { pub async fn read_view(sdk: &EventIntegrationTest, view_id: &str) -> ViewPB {
let view_id = ViewIdPB::from(view_id); let view_id = ViewIdPB::from(view_id);
EventBuilder::new(sdk.clone()) EventBuilder::new(sdk.clone())
.event(ReadView) .event(GetView)
.payload(view_id) .payload(view_id)
.async_send() .async_send()
.await .await
@ -330,7 +330,7 @@ pub async fn delete_view(sdk: &EventIntegrationTest, view_ids: Vec<String>) {
pub async fn read_trash(sdk: &EventIntegrationTest) -> RepeatedTrashPB { pub async fn read_trash(sdk: &EventIntegrationTest) -> RepeatedTrashPB {
EventBuilder::new(sdk.clone()) EventBuilder::new(sdk.clone())
.event(ReadTrash) .event(ListTrashItems)
.async_send() .async_send()
.await .await
.parse::<RepeatedTrashPB>() .parse::<RepeatedTrashPB>()
@ -341,7 +341,7 @@ pub async fn restore_app_from_trash(sdk: &EventIntegrationTest, app_id: &str) {
id: app_id.to_owned(), id: app_id.to_owned(),
}; };
EventBuilder::new(sdk.clone()) EventBuilder::new(sdk.clone())
.event(PutbackTrash) .event(RestoreTrashItem)
.payload(id) .payload(id)
.async_send() .async_send()
.await; .await;
@ -352,7 +352,7 @@ pub async fn restore_view_from_trash(sdk: &EventIntegrationTest, view_id: &str)
id: view_id.to_owned(), id: view_id.to_owned(),
}; };
EventBuilder::new(sdk.clone()) EventBuilder::new(sdk.clone())
.event(PutbackTrash) .event(RestoreTrashItem)
.payload(id) .payload(id)
.async_send() .async_send()
.await; .await;
@ -360,7 +360,7 @@ pub async fn restore_view_from_trash(sdk: &EventIntegrationTest, view_id: &str)
pub async fn delete_all_trash(sdk: &EventIntegrationTest) { pub async fn delete_all_trash(sdk: &EventIntegrationTest) {
EventBuilder::new(sdk.clone()) EventBuilder::new(sdk.clone())
.event(DeleteAllTrash) .event(PermanentlyDeleteAllTrashItem)
.async_send() .async_send()
.await; .await;
} }

22
frontend/rust-lib/event-integration/tests/folder/local_test/test.rs
View File

@ -122,7 +122,7 @@ async fn delete_view_event_test() {
value: view.id.clone(), value: view.id.clone(),
}; };
let error = EventBuilder::new(test.clone()) let error = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::ReadView) .event(flowy_folder2::event_map::FolderEvent::GetView)
.payload(payload) .payload(payload)
.async_send() .async_send()
.await .await
@ -145,7 +145,7 @@ async fn put_back_trash_event_test() {
value: view.id.clone(), value: view.id.clone(),
}; };
let error = EventBuilder::new(test.clone()) let error = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::ReadView) .event(flowy_folder2::event_map::FolderEvent::GetView)
.payload(payload) .payload(payload)
.async_send() .async_send()
.await .await
@ -157,7 +157,7 @@ async fn put_back_trash_event_test() {
id: view.id.clone(), id: view.id.clone(),
}; };
EventBuilder::new(test.clone()) EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::PutbackTrash) .event(flowy_folder2::event_map::FolderEvent::RestoreTrashItem)
.payload(payload) .payload(payload)
.async_send() .async_send()
.await; .await;
@ -166,7 +166,7 @@ async fn put_back_trash_event_test() {
value: view.id.clone(), value: view.id.clone(),
}; };
let error = EventBuilder::new(test.clone()) let error = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::ReadView) .event(flowy_folder2::event_map::FolderEvent::GetView)
.payload(payload) .payload(payload)
.async_send() .async_send()
.await .await
@ -193,7 +193,7 @@ async fn delete_view_permanently_event_test() {
.await; .await;
let trash = EventBuilder::new(test.clone()) let trash = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::ReadTrash) .event(flowy_folder2::event_map::FolderEvent::ListTrashItems)
.async_send() .async_send()
.await .await
.parse::<flowy_folder2::entities::RepeatedTrashPB>() .parse::<flowy_folder2::entities::RepeatedTrashPB>()
@ -208,14 +208,14 @@ async fn delete_view_permanently_event_test() {
}], }],
}; };
EventBuilder::new(test.clone()) EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::DeleteTrash) .event(flowy_folder2::event_map::FolderEvent::PermanentlyDeleteTrashItem)
.payload(payload) .payload(payload)
.async_send() .async_send()
.await; .await;
// After delete the last view, the trash should be empty // After delete the last view, the trash should be empty
let trash = EventBuilder::new(test.clone()) let trash = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::ReadTrash) .event(flowy_folder2::event_map::FolderEvent::ListTrashItems)
.async_send() .async_send()
.await .await
.parse::<flowy_folder2::entities::RepeatedTrashPB>() .parse::<flowy_folder2::entities::RepeatedTrashPB>()
@ -244,7 +244,7 @@ async fn delete_all_trash_test() {
} }
let trash = EventBuilder::new(test.clone()) let trash = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::ReadTrash) .event(flowy_folder2::event_map::FolderEvent::ListTrashItems)
.async_send() .async_send()
.await .await
.parse::<flowy_folder2::entities::RepeatedTrashPB>() .parse::<flowy_folder2::entities::RepeatedTrashPB>()
@ -253,13 +253,13 @@ async fn delete_all_trash_test() {
// Delete all the trash // Delete all the trash
EventBuilder::new(test.clone()) EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::DeleteAllTrash) .event(flowy_folder2::event_map::FolderEvent::PermanentlyDeleteAllTrashItem)
.async_send() .async_send()
.await; .await;
// After delete the last view, the trash should be empty // After delete the last view, the trash should be empty
let trash = EventBuilder::new(test.clone()) let trash = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::ReadTrash) .event(flowy_folder2::event_map::FolderEvent::ListTrashItems)
.async_send() .async_send()
.await .await
.parse::<flowy_folder2::entities::RepeatedTrashPB>() .parse::<flowy_folder2::entities::RepeatedTrashPB>()
@ -323,7 +323,7 @@ async fn multiple_hierarchy_view_test() {
}; };
let child = EventBuilder::new(test.clone()) let child = EventBuilder::new(test.clone())
.event(flowy_folder2::event_map::FolderEvent::ReadView) .event(flowy_folder2::event_map::FolderEvent::GetView)
.payload(payload) .payload(payload)
.async_send() .async_send()
.await .await

24
frontend/rust-lib/flowy-folder2/src/event_map.rs
View File

@ -18,7 +18,7 @@ pub fn init(folder: Weak<FolderManager>) -> AFPlugin {
// View // View
.event(FolderEvent::CreateView, create_view_handler) .event(FolderEvent::CreateView, create_view_handler)
.event(FolderEvent::CreateOrphanView, create_orphan_view_handler) .event(FolderEvent::CreateOrphanView, create_orphan_view_handler)
.event(FolderEvent::ReadView, read_view_handler) .event(FolderEvent::GetView, read_view_handler)
.event(FolderEvent::UpdateView, update_view_handler) .event(FolderEvent::UpdateView, update_view_handler)
.event(FolderEvent::DeleteView, delete_view_handler) .event(FolderEvent::DeleteView, delete_view_handler)
.event(FolderEvent::DuplicateView, duplicate_view_handler) .event(FolderEvent::DuplicateView, duplicate_view_handler)
@ -27,11 +27,11 @@ pub fn init(folder: Weak<FolderManager>) -> AFPlugin {
.event(FolderEvent::MoveView, move_view_handler) .event(FolderEvent::MoveView, move_view_handler)
.event(FolderEvent::MoveNestedView, move_nested_view_handler) .event(FolderEvent::MoveNestedView, move_nested_view_handler)
// Trash // Trash
.event(FolderEvent::ReadTrash, read_trash_handler) .event(FolderEvent::ListTrashItems, read_trash_handler)
.event(FolderEvent::PutbackTrash, putback_trash_handler) .event(FolderEvent::RestoreTrashItem, putback_trash_handler)
.event(FolderEvent::DeleteTrash, delete_trash_handler) .event(FolderEvent::PermanentlyDeleteTrashItem, delete_trash_handler)
.event(FolderEvent::RestoreAllTrash, restore_all_trash_handler) .event(FolderEvent::RecoverAllTrashItems, restore_all_trash_handler)
.event(FolderEvent::DeleteAllTrash, delete_all_trash_handler) .event(FolderEvent::PermanentlyDeleteAllTrashItem, delete_all_trash_handler)
.event(FolderEvent::ImportData, import_data_handler) .event(FolderEvent::ImportData, import_data_handler)
.event(FolderEvent::GetFolderSnapshots, get_folder_snapshots_handler) .event(FolderEvent::GetFolderSnapshots, get_folder_snapshots_handler)
.event(FolderEvent::UpdateViewIcon, update_view_icon_handler) .event(FolderEvent::UpdateViewIcon, update_view_icon_handler)
@ -71,7 +71,7 @@ pub enum FolderEvent {
/// Return the view info /// Return the view info
#[event(input = "ViewIdPB", output = "ViewPB")] #[event(input = "ViewIdPB", output = "ViewPB")]
ReadView = 11, GetView = 11,
/// Update the view's properties including the name,description, etc. /// Update the view's properties including the name,description, etc.
#[event(input = "UpdateViewPayloadPB", output = "ViewPB")] #[event(input = "UpdateViewPayloadPB", output = "ViewPB")]
@ -107,23 +107,23 @@ pub enum FolderEvent {
/// Read the trash that was deleted by the user /// Read the trash that was deleted by the user
#[event(output = "RepeatedTrashPB")] #[event(output = "RepeatedTrashPB")]
ReadTrash = 23, ListTrashItems = 23,
/// Put back the trash to the origin folder /// Put back the trash to the origin folder
#[event(input = "TrashIdPB")] #[event(input = "TrashIdPB")]
PutbackTrash = 24, RestoreTrashItem = 24,
/// Delete the trash from the disk /// Delete the trash from the disk
#[event(input = "RepeatedTrashIdPB")] #[event(input = "RepeatedTrashIdPB")]
DeleteTrash = 25, PermanentlyDeleteTrashItem = 25,
/// Put back all the trash to its original folder /// Put back all the trash to its original folder
#[event()] #[event()]
RestoreAllTrash = 26, RecoverAllTrashItems = 26,
/// Delete all the trash from the disk /// Delete all the trash from the disk
#[event()] #[event()]
DeleteAllTrash = 27, PermanentlyDeleteAllTrashItem = 27,
#[event(input = "ImportPB")] #[event(input = "ImportPB")]
ImportData = 30, ImportData = 30,