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: bump client api (#5217)

Browse Source 
* chore: bump client api

* chore: fix compile

* chore: fix compile
This commit is contained in:
Nathan.fooo
2024-04-27 21:55:12 +08:00
committed by GitHub
parent d4278a7549
commit 044dad1d3e
31 changed files with 597 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/rust-lib/flowy-database2/src/entities/row_entities.rs
View File

@ -355,7 +355,6 @@ pub struct CreateRowPayloadPB {
pub data: HashMap<String, String>,
}
#[derive(Default)]
pub struct CreateRowParams {
pub collab_params: collab_database::rows::CreateRowParams,
pub open_after_create: bool,

4
frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs
View File

@ -45,6 +45,7 @@ use super::notify_did_update_calculation;
use super::view_calculations::make_calculations_controller;
pub struct DatabaseViewEditor {
database_id: String,
pub view_id: String,
delegate: Arc<dyn DatabaseViewOperation>,
group_controller: Arc<RwLock<Option<Box<dyn GroupController>>>>,
@ -62,6 +63,7 @@ impl Drop for DatabaseViewEditor {
impl DatabaseViewEditor {
pub async fn new(
database_id: String,
view_id: String,
delegate: Arc<dyn DatabaseViewOperation>,
cell_cache: CellCache,
@ -104,6 +106,7 @@ impl DatabaseViewEditor {
make_calculations_controller(&view_id, delegate.clone(), notifier.clone()).await;
Ok(Self {
database_id,
view_id,
delegate,
group_controller,
@ -132,6 +135,7 @@ impl DatabaseViewEditor {
let mut result = CreateRowParams {
collab_params: collab_database::rows::CreateRowParams {
id: gen_row_id(),
database_id: self.database_id.clone(),
cells: Cells::new(),
height: 60,
visibility: true,

2
frontend/rust-lib/flowy-database2/src/services/database_view/views.rs
View File

@ -65,8 +65,10 @@ impl DatabaseViews {
err
))
})?;
let database_id = self.database.lock().get_database_id();
let editor = Arc::new(
DatabaseViewEditor::new(
database_id,
view_id.to_owned(),
self.view_operation.clone(),
self.cell_cache.clone(),

2
frontend/rust-lib/flowy-database2/src/services/share/csv/import.rs
View File

@ -102,7 +102,7 @@ fn database_from_fields_and_rows(
let rows = rows
.iter()
.map(|cells| {
let mut params = CreateRowParams::new(gen_row_id());
let mut params = CreateRowParams::new(gen_row_id(), database_id.clone());
for (index, cell_content) in cells.iter().enumerate() {
if let Some(field) = fields.get(index) {
let field_type = FieldType::from(field.field_type);

10
frontend/rust-lib/flowy-database2/src/template.rs
View File

@ -37,7 +37,7 @@ pub fn make_default_grid(view_id: &str, name: &str) -> CreateDatabaseParams {
database_id: database_id.clone(),
inline_view_id: view_id.to_string(),
views: vec![CreateViewParams {
database_id,
database_id: database_id.clone(),
view_id: view_id.to_string(),
name: name.to_string(),
layout: DatabaseLayout::Grid,
@ -51,9 +51,9 @@ pub fn make_default_grid(view_id: &str, name: &str) -> CreateDatabaseParams {
..Default::default()
}],
rows: vec![
CreateRowParams::new(gen_row_id()),
CreateRowParams::new(gen_row_id()),
CreateRowParams::new(gen_row_id()),
CreateRowParams::new(gen_row_id(), database_id.clone()),
CreateRowParams::new(gen_row_id(), database_id.clone()),
CreateRowParams::new(gen_row_id(), database_id.clone()),
],
fields,
}
@ -85,7 +85,7 @@ pub fn make_default_board(view_id: &str, name: &str) -> CreateDatabaseParams {
let mut rows = vec![];
for i in 0..3 {
let mut row = CreateRowParams::new(gen_row_id());
let mut row = CreateRowParams::new(gen_row_id(), database_id.clone());
row.cells.insert(
single_select_field_id.clone(),
insert_select_option_cell(vec![to_do_option.id.clone()], &single_select),

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

@ -284,15 +284,17 @@ impl DatabaseEditorTest {
}
pub struct TestRowBuilder<'a> {
database_id: &'a str,
row_id: RowId,
fields: &'a [Field],
cell_build: CellBuilder<'a>,
}
impl<'a> TestRowBuilder<'a> {
pub fn new(row_id: RowId, fields: &'a [Field]) -> Self {
pub fn new(database_id: &'a str, row_id: RowId, fields: &'a [Field]) -> Self {
let cell_build = CellBuilder::with_cells(Default::default(), fields);
Self {
database_id,
row_id,
fields,
cell_build,
@ -407,6 +409,7 @@ impl<'a> TestRowBuilder<'a> {
let timestamp = timestamp();
Row {
id: self.row_id,
database_id: self.database_id.to_string(),
cells: self.cell_build.build(),
height: 60,
visibility: true,

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

@ -16,6 +16,7 @@ use crate::database::mock_data::{COMPLETED, FACEBOOK, GOOGLE, PAUSED, PLANNED, T
// Kanban board unit test mock data
pub fn make_test_board() -> DatabaseData {
let database_id = gen_database_id();
let mut fields = vec![];
let mut rows = vec![];
// Iterate through the FieldType to create the corresponding Field.
@ -135,7 +136,7 @@ pub fn make_test_board() -> DatabaseData {
// We have many assumptions base on the number of the rows, so do not change the number of the loop.
for i in 0..5 {
let mut row_builder = TestRowBuilder::new(gen_row_id(), &fields);
let mut row_builder = TestRowBuilder::new(&database_id, gen_row_id(), &fields);
match i {
0 => {
for field_type in FieldType::iter() {
@ -242,7 +243,6 @@ 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 {

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

@ -11,6 +11,7 @@ use crate::database::database_editor::TestRowBuilder;
// Calendar unit test mock data
pub fn make_test_calendar() -> DatabaseData {
let database_id = gen_database_id();
let mut fields = vec![];
let mut rows = vec![];
@ -40,7 +41,7 @@ pub fn make_test_calendar() -> DatabaseData {
let field_settings = default_field_settings_for_fields(&fields, DatabaseLayout::Calendar);
for i in 0..5 {
let mut row_builder = TestRowBuilder::new(gen_row_id(), &fields);
let mut row_builder = TestRowBuilder::new(&database_id, gen_row_id(), &fields);
match i {
0 => {
for field_type in FieldType::iter() {
@ -106,7 +107,6 @@ 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 {

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

@ -14,6 +14,7 @@ use crate::database::database_editor::TestRowBuilder;
use crate::database::mock_data::{COMPLETED, FACEBOOK, GOOGLE, PAUSED, PLANNED, TWITTER};
pub fn make_test_grid() -> DatabaseData {
let database_id = gen_database_id();
let mut fields = vec![];
let mut rows = vec![];
@ -130,7 +131,7 @@ pub fn make_test_grid() -> DatabaseData {
let field_settings = default_field_settings_for_fields(&fields, DatabaseLayout::Grid);
for i in 0..7 {
let mut row_builder = TestRowBuilder::new(gen_row_id(), &fields);
let mut row_builder = TestRowBuilder::new(&database_id, gen_row_id(), &fields);
match i {
0 => {
for field_type in FieldType::iter() {
@ -265,7 +266,6 @@ 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 {
@ -287,6 +287,7 @@ pub fn make_test_grid() -> DatabaseData {
}
pub fn make_no_date_test_grid() -> DatabaseData {
let database_id = gen_database_id();
let mut fields = vec![];
let mut rows = vec![];
@ -317,7 +318,7 @@ pub fn make_no_date_test_grid() -> DatabaseData {
let field_settings = default_field_settings_for_fields(&fields, DatabaseLayout::Grid);
for i in 0..3 {
let mut row_builder = TestRowBuilder::new(gen_row_id(), &fields);
let mut row_builder = TestRowBuilder::new(&database_id, gen_row_id(), &fields);
match i {
0 => {
for field_type in FieldType::iter() {
@ -353,7 +354,6 @@ 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 {