chore: update test (#1584)

Author: appflowy

frontend/rust-lib/flowy-error/src/errors.rs

@@ -68,6 +68,7 @@ impl FlowyError {
     static_flowy_error!(invalid_data, ErrorCode::InvalidData);
     static_flowy_error!(out_of_bounds, ErrorCode::OutOfBounds);
     static_flowy_error!(serde, ErrorCode::Serde);
+    static_flowy_error!(field_record_not_found, ErrorCode::FieldRecordNotFound);
 }
 
 impl std::convert::From<ErrorCode> for FlowyError {

frontend/rust-lib/flowy-grid/src/entities/cell_entities.rs

@@ -51,7 +51,7 @@ pub struct CellPathPB {
 }
 
 pub struct CellPathParams {
-    pub grid_id: String,
+    pub view_id: String,
     pub field_id: String,
     pub row_id: String,
 }
@@ -64,7 +64,7 @@ impl TryInto<CellPathParams> for CellPathPB {
         let field_id = NotEmptyStr::parse(self.field_id).map_err(|_| ErrorCode::FieldIdIsEmpty)?;
         let row_id = NotEmptyStr::parse(self.row_id).map_err(|_| ErrorCode::RowIdIsEmpty)?;
         Ok(CellPathParams {
-            grid_id: grid_id.0,
+            view_id: grid_id.0,
             field_id: field_id.0,
             row_id: row_id.0,
         })

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

@@ -303,7 +303,7 @@ pub(crate) async fn get_cell_handler(
     manager: AFPluginState<Arc<GridManager>>,
 ) -> DataResult<CellPB, FlowyError> {
     let params: CellPathParams = data.into_inner().try_into()?;
-    let editor = manager.get_grid_editor(&params.grid_id).await?;
+    let editor = manager.get_grid_editor(&params.view_id).await?;
     match editor.get_cell(&params).await {
         None => data_result(CellPB::empty(&params.field_id)),
         Some(cell) => data_result(cell),
@@ -344,7 +344,7 @@ pub(crate) async fn update_select_option_handler(
     manager: AFPluginState<Arc<GridManager>>,
 ) -> Result<(), FlowyError> {
     let changeset: SelectOptionChangeset = data.into_inner().try_into()?;
-    let editor = manager.get_grid_editor(&changeset.cell_identifier.grid_id).await?;
+    let editor = manager.get_grid_editor(&changeset.cell_identifier.view_id).await?;
 
     let _ = editor
         .modify_field_rev(&changeset.cell_identifier.field_id, |field_rev| {
@@ -375,7 +375,7 @@ pub(crate) async fn update_select_option_handler(
 
             if let Some(cell_content_changeset) = cell_content_changeset {
                 let changeset = CellChangesetPB {
-                    grid_id: changeset.cell_identifier.grid_id,
+                    grid_id: changeset.cell_identifier.view_id,
                     row_id: changeset.cell_identifier.row_id,
                     field_id: changeset.cell_identifier.field_id.clone(),
                     content: cell_content_changeset,
@@ -401,7 +401,7 @@ pub(crate) async fn get_select_option_handler(
     manager: AFPluginState<Arc<GridManager>>,
 ) -> DataResult<SelectOptionCellDataPB, FlowyError> {
     let params: CellPathParams = data.into_inner().try_into()?;
-    let editor = manager.get_grid_editor(&params.grid_id).await?;
+    let editor = manager.get_grid_editor(&params.view_id).await?;
     match editor.get_field_rev(&params.field_id).await {
         None => {
             tracing::error!("Can't find the select option field with id: {}", params.field_id);
@@ -431,7 +431,7 @@ pub(crate) async fn update_select_option_cell_handler(
     manager: AFPluginState<Arc<GridManager>>,
 ) -> Result<(), FlowyError> {
     let params: SelectOptionCellChangesetParams = data.into_inner().try_into()?;
-    let editor = manager.get_grid_editor(&params.cell_identifier.grid_id).await?;
+    let editor = manager.get_grid_editor(&params.cell_identifier.view_id).await?;
     let _ = editor.update_cell_with_changeset(params.into()).await?;
     Ok(())
 }
@@ -449,9 +449,9 @@ pub(crate) async fn update_date_cell_handler(
         is_utc: data.is_utc,
     };
 
-    let editor = manager.get_grid_editor(&cell_path.grid_id).await?;
+    let editor = manager.get_grid_editor(&cell_path.view_id).await?;
     let _ = editor
-        .update_cell(cell_path.grid_id, cell_path.row_id, cell_path.field_id, content)
+        .update_cell(cell_path.view_id, cell_path.row_id, cell_path.field_id, content)
         .await?;
     Ok(())
 }

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

@@ -35,20 +35,17 @@ pub trait CellDataDecoder: TypeOption {
     /// data that can be parsed by the current field type. One approach is to transform the cell data
     /// when it get read. For the moment, the cell data is a string, `Yes` or `No`. It needs to compare
     /// with the option's name, if match return the id of the option.
-    fn try_decode_cell_data(
+    fn decode_cell_data(
         &self,
         cell_data: String,
         decoded_field_type: &FieldType,
         field_rev: &FieldRevision,
     ) -> FlowyResult<<Self as TypeOption>::CellData>;
 
     /// Same as `decode_cell_data` does but Decode the cell data to readable `String`
-    fn decode_cell_data_to_str(
-        &self,
-        cell_data: String,
-        decoded_field_type: &FieldType,
-        field_rev: &FieldRevision,
-    ) -> FlowyResult<String>;
+    /// For example, The string of the Multi-Select cell will be a list of the option's name
+    /// separated by a comma.
+    fn decode_cell_data_to_str(&self, cell_data: <Self as TypeOption>::CellData) -> String;
 }
 
 pub trait CellDataChangeset: TypeOption {
@@ -119,10 +116,10 @@ pub fn decode_type_cell_data<T: TryInto<TypeCellData, Error = FlowyError> + Debu
     }
 }
 
-/// Decode the opaque cell data from one field type to another using the corresponding type option builder
+/// Decode the opaque cell data from one field type to another using the corresponding `TypeOption`
 ///
-/// The cell data might become an empty string depends on these two fields' `TypeOptionBuilder`
-/// support transform or not.
+/// The cell data might become an empty string depends on the to_field_type's `TypeOption`   
+/// support transform the from_field_type's cell data or not.
 ///
 /// # Arguments
 ///
@@ -147,10 +144,19 @@ pub fn try_decode_cell_data(
     }
 }
 
-pub fn stringify_cell_data(cell_data: String, field_type: &FieldType, field_rev: &FieldRevision) -> String {
-    match FieldRevisionExt::new(field_rev).get_type_option_handler(field_type) {
+/// Returns a string that represents the current field_type's cell data.
+/// If the cell data of the `FieldType` doesn't support displaying in String then will return an
+/// empty string. For example, The string of the Multi-Select cell will be a list of the option's name
+/// separated by a comma.
+pub fn stringify_cell_data(
+    cell_data: String,
+    from_field_type: &FieldType,
+    to_field_type: &FieldType,
+    field_rev: &FieldRevision,
+) -> String {
+    match FieldRevisionExt::new(field_rev).get_type_option_handler(to_field_type) {
         None => "".to_string(),
-        Some(handler) => handler.stringify_cell_data(cell_data, field_type, field_rev),
+        Some(handler) => handler.stringify_cell_data(cell_data, from_field_type, field_rev),
     }
 }
 

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

@@ -36,7 +36,7 @@ mod tests {
     ) {
         assert_eq!(
             type_option
-                .try_decode_cell_data(input_str.to_owned(), field_type, field_rev)
+                .decode_cell_data(input_str.to_owned(), field_type, field_rev)
                 .unwrap()
                 .to_string(),
             expected_str.to_owned()

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

@@ -64,7 +64,7 @@ impl TypeOptionCellData for CheckboxTypeOptionPB {
 }
 
 impl CellDataDecoder for CheckboxTypeOptionPB {
-    fn try_decode_cell_data(
+    fn decode_cell_data(
         &self,
         cell_data: String,
         decoded_field_type: &FieldType,
@@ -77,13 +77,8 @@ impl CellDataDecoder for CheckboxTypeOptionPB {
         self.decode_type_option_cell_data(cell_data)
     }
 
-    fn decode_cell_data_to_str(
-        &self,
-        cell_data: String,
-        _decoded_field_type: &FieldType,
-        _field_rev: &FieldRevision,
-    ) -> FlowyResult<String> {
-        Ok(cell_data)
+    fn decode_cell_data_to_str(&self, cell_data: <Self as TypeOption>::CellData) -> String {
+        cell_data.to_string()
     }
 }
 

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

@@ -163,7 +163,7 @@ mod tests {
 
     fn decode_cell_data(encoded_data: String, type_option: &DateTypeOptionPB, field_rev: &FieldRevision) -> String {
         let decoded_data = type_option
-            .try_decode_cell_data(encoded_data, &FieldType::DateTime, field_rev)
+            .decode_cell_data(encoded_data, &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

@@ -131,7 +131,7 @@ impl DateTypeOptionPB {
 impl TypeOptionTransform for DateTypeOptionPB {}
 
 impl CellDataDecoder for DateTypeOptionPB {
-    fn try_decode_cell_data(
+    fn decode_cell_data(
         &self,
         cell_data: String,
         decoded_field_type: &FieldType,
@@ -148,15 +148,8 @@ impl CellDataDecoder for DateTypeOptionPB {
         self.decode_type_option_cell_data(cell_data)
     }
 
-    fn decode_cell_data_to_str(
-        &self,
-        cell_data: String,
-        _decoded_field_type: &FieldType,
-        _field_rev: &FieldRevision,
-    ) -> FlowyResult<String> {
-        let cell_data = self.decode_type_option_cell_data(cell_data)?;
-        let cell_data_pb = self.today_desc_from_timestamp(cell_data);
-        Ok(cell_data_pb.date)
+    fn decode_cell_data_to_str(&self, cell_data: <Self as TypeOption>::CellData) -> String {
+        self.today_desc_from_timestamp(cell_data).date
     }
 }
 

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

@@ -439,7 +439,7 @@ mod tests {
     ) {
         assert_eq!(
             type_option
-                .try_decode_cell_data(input_str.to_owned(), field_type, field_rev)
+                .decode_cell_data(input_str.to_owned(), field_type, field_rev)
                 .unwrap()
                 .to_string(),
             expected_str.to_owned()

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

@@ -128,7 +128,7 @@ pub(crate) fn strip_currency_symbol<T: ToString>(s: T) -> String {
 impl TypeOptionTransform for NumberTypeOptionPB {}
 
 impl CellDataDecoder for NumberTypeOptionPB {
-    fn try_decode_cell_data(
+    fn decode_cell_data(
         &self,
         cell_data: String,
         decoded_field_type: &FieldType,
@@ -143,13 +143,11 @@ impl CellDataDecoder for NumberTypeOptionPB {
         Ok(s.into())
     }
 
-    fn decode_cell_data_to_str(
-        &self,
-        cell_data: String,
-        _decoded_field_type: &FieldType,
-        _field_rev: &FieldRevision,
-    ) -> FlowyResult<String> {
-        Ok(cell_data)
+    fn decode_cell_data_to_str(&self, cell_data: <Self as TypeOption>::CellData) -> String {
+        match self.format_cell_data(&cell_data) {
+            Ok(cell_data) => cell_data.to_string(),
+            Err(_) => "".to_string(),
+        }
     }
 }