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

chore: improve link between folder and database (#5024)

Browse Source 
* chore: improve link between folder and database

* chore: fix tests

* chore: update collab rev

---------

Co-authored-by: Lucas.Xu <lucas.xu@appflowy.io>
This commit is contained in:
Richard Shiue
2024-04-19 17:24:11 +08:00
committed by GitHub
parent fab871eedb
commit 7745e54221
15 changed files with 209 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/rust-lib/flowy-database2/tests/database/database_editor.rs
View File

@ -3,8 +3,7 @@ use std::sync::Arc;
use collab_database::database::{gen_database_view_id, timestamp};
use collab_database::fields::Field;
use collab_database::rows::{CreateRowParams, RowDetail, RowId};
use collab_database::views::OrderObjectPosition;
use collab_database::rows::{Row, RowDetail, RowId};
use lib_infra::box_any::BoxAny;
use strum::EnumCount;
@ -404,14 +403,15 @@ impl<'a> TestRowBuilder<'a> {
.clone()
}
pub fn build(self) -> CreateRowParams {
CreateRowParams {
pub fn build(self) -> Row {
let timestamp = timestamp();
Row {
id: self.row_id,
cells: self.cell_build.build(),
height: 60,
visibility: true,
row_position: OrderObjectPosition::End,
timestamp: timestamp(),
modified_at: timestamp,
created_at: timestamp,
}
}
}

16
frontend/rust-lib/flowy-database2/tests/database/mock_data/board_mock_data.rs
View File

@ -242,9 +242,12 @@ pub fn make_test_board() -> DatabaseData {
let mut layout_settings = LayoutSettings::new();
layout_settings.insert(DatabaseLayout::Board, board_setting);
let database_id = gen_database_id();
let inline_view_id = gen_database_view_id();
let view = DatabaseView {
id: gen_database_view_id(),
database_id: gen_database_id(),
id: inline_view_id.clone(),
database_id: database_id.clone(),
name: "".to_string(),
layout: DatabaseLayout::Board,
layout_settings,
@ -257,5 +260,12 @@ pub fn make_test_board() -> DatabaseData {
modified_at: 0,
field_settings,
};
DatabaseData { view, fields, rows }
DatabaseData {
database_id,
inline_view_id,
views: vec![view],
fields,
rows,
}
}

15
frontend/rust-lib/flowy-database2/tests/database/mock_data/calendar_mock_data.rs
View File

@ -106,9 +106,12 @@ pub fn make_test_calendar() -> DatabaseData {
let mut layout_settings = LayoutSettings::new();
layout_settings.insert(DatabaseLayout::Calendar, calendar_setting);
let database_id = gen_database_id();
let inline_view_id = gen_database_view_id();
let view = DatabaseView {
id: gen_database_view_id(),
database_id: gen_database_id(),
database_id: database_id.clone(),
id: inline_view_id.clone(),
name: "".to_string(),
layout: DatabaseLayout::Calendar,
layout_settings,
@ -122,5 +125,11 @@ pub fn make_test_calendar() -> DatabaseData {
field_settings,
};
DatabaseData { view, fields, rows }
DatabaseData {
database_id,
inline_view_id,
views: vec![view],
fields,
rows,
}
}

30
frontend/rust-lib/flowy-database2/tests/database/mock_data/grid_mock_data.rs
View File

@ -265,16 +265,25 @@ pub fn make_test_grid() -> DatabaseData {
rows.push(row);
}
let database_id = gen_database_id();
let inline_view_id = gen_database_view_id();
let view = DatabaseView {
id: gen_database_id(),
database_id: gen_database_view_id(),
database_id: database_id.clone(),
id: inline_view_id.clone(),
name: "".to_string(),
layout: DatabaseLayout::Grid,
field_settings,
..Default::default()
};
DatabaseData { view, fields, rows }
DatabaseData {
database_id,
inline_view_id,
views: vec![view],
fields,
rows,
}
}
pub fn make_no_date_test_grid() -> DatabaseData {
@ -344,14 +353,23 @@ pub fn make_no_date_test_grid() -> DatabaseData {
rows.push(row);
}
let database_id = gen_database_id();
let inline_view_id = gen_database_view_id();
let view = DatabaseView {
id: gen_database_view_id(),
database_id: gen_database_id(),
database_id: database_id.clone(),
id: inline_view_id.clone(),
name: "".to_string(),
layout: DatabaseLayout::Grid,
field_settings,
..Default::default()
};
DatabaseData { view, fields, rows }
DatabaseData {
database_id,
inline_view_id,
views: vec![view],
fields,
rows,
}
}