Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

fix: number sort (#2508)

Nathan.foooa2b592a59bd6
diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_type_option.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_type_option.rs
index 3c19f529f3..3256cb83dd 100644
--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_type_option.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_type_option.rs
@@ -243,7 +243,17 @@ impl TypeOptionCellDataCompare for NumberTypeOption {
cell_data: &<Self as TypeOption>::CellData,
other_cell_data: &<Self as TypeOption>::CellData,
) -> Ordering {
- cell_data.0.cmp(&other_cell_data.0)
+ let left = NumberCellFormat::from_format_str(&cell_data.0, self.sign_positive, &self.format);
+ let right =
+ NumberCellFormat::from_format_str(&other_cell_data.0, self.sign_positive, &self.format);
+ match (left, right) {
+ (Ok(left), Ok(right)) => {
+ return left.decimal().cmp(&right.decimal());
+ },
+ (Ok(_), Err(_)) => Ordering::Greater,
+ (Err(_), Ok(_)) => Ordering::Less,
+ (Err(_), Err(_)) => Ordering::Equal,
+ }
}
}
impl std::default::Default for NumberTypeOption {
diff --git a/frontend/rust-lib/flowy-database2/tests/database/mock_data/grid_mock_data.rs b/frontend/rust-lib/flowy-database2/tests/database/mock_data/grid_mock_data.rs
index fda266dea0..800e1ce550 100644
--- a/frontend/rust-lib/flowy-database2/tests/database/mock_data/grid_mock_data.rs
+++ b/frontend/rust-lib/flowy-database2/tests/database/mock_data/grid_mock_data.rs
@@ -179,7 +179,7 @@ pub fn make_test_grid() -> DatabaseData {
for field_type in FieldType::iter() {
match field_type {
FieldType::RichText => row_builder.insert_text_cell("DA"),
- FieldType::Number => row_builder.insert_number_cell("4"),
+ FieldType::Number => row_builder.insert_number_cell("14"),
FieldType::DateTime => row_builder.insert_date_cell(
"1668704685",
None,
diff --git a/frontend/rust-lib/flowy-database2/tests/database/sort_test/single_sort_test.rs b/frontend/rust-lib/flowy-database2/tests/database/sort_test/single_sort_test.rs
index dc6de08216..96db2ce396 100644
--- a/frontend/rust-lib/flowy-database2/tests/database/sort_test/single_sort_test.rs
+++ b/frontend/rust-lib/flowy-database2/tests/database/sort_test/single_sort_test.rs
@@ -213,7 +213,7 @@ async fn sort_number_by_descending_test() {
let scripts = vec![
AssertCellContentOrder {
field_id: number_field.id.clone(),
- orders: vec!["$1", "$2", "$3", "$4", "", "$5"],
+ orders: vec!["$1", "$2", "$3", "$14", "", "$5"],
},
InsertSort {
field: number_field.clone(),
@@ -221,7 +221,7 @@ async fn sort_number_by_descending_test() {
},
AssertCellContentOrder {
field_id: number_field.id.clone(),
- orders: vec!["$5", "$4", "$3", "$2", "$1", ""],
+ orders: vec!["$14", "$5", "$3", "$2", "$1", ""],
},
];
test.run_scripts(scripts).await;