refactor: prefer namespace isolation, remove Grid keyword in some structs

This commit is contained in:
appflowy
2022-08-11 13:25:55 +08:00
parent aae2d96a4f
commit 08b9930510
57 changed files with 493 additions and 352 deletions

View File

@ -2,7 +2,7 @@ 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::{FieldType, GridCellIdParams, GridRowPB};
use flowy_grid::entities::{FieldType, GridCellIdParams, RowPB};
use flowy_grid::services::field::*;
use flowy_grid_data_model::revision::{
GridBlockMetaRevision, GridBlockMetaRevisionChangeset, RowMetaChangeset, RowRevision,
@ -97,7 +97,7 @@ impl GridRowTest {
let row_orders = row_ids
.into_iter()
.map(|row_id| self.row_order_by_row_id.get(&row_id).unwrap().clone())
.collect::<Vec<GridRowPB>>();
.collect::<Vec<RowPB>>();
self.editor.delete_rows(row_orders).await.unwrap();
self.row_revs = self.get_row_revs().await;

View File

@ -17,7 +17,7 @@ pub fn create_text_field(grid_id: &str) -> (InsertFieldParams, FieldRevision) {
.protobuf_bytes()
.to_vec();
let field = GridFieldPB {
let field = FieldPB {
id: field_rev.id,
name: field_rev.name,
desc: field_rev.desc,
@ -50,7 +50,7 @@ pub fn create_single_select_field(grid_id: &str) -> (InsertFieldParams, FieldRev
.protobuf_bytes()
.to_vec();
let field = GridFieldPB {
let field = FieldPB {
id: field_rev.id,
name: field_rev.name,
desc: field_rev.desc,

View File

@ -32,7 +32,7 @@ pub struct GridEditorTest {
pub block_meta_revs: Vec<Arc<GridBlockMetaRevision>>,
pub row_revs: Vec<Arc<RowRevision>>,
pub field_count: usize,
pub row_order_by_row_id: HashMap<String, GridRowPB>,
pub row_order_by_row_id: HashMap<String, RowPB>,
}
impl GridEditorTest {