fix: number cell format (#1623)

Co-authored-by: nathan <[email protected]>

Author: appflowy

frontend/rust-lib/flowy-grid/src/event_handler.rs

@@ -229,11 +229,14 @@ pub(crate) async fn move_field_handler(
 
 /// The [FieldRevision] contains multiple data, each of them belongs to a specific FieldType.
 async fn get_type_option_data(field_rev: &FieldRevision, field_type: &FieldType) -> FlowyResult<Vec<u8>> {
-    let s = field_rev.get_type_option_str(field_type).unwrap_or_else(|| {
-        default_type_option_builder_from_type(field_type)
-            .serializer()
-            .json_str()
-    });
+    let s = field_rev
+        .get_type_option_str(field_type)
+        .map(|value| value.to_owned())
+        .unwrap_or_else(|| {
+            default_type_option_builder_from_type(field_type)
+                .serializer()
+                .json_str()
+        });
     let field_type: FieldType = field_rev.ty.into();
     let builder = type_option_builder_from_json_str(&s, &field_type);
     let type_option_data = builder.serializer().protobuf_bytes().to_vec();

frontend/rust-lib/flowy-grid/src/services/cell/cell_operation.rs

@@ -41,7 +41,7 @@ pub trait CellDataChangeset: TypeOption {
         &self,
         changeset: <Self as TypeOption>::CellChangeset,
         type_cell_data: Option<TypeCellData>,
-    ) -> FlowyResult<<Self as TypeOption>::CellData>;
+    ) -> FlowyResult<(String, <Self as TypeOption>::CellData)>;
 }
 
 /// changeset: It will be deserialized into specific data base on the FieldType.
@@ -65,13 +65,13 @@ pub fn apply_cell_data_changeset<C: ToCellChangesetString, T: AsRef<FieldRevisio
         Err(_) => None,
     });
 
-    let cell_data = match TypeOptionCellExt::new_with_cell_data_cache(field_rev, cell_data_cache)
+    let cell_str = match TypeOptionCellExt::new_with_cell_data_cache(field_rev, cell_data_cache)
         .get_type_option_cell_data_handler(&field_type)
     {
         None => "".to_string(),
         Some(handler) => handler.handle_cell_changeset(changeset, type_cell_data, field_rev)?,
     };
-    Ok(TypeCellData::new(cell_data, field_type).to_json())
+    Ok(TypeCellData::new(cell_str, field_type).to_json())
 }
 
 pub fn decode_type_cell_data<T: TryInto<TypeCellData, Error = FlowyError> + Debug>(

frontend/rust-lib/flowy-grid/src/services/cell/type_cell_data.rs

@@ -82,11 +82,8 @@ impl std::convert::TryFrom<CellRevision> for TypeCellData {
 }
 
 impl TypeCellData {
-    pub fn new(content: String, field_type: FieldType) -> Self {
-        TypeCellData {
-            cell_str: content,
-            field_type,
-        }
+    pub fn new(cell_str: String, field_type: FieldType) -> Self {
+        TypeCellData { cell_str, field_type }
     }
 
     pub fn to_json(&self) -> String {

frontend/rust-lib/flowy-grid/src/services/field/type_options/checkbox_type_option/checkbox_type_option.rs

@@ -87,9 +87,9 @@ impl CellDataChangeset for CheckboxTypeOptionPB {
         &self,
         changeset: <Self as TypeOption>::CellChangeset,
         _type_cell_data: Option<TypeCellData>,
-    ) -> FlowyResult<<Self as TypeOption>::CellData> {
+    ) -> FlowyResult<(String, <Self as TypeOption>::CellData)> {
         let checkbox_cell_data = CheckboxCellData::from_str(&changeset)?;
-        Ok(checkbox_cell_data)
+        Ok((checkbox_cell_data.to_string(), checkbox_cell_data))
     }
 }
 

frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_tests.rs

@@ -152,17 +152,17 @@ mod tests {
             time: include_time_str,
             is_utc: false,
         };
-        let encoded_data = type_option.apply_changeset(changeset, None).unwrap();
+        let (cell_str, _) = type_option.apply_changeset(changeset, None).unwrap();
 
         assert_eq!(
-            decode_cell_data(encoded_data.to_string(), type_option, field_rev),
+            decode_cell_data(cell_str, type_option, field_rev),
             expected_str.to_owned(),
         );
     }
 
-    fn decode_cell_data(encoded_data: String, type_option: &DateTypeOptionPB, field_rev: &FieldRevision) -> String {
+    fn decode_cell_data(cell_str: String, type_option: &DateTypeOptionPB, field_rev: &FieldRevision) -> String {
         let decoded_data = type_option
-            .decode_cell_str(encoded_data, &FieldType::DateTime, field_rev)
+            .decode_cell_str(cell_str, &FieldType::DateTime, field_rev)
             .unwrap();
         let decoded_data = type_option.convert_to_protobuf(decoded_data);
         if type_option.include_time {

frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option.rs

@@ -157,7 +157,7 @@ impl CellDataChangeset for DateTypeOptionPB {
         &self,
         changeset: <Self as TypeOption>::CellChangeset,
         _type_cell_data: Option<TypeCellData>,
-    ) -> FlowyResult<<Self as TypeOption>::CellData> {
+    ) -> FlowyResult<(String, <Self as TypeOption>::CellData)> {
         let cell_data = match changeset.date_timestamp() {
             None => 0,
             Some(date_timestamp) => match (self.include_time, changeset.time) {
@@ -171,8 +171,8 @@ impl CellDataChangeset for DateTypeOptionPB {
                 _ => date_timestamp,
             },
         };
-
-        Ok(DateCellData(Some(cell_data)))
+        let date_cell_data = DateCellData(Some(cell_data));
+        Ok((date_cell_data.to_string(), date_cell_data))
     }
 }
 

frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option_entities.rs

@@ -70,7 +70,7 @@ impl ToCellChangesetString for DateCellChangeset {
     }
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, Debug)]
 pub struct DateCellData(pub Option<i64>);
 
 impl std::convert::From<DateCellData> for i64 {

frontend/rust-lib/flowy-grid/src/services/field/type_options/number_type_option/number_type_option.rs

@@ -155,10 +155,10 @@ impl CellDataChangeset for NumberTypeOptionPB {
         &self,
         changeset: <Self as TypeOption>::CellChangeset,
         _type_cell_data: Option<TypeCellData>,
-    ) -> FlowyResult<<Self as TypeOption>::CellData> {
+    ) -> FlowyResult<(String, <Self as TypeOption>::CellData)> {
         let data = changeset.trim().to_string();
-        let _ = self.format_cell_data(&data)?;
-        Ok(StrCellData(data))
+        let number_cell_data = self.format_cell_data(&data)?;
+        Ok((data, number_cell_data.to_string().into()))
     }
 }
 

frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/checklist_type_option.rs

@@ -60,15 +60,15 @@ impl CellDataChangeset for ChecklistTypeOptionPB {
         &self,
         changeset: <Self as TypeOption>::CellChangeset,
         type_cell_data: Option<TypeCellData>,
-    ) -> FlowyResult<<Self as TypeOption>::CellData> {
+    ) -> FlowyResult<(String, <Self as TypeOption>::CellData)> {
         let insert_option_ids = changeset
             .insert_option_ids
             .into_iter()
             .filter(|insert_option_id| self.options.iter().any(|option| &option.id == insert_option_id))
             .collect::<Vec<String>>();
 
-        match type_cell_data {
-            None => Ok(SelectOptionIds::from(insert_option_ids)),
+        let select_option_ids = match type_cell_data {
+            None => SelectOptionIds::from(insert_option_ids),
             Some(type_cell_data) => {
                 let mut select_ids: SelectOptionIds = type_cell_data.cell_str.into();
                 for insert_option_id in insert_option_ids {
@@ -81,9 +81,10 @@ impl CellDataChangeset for ChecklistTypeOptionPB {
                     select_ids.retain(|id| id != &delete_option_id);
                 }
 
-                Ok(select_ids)
+                select_ids
             }
-        }
+        };
+        Ok((select_option_ids.to_string(), select_option_ids))
     }
 }
 impl TypeOptionCellDataFilter for ChecklistTypeOptionPB {

frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/multi_select_type_option.rs

@@ -61,15 +61,15 @@ impl CellDataChangeset for MultiSelectTypeOptionPB {
         &self,
         changeset: <Self as TypeOption>::CellChangeset,
         type_cell_data: Option<TypeCellData>,
-    ) -> FlowyResult<<Self as TypeOption>::CellData> {
+    ) -> FlowyResult<(String, <Self as TypeOption>::CellData)> {
         let insert_option_ids = changeset
             .insert_option_ids
             .into_iter()
             .filter(|insert_option_id| self.options.iter().any(|option| &option.id == insert_option_id))
             .collect::<Vec<String>>();
 
-        match type_cell_data {
-            None => Ok(SelectOptionIds::from(insert_option_ids)),
+        let select_option_ids = match type_cell_data {
+            None => SelectOptionIds::from(insert_option_ids),
             Some(type_cell_data) => {
                 let mut select_ids: SelectOptionIds = type_cell_data.cell_str.into();
                 for insert_option_id in insert_option_ids {
@@ -83,9 +83,10 @@ impl CellDataChangeset for MultiSelectTypeOptionPB {
                 }
 
                 tracing::trace!("Multi-select cell data: {}", select_ids.to_string());
-                Ok(select_ids)
+                select_ids
             }
-        }
+        };
+        Ok((select_option_ids.to_string(), select_option_ids))
     }
 }
 
@@ -210,7 +211,7 @@ mod tests {
         let type_option = MultiSelectTypeOptionPB::from(&field_rev);
         let option_ids = vec![google.id, facebook.id];
         let changeset = SelectOptionCellChangeset::from_insert_options(option_ids.clone());
-        let select_option_ids: SelectOptionIds = type_option.apply_changeset(changeset, None).unwrap();
+        let select_option_ids: SelectOptionIds = type_option.apply_changeset(changeset, None).unwrap().1;
 
         assert_eq!(&*select_option_ids, &option_ids);
     }
@@ -229,12 +230,12 @@ mod tests {
 
         // insert
         let changeset = SelectOptionCellChangeset::from_insert_options(option_ids.clone());
-        let select_option_ids = type_option.apply_changeset(changeset, None).unwrap();
+        let select_option_ids = type_option.apply_changeset(changeset, None).unwrap().1;
         assert_eq!(&*select_option_ids, &option_ids);
 
         // delete
         let changeset = SelectOptionCellChangeset::from_delete_options(option_ids);
-        let select_option_ids = type_option.apply_changeset(changeset, None).unwrap();
+        let select_option_ids = type_option.apply_changeset(changeset, None).unwrap().1;
         assert!(select_option_ids.is_empty());
     }
 
@@ -250,7 +251,7 @@ mod tests {
 
         let type_option = MultiSelectTypeOptionPB::from(&field_rev);
         let changeset = SelectOptionCellChangeset::from_insert_option_id(&google.id);
-        let select_option_ids = type_option.apply_changeset(changeset, None).unwrap();
+        let select_option_ids = type_option.apply_changeset(changeset, None).unwrap().1;
         assert_eq!(select_option_ids.to_string(), google.id);
     }
 
@@ -265,7 +266,7 @@ mod tests {
 
         let type_option = MultiSelectTypeOptionPB::from(&field_rev);
         let changeset = SelectOptionCellChangeset::from_insert_option_id(&google.id);
-        let select_option_ids = type_option.apply_changeset(changeset, None).unwrap();
+        let (_, select_option_ids) = type_option.apply_changeset(changeset, None).unwrap();
         assert!(select_option_ids.is_empty());
     }
 
@@ -283,11 +284,11 @@ mod tests {
 
         // empty option id string
         let changeset = SelectOptionCellChangeset::from_insert_option_id("");
-        let select_option_ids = type_option.apply_changeset(changeset, None).unwrap();
-        assert_eq!(select_option_ids.to_string(), "");
+        let (cell_str, _) = type_option.apply_changeset(changeset, None).unwrap();
+        assert_eq!(cell_str, "");
 
         let changeset = SelectOptionCellChangeset::from_insert_option_id("123,456");
-        let select_option_ids = type_option.apply_changeset(changeset, None).unwrap();
+        let select_option_ids = type_option.apply_changeset(changeset, None).unwrap().1;
         assert!(select_option_ids.is_empty());
     }
 }