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

fix: launch review 0.5.0 (#4735)

Browse Source 
* fix: top bar buttons slow respond

* fix: fav button responsive

* fix: add favorite button to database views

* fix: add overflow to calculation

* fix: minor workaround for showing number format prefix

* fix: clear calculation on empty field cells

* fix: average calculation should not have def value

* fix: cargo fmt
This commit is contained in:
Mathias Mogensen
2024-02-25 21:32:44 +01:00
committed by GitHub
parent 609557c357
commit c9dc24a13c
9 changed files with 84 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
frontend/rust-lib/flowy-database2/src/services/calculations/controller.rs
View File

@ -1,7 +1,6 @@
use std::str::FromStr;
use std::sync::Arc;
use collab::core::any_map::AnyMapExtension;
use collab_database::fields::Field;
use collab_database::rows::{Row, RowCell};
use flowy_error::FlowyResult;
@ -227,25 +226,18 @@ impl CalculationsController {
async fn handle_row_changed(&self, row: Row) {
let cells = row.cells.iter();
let mut updates = vec![];
// Iterate each cell in the row
for cell in cells {
let field_id = cell.0;
let value = cell.1.value().get("data");
let calculation = self.delegate.get_calculation(&self.view_id, field_id).await;
if let Some(calculation) = calculation {
let update = self.get_updated_calculation(calculation.clone()).await;
// Only continue if there is a value in the cell
if let Some(_cell_value) = value {
let calculation = self.delegate.get_calculation(&self.view_id, field_id).await;
if let Some(calculation) = calculation {
let update = self.get_updated_calculation(calculation.clone()).await;
if let Some(update) = update {
updates.push(CalculationPB::from(&update));
self.delegate.update_calculation(&self.view_id, update);
}
if let Some(update) = update {
updates.push(CalculationPB::from(&update));
self.delegate.update_calculation(&self.view_id, update);
}
}
}
@ -262,17 +254,19 @@ impl CalculationsController {
}
async fn get_updated_calculation(&self, calculation: Arc<Calculation>) -> Option<Calculation> {
let row_cells = self
let field_cells = self
.delegate
.get_cells_for_field(&self.view_id, &calculation.field_id)
.await;
let field = self.delegate.get_field(&calculation.field_id)?;
if !row_cells.is_empty() {
if field_cells.is_empty() {
return Some(calculation.with_value(String::new()));
} else {
let value =
self
.calculations_service
.calculate(&field, calculation.calculation_type, row_cells);
.calculate(&field, calculation.calculation_type, field_cells);
if value != calculation.value {
return Some(calculation.with_value(value));

2
frontend/rust-lib/flowy-database2/src/services/calculations/service.rs
View File

@ -49,7 +49,7 @@ impl CalculationsService {
if len > 0.0 {
format!("{:.5}", sum / len)
} else {
"0".to_owned()
String::new()
}
}