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
Merge branch 'main' into refactor/add_pb_suffix
appflowy3a0b8bbd7453
diff --cc frontend/rust-lib/flowy-grid/src/services/grid_editor.rsindex e6a37ef203,413f4812de..c312779487--- a/frontend/rust-lib/flowy-grid/src/services/grid_editor.rs+++ b/frontend/rust-lib/flowy-grid/src/services/grid_editor.rs@@@ -274,9 -273,8 +273,8 @@@ impl GridRevisionEditorlet block_id = self.block_id().await?;// insert empty row below the row whose id is upper_row_id- let row_rev_ctx = CreateRowRevisionBuilder::new(&field_revs).build();- let row_rev = make_row_rev_from_context(&block_id, row_rev_ctx);+ let row_rev = RowRevisionBuilder::new(&field_revs).build(&block_id);- let row_order = RowInfo::from(&row_rev);+ let row_order = Row::from(&row_rev);// insert the rowlet row_count = self.block_manager.create_row(&block_id, row_rev, start_row_id).await?;@@@ -287,13 -285,12 +285,12 @@@Ok(row_order)}- pub async fn insert_rows(&self, contexts: Vec<CreateRowRevisionPayload>) -> FlowyResult<Vec<Row>> {- pub async fn insert_rows(&self, row_revs: Vec<RowRevision>) -> FlowyResult<Vec<RowInfo>> {++ pub async fn insert_rows(&self, row_revs: Vec<RowRevision>) -> FlowyResult<Vec<Row>> {let block_id = self.block_id().await?;let mut rows_by_block_id: HashMap<String, Vec<RowRevision>> = HashMap::new();let mut row_orders = vec![];- for ctx in contexts {- let row_rev = make_row_rev_from_context(&block_id, ctx);+ for row_rev in row_revs {- row_orders.push(RowInfo::from(&row_rev));+ row_orders.push(Row::from(&row_rev));rows_by_block_id.entry(block_id.clone()).or_insert_with(Vec::new)diff --cc frontend/rust-lib/flowy-grid/src/services/row/row_loader.rsindex 9d6543b650,81d9420d88..c00604a40a--- a/frontend/rust-lib/flowy-grid/src/services/row/row_loader.rs+++ b/frontend/rust-lib/flowy-grid/src/services/row/row_loader.rs@@@ -1,6 -1,6 +1,6 @@@-use crate::entities::{GridBlock, RepeatedGridBlock, Row, RowInfo};+use crate::entities::{GridBlock, RepeatedGridBlock, Row};use flowy_error::FlowyResult;- use flowy_grid_data_model::revision::{FieldRevision, RowRevision};+ use flowy_grid_data_model::revision::RowRevision;use std::collections::HashMap;use std::sync::Arc;@@@ -35,33 -35,18 +35,19 @@@ pub(crate) fn block_from_row_orders(row// Some((field_id, cell))// }-pub(crate) fn make_row_orders_from_row_revs(row_revs: &[Arc<RowRevision>]) -> Vec<RowInfo> {- row_revs.iter().map(RowInfo::from).collect::<Vec<_>>()+pub(crate) fn make_row_orders_from_row_revs(row_revs: &[Arc<RowRevision>]) -> Vec<Row> {+ row_revs.iter().map(Row::from).collect::<Vec<_>>()}- pub(crate) fn make_row_from_row_rev(fields: &[Arc<FieldRevision>], row_rev: Arc<RowRevision>) -> Option<Row> {- make_rows_from_row_revs(fields, &[row_rev]).pop()+ pub(crate) fn make_row_from_row_rev(row_rev: Arc<RowRevision>) -> Option<Row> {+ make_rows_from_row_revs(&[row_rev]).pop()}- pub(crate) fn make_rows_from_row_revs(_fields: &[Arc<FieldRevision>], row_revs: &[Arc<RowRevision>]) -> Vec<Row> {- // let field_rev_map = fields- // .iter()- // .map(|field_rev| (&field_rev.id, field_rev))- // .collect::<HashMap<&String, &FieldRevision>>();-- let make_row = |row_rev: &Arc<RowRevision>| {- // let cell_by_field_id = row_rev- // .cells- // .clone()- // .into_iter()- // .flat_map(|(field_id, cell_rev)| make_cell_by_field_id(&field_rev_map, field_id, cell_rev))- // .collect::<HashMap<String, Cell>>();-- Row {- block_id: row_rev.block_id.clone(),- id: row_rev.id.clone(),- height: row_rev.height,- }+ pub(crate) fn make_rows_from_row_revs(row_revs: &[Arc<RowRevision>]) -> Vec<Row> {+ let make_row = |row_rev: &Arc<RowRevision>| Row {++ block_id: row_rev.block_id.clone(),+ id: row_rev.id.clone(),+ height: row_rev.height,};row_revs.iter().map(make_row).collect::<Vec<_>>()diff --cc frontend/rust-lib/flowy-grid/tests/grid/block_test/script.rsindex 5a9b29b76d,015dcfee88..18810032f0--- a/frontend/rust-lib/flowy-grid/tests/grid/block_test/script.rs+++ b/frontend/rust-lib/flowy-grid/tests/grid/block_test/script.rs@@@ -1,10 -1,14 +1,15 @@@+ use crate::grid::block_test::script::RowScript::{AssertCell, CreateRow};+ use crate::grid::block_test::util::GridRowTestBuilder;use crate::grid::grid_editor::GridEditorTest;- use flowy_grid::entities::Row;- use flowy_grid::services::row::{CreateRowRevisionBuilder, CreateRowRevisionPayload};-use flowy_grid::entities::{CellIdentifier, FieldType, RowInfo};++++use flowy_grid::entities::{CellIdentifier, FieldType, Row};+ use flowy_grid::services::field::*;use flowy_grid_data_model::revision::{- FieldRevision, GridBlockMetaRevision, GridBlockMetaRevisionChangeset, RowMetaChangeset, RowRevision,+ GridBlockMetaRevision, GridBlockMetaRevisionChangeset, RowMetaChangeset, RowRevision,};+ use std::collections::HashMap;use std::sync::Arc;+ use strum::IntoEnumIterator;pub enum RowScript {CreateEmptyRow,