Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
fix: open relation database row
Nathanf6522297184b
diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/row/related_row_detail_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/application/row/related_row_detail_bloc.dartindex 4f975cd1a6..f735618dd8 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/row/related_row_detail_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/row/related_row_detail_bloc.dart@@ -73,27 +73,24 @@ class RelatedRowDetailPageBloc});}- /// initialize bloc through the `database_id` and `row_id`. The process is as- /// follows:- /// 1. use the `database_id` to get the database meta, which contains the- /// `inline_view_id`- /// 2. use the `inline_view_id` to instantiate a `DatabaseController`.- /// 3. use the `row_id` with the DatabaseController` to create `RowController`void _init(String databaseId, String initialRowId) async {- final databaseMeta =- await DatabaseEventGetDatabaseMeta(DatabaseIdPB(value: databaseId))- .send()- .fold<DatabaseMetaPB?>((s) => s, (f) => null);- if (databaseMeta == null) {+ final viewId = await DatabaseEventGetDefaultDatabaseViewId(+ DatabaseIdPB(value: databaseId),+ ).send().fold(+ (pb) => pb.value,+ (error) => null,+ );++ if (viewId == null) {return;}- final inlineView =- await ViewBackendService.getView(databaseMeta.inlineViewId)- .fold((viewPB) => viewPB, (f) => null);- if (inlineView == null) {++ final databaseView = await ViewBackendService.getView(viewId)+ .fold((viewPB) => viewPB, (f) => null);+ if (databaseView == null) {return;}- final databaseController = DatabaseController(view: inlineView);+ final databaseController = DatabaseController(view: databaseView);await databaseController.open().fold((s) => databaseController.setIsLoading(false),(f) => null,@@ -104,7 +101,7 @@ class RelatedRowDetailPageBloc}final rowController = RowController(rowMeta: rowInfo.rowMeta,- viewId: inlineView.id,+ viewId: databaseView.id,rowCache: databaseController.rowCache,);diff --git a/frontend/rust-lib/flowy-database2/src/event_handler.rs b/frontend/rust-lib/flowy-database2/src/event_handler.rsindex 6117a8ee8a..9164550fe4 100644--- a/frontend/rust-lib/flowy-database2/src/event_handler.rs+++ b/frontend/rust-lib/flowy-database2/src/event_handler.rs@@ -865,17 +865,25 @@ pub(crate) async fn delete_group_handler(}#[tracing::instrument(level = "debug", skip(manager), err)]-pub(crate) async fn get_database_meta_handler(+pub(crate) async fn get_default_database_view_id_handler(data: AFPluginData<DatabaseIdPB>,manager: AFPluginState<Weak<DatabaseManager>>,-) -> DataResult<DatabaseMetaPB, FlowyError> {+) -> DataResult<DatabaseViewIdPB, FlowyError> {let manager = upgrade_manager(manager)?;let database_id = data.into_inner().value;- let inline_view_id = manager.get_database_inline_view_id(&database_id).await?;-- let data = DatabaseMetaPB {- database_id,- inline_view_id,+ let database_view_id = manager+ .get_database_meta(&database_id)+ .await?+ .and_then(|mut d| d.linked_views.pop())+ .ok_or_else(|| {+ FlowyError::internal().with_context(format!(+ "Can't find any database view for given database id: {}",+ database_id+ ))+ })?;++ let data = DatabaseViewIdPB {+ value: database_view_id,};data_result_ok(data)}diff --git a/frontend/rust-lib/flowy-database2/src/event_map.rs b/frontend/rust-lib/flowy-database2/src/event_map.rsindex 6281cde745..824565e5b8 100644--- a/frontend/rust-lib/flowy-database2/src/event_map.rs+++ b/frontend/rust-lib/flowy-database2/src/event_map.rs@@ -64,7 +64,7 @@ pub fn init(database_manager: Weak<DatabaseManager>) -> AFPlugin {.event(DatabaseEvent::CreateGroup, create_group_handler).event(DatabaseEvent::DeleteGroup, delete_group_handler)// Database- .event(DatabaseEvent::GetDatabaseMeta, get_database_meta_handler)+ .event(DatabaseEvent::GetDefaultDatabaseViewId, get_default_database_view_id_handler).event(DatabaseEvent::GetDatabases, get_databases_handler)// Calendar.event(DatabaseEvent::GetAllCalendarEvents, get_calendar_events_handler)@@ -305,8 +305,8 @@ pub enum DatabaseEvent {#[event(input = "DeleteGroupPayloadPB")]DeleteGroup = 115,- #[event(input = "DatabaseIdPB", output = "DatabaseMetaPB")]- GetDatabaseMeta = 119,+ #[event(input = "DatabaseIdPB", output = "DatabaseViewIdPB")]+ GetDefaultDatabaseViewId = 119,/// Returns all the databases#[event(output = "RepeatedDatabaseDescriptionPB")]diff --git a/frontend/rust-lib/flowy-database2/src/manager.rs b/frontend/rust-lib/flowy-database2/src/manager.rsindex b2b2b0a676..49a946d108 100644--- a/frontend/rust-lib/flowy-database2/src/manager.rs+++ b/frontend/rust-lib/flowy-database2/src/manager.rs@@ -166,6 +166,15 @@ impl DatabaseManager {items}+ pub async fn get_database_meta(&self, database_id: &str) -> FlowyResult<Option<DatabaseMeta>> {+ let mut database_meta = None;+ if let Some(lock) = self.workspace_database_manager.load_full() {+ let wdb = lock.read().await;+ database_meta = wdb.get_database_meta(database_id);+ }+ Ok(database_meta)+ }+#[instrument(level = "trace", skip_all, err)]pub async fn update_database_indexing(&self,