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: move field width to field settings (#3830)

Browse Source 
* refactor: remove unnecessary builder

* feat: add width to field settings

* refactor: field settings logic

* chore: oopsies

* chore: implement UI

* chore: remove GridFieldCellEquatable

* test: rust-lib test fix
This commit is contained in:
Richard Shiue
2023-11-06 14:48:59 +08:00
committed by GitHub
parent 2b684ae7bf
commit 4d82bb5322
37 changed files with 317 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/rust-lib/flowy-database2/src/entities/field_entities.rs
View File

@ -521,13 +521,6 @@ impl FieldType {
self.clone().into()
}
pub fn default_cell_width(&self) -> i32 {
match self {
FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => 180,
_ => 150,
}
}
pub fn default_name(&self) -> String {
let s = match self {
FieldType::RichText => "Text",

9
frontend/rust-lib/flowy-database2/src/entities/field_settings_entities.rs
View File

@ -15,6 +15,9 @@ pub struct FieldSettingsPB {
#[pb(index = 2)]
pub visibility: FieldVisibility,
#[pb(index = 3)]
pub width: i32,
}
impl From<FieldSettings> for FieldSettingsPB {
@ -22,6 +25,7 @@ impl From<FieldSettings> for FieldSettingsPB {
Self {
field_id: value.field_id,
visibility: value.visibility,
width: value.width,
}
}
}
@ -99,6 +103,9 @@ pub struct FieldSettingsChangesetPB {
#[pb(index = 3, one_of)]
pub visibility: Option<FieldVisibility>,
#[pb(index = 4, one_of)]
pub width: Option<i32>,
}
impl From<FieldSettingsChangesetParams> for FieldSettingsChangesetPB {
@ -107,6 +114,7 @@ impl From<FieldSettingsChangesetParams> for FieldSettingsChangesetPB {
view_id: value.view_id,
field_id: value.field_id,
visibility: value.visibility,
width: value.width,
}
}
}
@ -119,6 +127,7 @@ impl TryFrom<FieldSettingsChangesetPB> for FieldSettingsChangesetParams {
view_id: value.view_id,
field_id: value.field_id,
visibility: value.visibility,
width: value.width,
})
}
}

8
frontend/rust-lib/flowy-database2/src/event_handler.rs
View File

@ -892,10 +892,8 @@ pub(crate) async fn get_field_settings_handler(
let (view_id, field_ids) = data.into_inner().try_into()?;
let database_editor = manager.get_database_with_view_id(&view_id).await?;
let layout_ty = database_editor.get_layout_type(view_id.as_ref()).await;
let field_settings = database_editor
.get_field_settings(&view_id, layout_ty, field_ids.clone())
.get_field_settings(&view_id, field_ids.clone())
.await?
.into_iter()
.map(FieldSettingsPB::from)
@ -915,10 +913,8 @@ pub(crate) async fn get_all_field_settings_handler(
let view_id = data.into_inner();
let database_editor = manager.get_database_with_view_id(view_id.as_ref()).await?;
let layout_ty = database_editor.get_layout_type(view_id.as_ref()).await;
let field_settings = database_editor
.get_all_field_settings(view_id.as_ref(), layout_ty)
.get_all_field_settings(view_id.as_ref())
.await?
.into_iter()
.map(FieldSettingsPB::from)

142
frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs
View File

@ -1090,57 +1090,27 @@ impl DatabaseEditor {
pub async fn get_field_settings(
&self,
view_id: &str,
layout_ty: DatabaseLayout,
field_ids: Vec<String>,
) -> FlowyResult<Vec<FieldSettings>> {
let view = self.database_views.get_view_editor(view_id).await?;
let default_field_settings = default_field_settings_by_layout_map()
.get(&layout_ty)
.unwrap()
.to_owned();
let found_field_settings = view.v_get_field_settings(&field_ids).await;
let field_settings = field_ids
.into_iter()
.map(|field_id| {
if let Some(field_settings) = found_field_settings.get(&field_id) {
field_settings.to_owned()
} else {
FieldSettings::try_from_anymap(field_id, default_field_settings.clone()).unwrap()
}
})
let field_settings = view
.v_get_field_settings(&field_ids)
.await
.into_values()
.collect();
Ok(field_settings)
}
pub async fn get_all_field_settings(
&self,
view_id: &str,
layout_ty: DatabaseLayout,
) -> FlowyResult<Vec<FieldSettings>> {
let view = self.database_views.get_view_editor(view_id).await?;
let default_field_settings = default_field_settings_by_layout_map()
.get(&layout_ty)
.unwrap()
.to_owned();
let fields = self.get_fields(view_id, None);
let found_field_settings = view.v_get_all_field_settings().await;
let field_settings = fields
.into_iter()
.map(|field| {
if let Some(field_settings) = found_field_settings.get(&field.id) {
field_settings.to_owned()
} else {
FieldSettings::try_from_anymap(field.id, default_field_settings.clone()).unwrap()
}
})
pub async fn get_all_field_settings(&self, view_id: &str) -> FlowyResult<Vec<FieldSettings>> {
let field_ids = self
.get_fields(view_id, None)
.iter()
.map(|field| field.id.clone())
.collect();
Ok(field_settings)
self.get_field_settings(view_id, field_ids).await
}
pub async fn update_field_settings_with_changeset(
@ -1149,7 +1119,12 @@ impl DatabaseEditor {
) -> FlowyResult<()> {
let view = self.database_views.get_view_editor(&params.view_id).await?;
view
.v_update_field_settings(&params.view_id, &params.field_id, params.visibility)
.v_update_field_settings(
&params.view_id,
&params.field_id,
params.visibility,
params.width,
)
.await?;
Ok(())
@ -1417,38 +1392,37 @@ impl DatabaseViewOperation for DatabaseViewOperationImpl {
view_id: &str,
field_ids: &[String],
) -> HashMap<String, FieldSettings> {
let field_settings_map = self
.database
.lock()
.get_field_settings(view_id, Some(field_ids));
let (layout_type, field_settings_map) = {
let database = self.database.lock();
let layout_type = database.views.get_database_view_layout(view_id);
let field_settings_map = database.get_field_settings(view_id, Some(field_ids));
(layout_type, field_settings_map)
};
field_settings_map
.into_iter()
.filter_map(|(field_id, field_settings)| {
let field_settings = FieldSettings::try_from_anymap(field_id.clone(), field_settings);
if let Ok(settings) = field_settings {
Some((field_id, settings))
let default_field_settings = default_field_settings_by_layout_map()
.get(&layout_type)
.unwrap()
.to_owned();
let field_settings = field_ids
.iter()
.map(|field_id| {
if !field_settings_map.contains_key(field_id) {
let field_settings =
FieldSettings::from_anymap(field_id, layout_type, &default_field_settings);
(field_id.clone(), field_settings)
} else {
None
let field_settings = FieldSettings::from_anymap(
field_id,
layout_type,
field_settings_map.get(field_id).unwrap(),
);
(field_id.clone(), field_settings)
}
})
.collect()
}
.collect();
fn get_all_field_settings(&self, view_id: &str) -> HashMap<String, FieldSettings> {
let field_settings_map = self.database.lock().get_field_settings(view_id, None);
field_settings_map
.into_iter()
.filter_map(|(field_id, field_settings)| {
let field_settings = FieldSettings::try_from_anymap(field_id.clone(), field_settings);
if let Ok(settings) = field_settings {
Some((field_id, settings))
} else {
None
}
})
.collect()
field_settings
}
fn update_field_settings(
@ -1456,25 +1430,29 @@ impl DatabaseViewOperation for DatabaseViewOperationImpl {
view_id: &str,
field_id: &str,
visibility: Option<FieldVisibility>,
width: Option<i32>,
) {
let field_settings_map = self.get_field_settings(view_id, &[field_id.to_string()]);
let new_field_settings = if let Some(field_settings) = field_settings_map.get(field_id) {
let mut field_settings = field_settings.to_owned();
field_settings.visibility = visibility.unwrap_or(field_settings.visibility);
field_settings
FieldSettings {
field_id: field_settings.field_id.clone(),
visibility: visibility.unwrap_or(field_settings.visibility.clone()),
width: width.unwrap_or(field_settings.width),
}
} else {
let layout_ty = self.get_layout_for_view(view_id);
let mut field_settings = FieldSettings::try_from_anymap(
field_id.to_string(),
default_field_settings_by_layout_map()
.get(&layout_ty)
.unwrap()
.to_owned(),
)
.unwrap();
field_settings.visibility = visibility.unwrap_or(field_settings.visibility);
field_settings
let layout_type = self.get_layout_for_view(view_id);
let default_field_settings = default_field_settings_by_layout_map()
.get(&layout_type)
.unwrap()
.to_owned();
let field_settings =
FieldSettings::from_anymap(field_id, layout_type, &default_field_settings);
FieldSettings {
field_id: field_settings.field_id.clone(),
visibility: visibility.unwrap_or(field_settings.visibility),
width: width.unwrap_or(field_settings.width),
}
};
self.database.lock().update_field_settings(

4
frontend/rust-lib/flowy-database2/src/services/database/util.rs
View File

@ -58,7 +58,9 @@ pub(crate) fn database_view_setting_pb_from_view(view: DatabaseView) -> Database
.field_settings
.into_inner()
.into_iter()
.flat_map(|(field_id, field_settings)| FieldSettings::try_from_anymap(field_id, field_settings))
.map(|(field_id, field_settings)| {
FieldSettings::from_anymap(&field_id, view.layout, &field_settings)
})
.map(FieldSettingsPB::from)
.collect::<Vec<FieldSettingsPB>>();

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

@ -844,19 +844,20 @@ impl DatabaseViewEditor {
self.delegate.get_field_settings(&self.view_id, field_ids)
}
pub async fn v_get_all_field_settings(&self) -> HashMap<String, FieldSettings> {
self.delegate.get_all_field_settings(&self.view_id)
}
// pub async fn v_get_all_field_settings(&self) -> HashMap<String, FieldSettings> {
// self.delegate.get_all_field_settings(&self.view_id)
// }
pub async fn v_update_field_settings(
&self,
view_id: &str,
field_id: &str,
visibility: Option<FieldVisibility>,
width: Option<i32>,
) -> FlowyResult<()> {
self
.delegate
.update_field_settings(view_id, field_id, visibility);
.update_field_settings(view_id, field_id, visibility, width);
Ok(())
}

3
frontend/rust-lib/flowy-database2/src/services/database_view/view_operation.rs
View File

@ -115,12 +115,11 @@ pub trait DatabaseViewOperation: Send + Sync + 'static {
field_ids: &[String],
) -> HashMap<String, FieldSettings>;
fn get_all_field_settings(&self, view_id: &str) -> HashMap<String, FieldSettings>;
fn update_field_settings(
&self,
view_id: &str,
field_id: &str,
visibility: Option<FieldVisibility>,
width: Option<i32>,
);
}

2
frontend/rust-lib/flowy-database2/src/services/field/field_builder.rs
View File

@ -15,7 +15,7 @@ impl FieldBuilder {
field_type.clone().into(),
false,
);
field.width = field_type.default_cell_width() as i64;
field.width = 150;
field
.type_options
.insert(field_type.to_string(), type_option_data.into());

40
frontend/rust-lib/flowy-database2/src/services/field_settings/entities.rs
View File

@ -1,32 +1,42 @@
use anyhow::bail;
use collab::core::any_map::AnyMapExtension;
use collab_database::views::{FieldSettingsMap, FieldSettingsMapBuilder};
use collab_database::views::{DatabaseLayout, FieldSettingsMap, FieldSettingsMapBuilder};
use crate::entities::FieldVisibility;
use crate::services::field_settings::default_field_visibility;
/// Stores the field settings for a single field
#[derive(Debug, Clone)]
pub struct FieldSettings {
pub field_id: String,
pub visibility: FieldVisibility,
pub width: i32,
}
pub const VISIBILITY: &str = "visibility";
pub const WIDTH: &str = "width";
pub const DEFAULT_WIDTH: i32 = 150;
impl FieldSettings {
pub fn try_from_anymap(
field_id: String,
field_settings: FieldSettingsMap,
) -> Result<Self, anyhow::Error> {
let visibility = match field_settings.get_i64_value(VISIBILITY) {
Some(visbility) => visbility.into(),
_ => bail!("Invalid field settings data"),
};
pub fn from_anymap(
field_id: &str,
layout_type: DatabaseLayout,
field_settings: &FieldSettingsMap,
) -> Self {
let visibility = field_settings
.get_i64_value(VISIBILITY)
.map(Into::into)
.unwrap_or_else(|| default_field_visibility(layout_type));
let width = field_settings
.get_i64_value(WIDTH)
.map(|value| value as i32)
.unwrap_or(DEFAULT_WIDTH);
Ok(Self {
field_id,
Self {
field_id: field_id.to_string(),
visibility,
})
width,
}
}
}
@ -34,14 +44,16 @@ impl From<FieldSettings> for FieldSettingsMap {
fn from(field_settings: FieldSettings) -> Self {
FieldSettingsMapBuilder::new()
.insert_i64_value(VISIBILITY, field_settings.visibility.into())
.insert_i64_value(WIDTH, field_settings.width as i64)
.build()
}
}
/// Contains the changeset to a field's settings.
/// A `Some` value for constitutes a change in that particular setting
/// A `Some` value constitutes a change in that particular setting
pub struct FieldSettingsChangesetParams {
pub view_id: String,
pub field_id: String,
pub visibility: Option<FieldVisibility>,
pub width: Option<i32>,
}

84
frontend/rust-lib/flowy-database2/src/services/field_settings/field_settings_builder.rs
View File

@ -1,7 +1,5 @@
use std::collections::HashMap;
use std::sync::Arc;
use collab_database::database::MutexDatabase;
use collab_database::fields::Field;
use collab_database::views::{
DatabaseLayout, FieldSettingsByFieldIdMap, FieldSettingsMap, FieldSettingsMapBuilder,
@ -14,7 +12,7 @@ use crate::services::field_settings::{FieldSettings, VISIBILITY};
/// Helper struct to create a new field setting
pub struct FieldSettingsBuilder {
field_settings: FieldSettings,
inner: FieldSettings,
}
impl FieldSettingsBuilder {
@ -22,57 +20,49 @@ impl FieldSettingsBuilder {
let field_settings = FieldSettings {
field_id: field_id.to_string(),
visibility: FieldVisibility::AlwaysShown,
width: 150,
};
Self { field_settings }
}
pub fn field_id(mut self, field_id: &str) -> Self {
self.field_settings.field_id = field_id.to_string();
self
Self {
inner: field_settings,
}
}
pub fn visibility(mut self, visibility: FieldVisibility) -> Self {
self.field_settings.visibility = visibility;
self.inner.visibility = visibility;
self
}
pub fn width(mut self, width: i32) -> Self {
self.inner.width = width;
self
}
pub fn build(self) -> FieldSettings {
self.field_settings
self.inner
}
}
pub struct DatabaseFieldSettingsMapBuilder {
pub fields: Vec<Field>,
pub database_layout: DatabaseLayout,
#[inline]
pub fn default_field_visibility(layout_type: DatabaseLayout) -> FieldVisibility {
match layout_type {
DatabaseLayout::Grid => FieldVisibility::AlwaysShown,
DatabaseLayout::Board => FieldVisibility::HideWhenEmpty,
DatabaseLayout::Calendar => FieldVisibility::HideWhenEmpty,
}
}
impl DatabaseFieldSettingsMapBuilder {
pub fn new(fields: Vec<Field>, database_layout: DatabaseLayout) -> Self {
Self {
fields,
database_layout,
}
}
pub fn from_database(database: Arc<MutexDatabase>, database_layout: DatabaseLayout) -> Self {
let fields = database.lock().get_fields(None);
Self {
fields,
database_layout,
}
}
pub fn build(self) -> FieldSettingsByFieldIdMap {
self
.fields
.into_iter()
.map(|field| {
let field_settings = field_settings_for_field(self.database_layout, &field);
(field.id, field_settings)
})
.collect::<HashMap<String, FieldSettingsMap>>()
.into()
}
pub fn default_field_settings_for_fields(
fields: &Vec<Field>,
layout_type: DatabaseLayout,
) -> FieldSettingsByFieldIdMap {
fields
.iter()
.map(|field| {
let field_settings = field_settings_for_field(layout_type, field);
(field.id.clone(), field_settings)
})
.collect::<HashMap<_, _>>()
.into()
}
pub fn field_settings_for_field(
@ -82,11 +72,7 @@ pub fn field_settings_for_field(
let visibility = if field.is_primary {
FieldVisibility::AlwaysShown
} else {
match database_layout {
DatabaseLayout::Grid => FieldVisibility::AlwaysShown,
DatabaseLayout::Board => FieldVisibility::HideWhenEmpty,
DatabaseLayout::Calendar => FieldVisibility::HideWhenEmpty,
}
default_field_visibility(database_layout)
};
FieldSettingsBuilder::new(&field.id)
@ -98,11 +84,7 @@ pub fn field_settings_for_field(
pub fn default_field_settings_by_layout_map() -> HashMap<DatabaseLayout, FieldSettingsMap> {
let mut map = HashMap::new();
for layout_ty in DatabaseLayout::iter() {
let visibility = match layout_ty {
DatabaseLayout::Grid => FieldVisibility::AlwaysShown,
DatabaseLayout::Board => FieldVisibility::HideWhenEmpty,
DatabaseLayout::Calendar => FieldVisibility::HideWhenEmpty,
};
let visibility = default_field_visibility(layout_ty);
let field_settings = FieldSettingsMapBuilder::new()
.insert_i64_value(VISIBILITY, visibility.into())
.build();

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

@ -9,7 +9,7 @@ use flowy_error::{FlowyError, FlowyResult};
use crate::entities::FieldType;
use crate::services::field::{default_type_option_data_from_type, CELL_DATA};
use crate::services::field_settings::DatabaseFieldSettingsMapBuilder;
use crate::services::field_settings::default_field_settings_for_fields;
use crate::services::share::csv::CSVFormat;
#[derive(Default)]
@ -97,8 +97,7 @@ fn database_from_fields_and_rows(
})
.collect::<Vec<Field>>();
let field_settings =
DatabaseFieldSettingsMapBuilder::new(fields.clone(), DatabaseLayout::Grid).build();
let field_settings = default_field_settings_for_fields(&fields, DatabaseLayout::Grid);
let created_rows = rows
.iter()

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

@ -7,7 +7,7 @@ use crate::services::cell::{insert_select_option_cell, insert_text_cell};
use crate::services::field::{
FieldBuilder, SelectOption, SelectOptionColor, SingleSelectTypeOption,
};
use crate::services::field_settings::DatabaseFieldSettingsMapBuilder;
use crate::services::field_settings::default_field_settings_for_fields;
use crate::services::setting::{BoardLayoutSetting, CalendarLayoutSetting};
pub fn make_default_grid(view_id: &str, name: &str) -> CreateDatabaseParams {
@ -29,8 +29,7 @@ pub fn make_default_grid(view_id: &str, name: &str) -> CreateDatabaseParams {
let fields = vec![text_field, single_select, checkbox_field];
let field_settings =
DatabaseFieldSettingsMapBuilder::new(fields.clone(), DatabaseLayout::Grid).build();
let field_settings = default_field_settings_for_fields(&fields, DatabaseLayout::Grid);
CreateDatabaseParams {
database_id: gen_database_id(),
@ -90,8 +89,7 @@ pub fn make_default_board(view_id: &str, name: &str) -> CreateDatabaseParams {
let fields = vec![text_field, single_select];
let field_settings =
DatabaseFieldSettingsMapBuilder::new(fields.clone(), DatabaseLayout::Board).build();
let field_settings = default_field_settings_for_fields(&fields, DatabaseLayout::Board);
let mut layout_settings = LayoutSettings::default();
layout_settings.insert(DatabaseLayout::Board, BoardLayoutSetting::new().into());
@ -134,8 +132,7 @@ pub fn make_default_calendar(view_id: &str, name: &str) -> CreateDatabaseParams
let fields = vec![text_field, date_field, multi_select_field];
let field_settings =
DatabaseFieldSettingsMapBuilder::new(fields.clone(), DatabaseLayout::Calendar).build();
let field_settings = default_field_settings_for_fields(&fields, DatabaseLayout::Calendar);
let mut layout_settings = LayoutSettings::default();
layout_settings.insert(