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 up yrs to 0.17.1 (#4078)

Browse Source 
* chore: bump yrs

* chore: update rev
This commit is contained in:
Nathan.fooo
2023-12-04 14:20:07 -08:00
committed by GitHub
parent d4cef2e866
commit 0d776a9294
11 changed files with 195 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1501,10 +1501,10 @@ impl DatabaseViewOperation for DatabaseViewOperationImpl {
.map(|field_id| {
if !field_settings_map.contains_key(field_id) {
let field_settings =
FieldSettings::from_anymap(field_id, layout_type, &default_field_settings);
FieldSettings::from_any_map(field_id, layout_type, &default_field_settings);
(field_id.clone(), field_settings)
} else {
let field_settings = FieldSettings::from_anymap(
let field_settings = FieldSettings::from_any_map(
field_id,
layout_type,
field_settings_map.get(field_id).unwrap(),
@ -1539,7 +1539,7 @@ impl DatabaseViewOperation for DatabaseViewOperationImpl {
.unwrap()
.to_owned();
let field_settings =
FieldSettings::from_anymap(field_id, layout_type, &default_field_settings);
FieldSettings::from_any_map(field_id, layout_type, &default_field_settings);
FieldSettings {
field_id: field_settings.field_id.clone(),
visibility: visibility.unwrap_or(field_settings.visibility),

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

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

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

@ -18,7 +18,7 @@ pub const WIDTH: &str = "width";
pub const DEFAULT_WIDTH: i32 = 150;
impl FieldSettings {
pub fn from_anymap(
pub fn from_any_map(
field_id: &str,
layout_type: DatabaseLayout,
field_settings: &FieldSettingsMap,