Przeglądaj źródła

chore: rename update at and create at (#2672)

Nathan.fooo 1 rok temu
rodzic
commit
09d61c79c9
31 zmienionych plików z 84 dodań i 84 usunięć
  1. 2 2
      frontend/appflowy_flutter/assets/translations/en.json
  2. 2 2
      frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_controller_builder.dart
  3. 2 2
      frontend/appflowy_flutter/lib/plugins/database_view/application/database_controller.dart
  4. 2 2
      frontend/appflowy_flutter/lib/plugins/database_view/application/filter/filter_service.dart
  5. 2 2
      frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/board_page.dart
  6. 2 2
      frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/filter_create_bloc.dart
  7. 2 2
      frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/filter_info.dart
  8. 2 2
      frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/filter_menu_item.dart
  9. 4 4
      frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_type_extension.dart
  10. 4 4
      frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/builder.dart
  11. 2 2
      frontend/appflowy_flutter/lib/plugins/database_view/widgets/card/card_cell_builder.dart
  12. 2 2
      frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cell_builder.dart
  13. 2 2
      frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/row_detail.dart
  14. 2 2
      frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/controller_builder.ts
  15. 7 7
      frontend/rust-lib/flowy-database2/src/entities/field_entities.rs
  16. 2 2
      frontend/rust-lib/flowy-database2/src/entities/filter_entities/util.rs
  17. 2 2
      frontend/rust-lib/flowy-database2/src/entities/macros.rs
  18. 2 2
      frontend/rust-lib/flowy-database2/src/services/cell/cell_operation.rs
  19. 2 2
      frontend/rust-lib/flowy-database2/src/services/cell/type_cell_data.rs
  20. 1 1
      frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs
  21. 1 1
      frontend/rust-lib/flowy-database2/src/services/field/type_options/date_type_option/date_type_option.rs
  22. 3 3
      frontend/rust-lib/flowy-database2/src/services/field/type_options/type_option.rs
  23. 2 2
      frontend/rust-lib/flowy-database2/src/services/field/type_options/type_option_cell.rs
  24. 1 1
      frontend/rust-lib/flowy-database2/src/services/filter/controller.rs
  25. 3 3
      frontend/rust-lib/flowy-database2/tests/database/block_test/row_test.rs
  26. 2 2
      frontend/rust-lib/flowy-database2/tests/database/cell_test/test.rs
  27. 1 1
      frontend/rust-lib/flowy-database2/tests/database/field_test/test.rs
  28. 2 2
      frontend/rust-lib/flowy-database2/tests/database/field_test/util.rs
  29. 8 8
      frontend/rust-lib/flowy-database2/tests/database/mock_data/board_mock_data.rs
  30. 9 9
      frontend/rust-lib/flowy-database2/tests/database/mock_data/grid_mock_data.rs
  31. 4 4
      frontend/rust-lib/flowy-database2/tests/database/share_test/export_test.rs

+ 2 - 2
frontend/appflowy_flutter/assets/translations/en.json

@@ -280,8 +280,8 @@
       "textFieldName": "Text",
       "checkboxFieldName": "Checkbox",
       "dateFieldName": "Date",
-      "updatedAtFieldName": "Updated At",
-      "createdAtFieldName": "Created At",
+      "updatedAtFieldName": "Last modified time",
+      "createdAtFieldName": "Created time",
       "numberFieldName": "Numbers",
       "singleSelectFieldName": "Select",
       "multiSelectFieldName": "Multiselect",

+ 2 - 2
frontend/appflowy_flutter/lib/plugins/database_view/application/cell/cell_controller_builder.dart

@@ -40,8 +40,8 @@ class CellControllerBuilder {
           cellDataPersistence: TextCellDataPersistence(cellId: _cellId),
         );
       case FieldType.DateTime:
-      case FieldType.UpdatedAt:
-      case FieldType.CreatedAt:
+      case FieldType.LastEditedTime:
+      case FieldType.CreatedTime:
         final cellDataLoader = CellDataLoader(
           cellId: _cellId,
           parser: DateCellDataParser(),

+ 2 - 2
frontend/appflowy_flutter/lib/plugins/database_view/application/database_controller.dart

@@ -356,8 +356,8 @@ class RowDataBuilder {
     assert(
       [
         FieldType.DateTime,
-        FieldType.UpdatedAt,
-        FieldType.CreatedAt,
+        FieldType.LastEditedTime,
+        FieldType.CreatedTime,
       ].contains(fieldInfo.fieldType),
     );
     final timestamp = date.millisecondsSinceEpoch ~/ 1000;

+ 2 - 2
frontend/appflowy_flutter/lib/plugins/database_view/application/filter/filter_service.dart

@@ -92,8 +92,8 @@ class FilterBackendService {
     assert(
       [
         FieldType.DateTime,
-        FieldType.UpdatedAt,
-        FieldType.CreatedAt,
+        FieldType.LastEditedTime,
+        FieldType.CreatedTime,
       ].contains(fieldType),
     );
 

+ 2 - 2
frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/board_page.dart

@@ -365,8 +365,8 @@ Widget? _buildHeaderIcon(GroupData customData) {
       }
       break;
     case FieldType.DateTime:
-    case FieldType.UpdatedAt:
-    case FieldType.CreatedAt:
+    case FieldType.LastEditedTime:
+    case FieldType.CreatedTime:
       break;
     case FieldType.MultiSelect:
       break;

+ 2 - 2
frontend/appflowy_flutter/lib/plugins/database_view/grid/application/filter/filter_create_bloc.dart

@@ -93,8 +93,8 @@ class GridCreateFilterBloc
           condition: CheckboxFilterConditionPB.IsChecked,
         );
       case FieldType.DateTime:
-      case FieldType.UpdatedAt:
-      case FieldType.CreatedAt:
+      case FieldType.LastEditedTime:
+      case FieldType.CreatedTime:
         final timestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;
         return _filterBackendSvc.insertDateFilter(
           fieldId: fieldId,

+ 2 - 2
frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/filter_info.dart

@@ -25,8 +25,8 @@ class FilterInfo {
   DateFilterPB? dateFilter() {
     if (![
       FieldType.DateTime,
-      FieldType.UpdatedAt,
-      FieldType.CreatedAt,
+      FieldType.LastEditedTime,
+      FieldType.CreatedTime,
     ].contains(filter.fieldType)) {
       return null;
     }

+ 2 - 2
frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/filter/filter_menu_item.dart

@@ -25,8 +25,8 @@ Widget buildFilterChoicechip(FilterInfo filterInfo) {
     case FieldType.Checkbox:
       return CheckboxFilterChoicechip(filterInfo: filterInfo);
     case FieldType.DateTime:
-    case FieldType.UpdatedAt:
-    case FieldType.CreatedAt:
+    case FieldType.LastEditedTime:
+    case FieldType.CreatedTime:
       return DateFilterChoicechip(filterInfo: filterInfo);
     case FieldType.MultiSelect:
       return SelectOptionFilterChoicechip(filterInfo: filterInfo);

+ 4 - 4
frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/field_type_extension.dart

@@ -8,8 +8,8 @@ extension FieldTypeListExtension on FieldType {
       case FieldType.Checkbox:
         return "grid/field/checkbox";
       case FieldType.DateTime:
-      case FieldType.UpdatedAt:
-      case FieldType.CreatedAt:
+      case FieldType.LastEditedTime:
+      case FieldType.CreatedTime:
         return "grid/field/date";
       case FieldType.MultiSelect:
         return "grid/field/multi_select";
@@ -33,9 +33,9 @@ extension FieldTypeListExtension on FieldType {
         return LocaleKeys.grid_field_checkboxFieldName.tr();
       case FieldType.DateTime:
         return LocaleKeys.grid_field_dateFieldName.tr();
-      case FieldType.UpdatedAt:
+      case FieldType.LastEditedTime:
         return LocaleKeys.grid_field_updatedAtFieldName.tr();
-      case FieldType.CreatedAt:
+      case FieldType.CreatedTime:
         return LocaleKeys.grid_field_createdAtFieldName.tr();
       case FieldType.MultiSelect:
         return LocaleKeys.grid_field_multiSelectFieldName.tr();

+ 4 - 4
frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/builder.dart

@@ -73,8 +73,8 @@ TypeOptionWidgetBuilder makeTypeOptionWidgetBuilder({
         ),
       );
     case FieldType.DateTime:
-    case FieldType.UpdatedAt:
-    case FieldType.CreatedAt:
+    case FieldType.LastEditedTime:
+    case FieldType.CreatedTime:
       return DateTypeOptionWidgetBuilder(
         makeTypeOptionContextWithDataController<DateTypeOptionPB>(
           viewId: viewId,
@@ -204,8 +204,8 @@ TypeOptionContext<T>
         dataParser: CheckboxTypeOptionWidgetDataParser(),
       ) as TypeOptionContext<T>;
     case FieldType.DateTime:
-    case FieldType.UpdatedAt:
-    case FieldType.CreatedAt:
+    case FieldType.LastEditedTime:
+    case FieldType.CreatedTime:
       return DateTypeOptionContext(
         dataController: dataController,
         dataParser: DateTypeOptionDataParser(),

+ 2 - 2
frontend/appflowy_flutter/lib/plugins/database_view/widgets/card/card_cell_builder.dart

@@ -39,8 +39,8 @@ class CardCellBuilder<CustomCardData> {
           key: key,
         );
       case FieldType.DateTime:
-      case FieldType.UpdatedAt:
-      case FieldType.CreatedAt:
+      case FieldType.LastEditedTime:
+      case FieldType.CreatedTime:
         return DateCardCell<CustomCardData>(
           renderHook: renderHook?.renderHook[FieldType.DateTime],
           cellControllerBuilder: cellControllerBuilder,

+ 2 - 2
frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cell_builder.dart

@@ -39,8 +39,8 @@ class GridCellBuilder {
           key: key,
           style: style,
         );
-      case FieldType.UpdatedAt:
-      case FieldType.CreatedAt:
+      case FieldType.LastEditedTime:
+      case FieldType.CreatedTime:
         return GridDateCell(
           cellControllerBuilder: cellControllerBuilder,
           key: key,

+ 2 - 2
frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/row_detail.dart

@@ -337,8 +337,8 @@ GridCellStyle? _customCellStyle(FieldType fieldType) {
     case FieldType.Checkbox:
       return null;
     case FieldType.DateTime:
-    case FieldType.UpdatedAt:
-    case FieldType.CreatedAt:
+    case FieldType.LastEditedTime:
+    case FieldType.CreatedTime:
       return DateCellStyle(
         alignment: Alignment.centerLeft,
       );

+ 2 - 2
frontend/appflowy_tauri/src/appflowy_app/stores/effects/database/cell/controller_builder.ts

@@ -45,8 +45,8 @@ export class CellControllerBuilder {
       case FieldType.Number:
         return this.makeNumberCellController();
       case FieldType.DateTime:
-      case FieldType.UpdatedAt:
-      case FieldType.CreatedAt:
+      case FieldType.LastEditedTime:
+      case FieldType.CreatedTime:
         return this.makeDateCellController();
       case FieldType.URL:
         return this.makeURLCellController();

+ 7 - 7
frontend/rust-lib/flowy-database2/src/entities/field_entities.rs

@@ -492,8 +492,8 @@ pub enum FieldType {
   Checkbox = 5,
   URL = 6,
   Checklist = 7,
-  UpdatedAt = 8,
-  CreatedAt = 9,
+  LastEditedTime = 8,
+  CreatedTime = 9,
 }
 
 pub const RICH_TEXT_FIELD: FieldType = FieldType::RichText;
@@ -504,8 +504,8 @@ pub const MULTI_SELECT_FIELD: FieldType = FieldType::MultiSelect;
 pub const CHECKBOX_FIELD: FieldType = FieldType::Checkbox;
 pub const URL_FIELD: FieldType = FieldType::URL;
 pub const CHECKLIST_FIELD: FieldType = FieldType::Checklist;
-pub const UPDATED_AT_FIELD: FieldType = FieldType::UpdatedAt;
-pub const CREATED_AT_FIELD: FieldType = FieldType::CreatedAt;
+pub const UPDATED_AT_FIELD: FieldType = FieldType::LastEditedTime;
+pub const CREATED_AT_FIELD: FieldType = FieldType::CreatedTime;
 
 impl std::default::Default for FieldType {
   fn default() -> Self {
@@ -539,7 +539,7 @@ impl FieldType {
 
   pub fn default_cell_width(&self) -> i32 {
     match self {
-      FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => 180,
+      FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => 180,
       _ => 150,
     }
   }
@@ -554,8 +554,8 @@ impl FieldType {
       FieldType::Checkbox => "Checkbox",
       FieldType::URL => "URL",
       FieldType::Checklist => "Checklist",
-      FieldType::UpdatedAt => "Updated At",
-      FieldType::CreatedAt => "Created At",
+      FieldType::LastEditedTime => "Last edited time",
+      FieldType::CreatedTime => "Created time",
     };
     s.to_string()
   }

+ 2 - 2
frontend/rust-lib/flowy-database2/src/entities/filter_entities/util.rs

@@ -35,7 +35,7 @@ impl std::convert::From<&Filter> for FilterPB {
     let bytes: Bytes = match filter.field_type {
       FieldType::RichText => TextFilterPB::from(filter).try_into().unwrap(),
       FieldType::Number => NumberFilterPB::from(filter).try_into().unwrap(),
-      FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+      FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
         DateFilterPB::from(filter).try_into().unwrap()
       },
       FieldType::SingleSelect => SelectOptionFilterPB::from(filter).try_into().unwrap(),
@@ -200,7 +200,7 @@ impl TryInto<UpdateFilterParams> for UpdateFilterPayloadPB {
         condition = filter.condition as u8;
         content = filter.content;
       },
-      FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+      FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
         let filter = DateFilterPB::try_from(bytes).map_err(|_| ErrorCode::ProtobufSerde)?;
         condition = filter.condition as u8;
         content = DateFilterContentPB {

+ 2 - 2
frontend/rust-lib/flowy-database2/src/entities/macros.rs

@@ -12,8 +12,8 @@ macro_rules! impl_into_field_type {
           5 => FieldType::Checkbox,
           6 => FieldType::URL,
           7 => FieldType::Checklist,
-          8 => FieldType::UpdatedAt,
-          9 => FieldType::CreatedAt,
+          8 => FieldType::LastEditedTime,
+          9 => FieldType::CreatedTime,
           _ => {
             tracing::error!("Can't parser FieldType from value: {}", ty);
             FieldType::RichText

+ 2 - 2
frontend/rust-lib/flowy-database2/src/services/cell/cell_operation.rs

@@ -330,7 +330,7 @@ impl<'a> CellBuilder<'a> {
               cells.insert(field_id, insert_number_cell(num, field));
             }
           },
-          FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+          FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
             if let Ok(timestamp) = cell_str.parse::<i64>() {
               cells.insert(field_id, insert_date_cell(timestamp, Some(false), field));
             }
@@ -362,7 +362,7 @@ impl<'a> CellBuilder<'a> {
     for field in fields {
       if !cell_by_field_id.contains_key(&field.id) {
         let field_type = FieldType::from(field.field_type);
-        if field_type == FieldType::UpdatedAt || field_type == FieldType::CreatedAt {
+        if field_type == FieldType::LastEditedTime || field_type == FieldType::CreatedTime {
           cells.insert(
             field.id.clone(),
             insert_date_cell(timestamp(), Some(true), field),

+ 2 - 2
frontend/rust-lib/flowy-database2/src/services/cell/type_cell_data.rs

@@ -82,8 +82,8 @@ impl TypeCellData {
 
   pub fn is_date(&self) -> bool {
     self.field_type == FieldType::DateTime
-      || self.field_type == FieldType::UpdatedAt
-      || self.field_type == FieldType::CreatedAt
+      || self.field_type == FieldType::LastEditedTime
+      || self.field_type == FieldType::CreatedTime
   }
 
   pub fn is_single_select(&self) -> bool {

+ 1 - 1
frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs

@@ -514,7 +514,7 @@ impl DatabaseEditor {
       .lock()
       .get_fields(view_id, None)
       .into_iter()
-      .filter(|f| FieldType::from(f.field_type) == FieldType::UpdatedAt)
+      .filter(|f| FieldType::from(f.field_type) == FieldType::LastEditedTime)
       .collect::<Vec<Field>>();
 
     self.database.lock().update_row(&row_id, |row_update| {

+ 1 - 1
frontend/rust-lib/flowy-database2/src/services/field/type_options/date_type_option/date_type_option.rs

@@ -16,7 +16,7 @@ use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
 use std::str::FromStr;
 
-/// The [DateTypeOption] is used by [FieldType::Date], [FieldType::UpdatedAt], and [FieldType::CreatedAt].
+/// The [DateTypeOption] is used by [FieldType::Date], [FieldType::LastEditedTime], and [FieldType::CreatedTime].
 /// So, storing the field type is necessary to distinguish the field type.
 /// Most of the cases, each [FieldType] has its own [TypeOption] implementation.
 #[derive(Clone, Default, Debug, Serialize, Deserialize)]

+ 3 - 3
frontend/rust-lib/flowy-database2/src/services/field/type_options/type_option.rs

@@ -146,7 +146,7 @@ pub fn type_option_data_from_pb_or_default<T: Into<Bytes>>(
     FieldType::Number => {
       NumberTypeOptionPB::try_from(bytes).map(|pb| NumberTypeOption::from(pb).into())
     },
-    FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+    FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
       DateTypeOptionPB::try_from(bytes).map(|pb| DateTypeOption::from(pb).into())
     },
     FieldType::SingleSelect => {
@@ -181,7 +181,7 @@ pub fn type_option_to_pb(type_option: TypeOptionData, field_type: &FieldType) ->
         .try_into()
         .unwrap()
     },
-    FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+    FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
       let date_type_option: DateTypeOption = type_option.into();
       DateTypeOptionPB::from(date_type_option).try_into().unwrap()
     },
@@ -220,7 +220,7 @@ pub fn default_type_option_data_from_type(field_type: &FieldType) -> TypeOptionD
   match field_type {
     FieldType::RichText => RichTextTypeOption::default().into(),
     FieldType::Number => NumberTypeOption::default().into(),
-    FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => DateTypeOption {
+    FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => DateTypeOption {
       field_type: field_type.clone(),
       ..Default::default()
     }

+ 2 - 2
frontend/rust-lib/flowy-database2/src/services/field/type_options/type_option_cell.rs

@@ -352,7 +352,7 @@ impl<'a> TypeOptionCellExt<'a> {
             self.cell_data_cache.clone(),
           )
         }),
-      FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => self
+      FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => self
         .field
         .get_type_option::<DateTypeOption>(field_type)
         .map(|type_option| {
@@ -472,7 +472,7 @@ fn get_type_option_transform_handler(
     FieldType::Number => {
       Box::new(NumberTypeOption::from(type_option_data)) as Box<dyn TypeOptionTransformHandler>
     },
-    FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+    FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
       Box::new(DateTypeOption::from(type_option_data)) as Box<dyn TypeOptionTransformHandler>
     },
     FieldType::SingleSelect => Box::new(SingleSelectTypeOption::from(type_option_data))

+ 1 - 1
frontend/rust-lib/flowy-database2/src/services/filter/controller.rs

@@ -325,7 +325,7 @@ impl FilterController {
             .write()
             .insert(field_id, NumberFilterPB::from_filter(filter.as_ref()));
         },
-        FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+        FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
           self
             .cell_filter_cache
             .write()

+ 3 - 3
frontend/rust-lib/flowy-database2/tests/database/block_test/row_test.rs

@@ -15,7 +15,7 @@ async fn created_at_field_test() {
 
   // Get created time of the new row.
   let row = test.get_rows().await.last().cloned().unwrap();
-  let updated_at_field = test.get_first_field(FieldType::CreatedAt);
+  let updated_at_field = test.get_first_field(FieldType::CreatedTime);
   let cell = row.cells.cell_for_field_id(&updated_at_field.id).unwrap();
   let created_at_timestamp = DateCellData::from(cell).timestamp.unwrap();
 
@@ -28,7 +28,7 @@ async fn created_at_field_test() {
 async fn update_at_field_test() {
   let mut test = DatabaseRowTest::new().await;
   let row = test.get_rows().await.remove(0);
-  let updated_at_field = test.get_first_field(FieldType::UpdatedAt);
+  let updated_at_field = test.get_first_field(FieldType::LastEditedTime);
   let cell = row.cells.cell_for_field_id(&updated_at_field.id).unwrap();
   let old_updated_at = DateCellData::from(cell).timestamp.unwrap();
 
@@ -41,7 +41,7 @@ async fn update_at_field_test() {
 
   // Get the updated time of the row.
   let row = test.get_rows().await.remove(0);
-  let updated_at_field = test.get_first_field(FieldType::UpdatedAt);
+  let updated_at_field = test.get_first_field(FieldType::LastEditedTime);
   let cell = row.cells.cell_for_field_id(&updated_at_field.id).unwrap();
   let new_updated_at = DateCellData::from(cell).timestamp.unwrap();
 

+ 2 - 2
frontend/rust-lib/flowy-database2/tests/database/cell_test/test.rs

@@ -23,7 +23,7 @@ async fn grid_cell_update() {
       let cell_changeset = match field_type {
         FieldType::RichText => "".to_string(),
         FieldType::Number => "123".to_string(),
-        FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+        FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
           make_date_cell_string("123")
         },
         FieldType::SingleSelect => {
@@ -108,7 +108,7 @@ async fn url_cell_data_test() {
 #[tokio::test]
 async fn update_updated_at_field_on_other_cell_update() {
   let mut test = DatabaseCellTest::new().await;
-  let updated_at_field = test.get_first_field(FieldType::UpdatedAt);
+  let updated_at_field = test.get_first_field(FieldType::LastEditedTime);
 
   let text_field = test
     .fields

+ 1 - 1
frontend/rust-lib/flowy-database2/tests/database/field_test/test.rs

@@ -31,7 +31,7 @@ async fn grid_create_field() {
   ];
   test.run_scripts(scripts).await;
 
-  let (params, field) = create_date_field(&test.view_id(), FieldType::CreatedAt);
+  let (params, field) = create_date_field(&test.view_id(), FieldType::CreatedTime);
   let scripts = vec![
     CreateField { params },
     AssertFieldTypeOptionEqual {

+ 2 - 2
frontend/rust-lib/flowy-database2/tests/database/field_test/util.rs

@@ -55,11 +55,11 @@ pub fn create_date_field(grid_id: &str, field_type: FieldType) -> (CreateFieldPa
       .name("Date")
       .visibility(true)
       .build(),
-    FieldType::UpdatedAt => FieldBuilder::new(field_type.clone(), date_type_option.clone())
+    FieldType::LastEditedTime => FieldBuilder::new(field_type.clone(), date_type_option.clone())
       .name("Updated At")
       .visibility(true)
       .build(),
-    FieldType::CreatedAt => FieldBuilder::new(field_type.clone(), date_type_option.clone())
+    FieldType::CreatedTime => FieldBuilder::new(field_type.clone(), date_type_option.clone())
       .name("Created At")
       .visibility(true)
       .build(),

+ 8 - 8
frontend/rust-lib/flowy-database2/tests/database/mock_data/board_mock_data.rs

@@ -37,7 +37,7 @@ pub fn make_test_board() -> DatabaseData {
           .build();
         fields.push(number_field);
       },
-      FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+      FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
         // Date
         let date_type_option = DateTypeOption {
           date_format: DateFormat::US,
@@ -47,8 +47,8 @@ pub fn make_test_board() -> DatabaseData {
         };
         let name = match field_type {
           FieldType::DateTime => "Time",
-          FieldType::UpdatedAt => "Updated At",
-          FieldType::CreatedAt => "Created At",
+          FieldType::LastEditedTime => "Updated At",
+          FieldType::CreatedTime => "Created At",
           _ => "",
         };
         let date_field = FieldBuilder::new(field_type.clone(), date_type_option)
@@ -126,7 +126,7 @@ pub fn make_test_board() -> DatabaseData {
             FieldType::RichText => row_builder.insert_text_cell("A"),
             FieldType::Number => row_builder.insert_number_cell("1"),
             // 1647251762 => Mar 14,2022
-            FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+            FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
               row_builder.insert_date_cell("1647251762", None, None, &field_type)
             },
             FieldType::SingleSelect => {
@@ -146,7 +146,7 @@ pub fn make_test_board() -> DatabaseData {
             FieldType::RichText => row_builder.insert_text_cell("B"),
             FieldType::Number => row_builder.insert_number_cell("2"),
             // 1647251762 => Mar 14,2022
-            FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+            FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
               row_builder.insert_date_cell("1647251762", None, None, &field_type)
             },
             FieldType::SingleSelect => {
@@ -165,7 +165,7 @@ pub fn make_test_board() -> DatabaseData {
             FieldType::RichText => row_builder.insert_text_cell("C"),
             FieldType::Number => row_builder.insert_number_cell("3"),
             // 1647251762 => Mar 14,2022
-            FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+            FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
               row_builder.insert_date_cell("1647251762", None, None, &field_type)
             },
             FieldType::SingleSelect => {
@@ -187,7 +187,7 @@ pub fn make_test_board() -> DatabaseData {
           match field_type {
             FieldType::RichText => row_builder.insert_text_cell("DA"),
             FieldType::Number => row_builder.insert_number_cell("4"),
-            FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+            FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
               row_builder.insert_date_cell("1668704685", None, None, &field_type)
             },
             FieldType::SingleSelect => {
@@ -204,7 +204,7 @@ pub fn make_test_board() -> DatabaseData {
           match field_type {
             FieldType::RichText => row_builder.insert_text_cell("AE"),
             FieldType::Number => row_builder.insert_number_cell(""),
-            FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+            FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
               row_builder.insert_date_cell("1668359085", None, None, &field_type)
             },
             FieldType::SingleSelect => {

+ 9 - 9
frontend/rust-lib/flowy-database2/tests/database/mock_data/grid_mock_data.rs

@@ -37,7 +37,7 @@ pub fn make_test_grid() -> DatabaseData {
           .build();
         fields.push(number_field);
       },
-      FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+      FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
         // Date
         let date_type_option = DateTypeOption {
           date_format: DateFormat::US,
@@ -47,8 +47,8 @@ pub fn make_test_grid() -> DatabaseData {
         };
         let name = match field_type {
           FieldType::DateTime => "Time",
-          FieldType::UpdatedAt => "Updated At",
-          FieldType::CreatedAt => "Created At",
+          FieldType::LastEditedTime => "Updated At",
+          FieldType::CreatedTime => "Created At",
           _ => "",
         };
         let date_field = FieldBuilder::new(field_type.clone(), date_type_option)
@@ -124,7 +124,7 @@ pub fn make_test_grid() -> DatabaseData {
           match field_type {
             FieldType::RichText => row_builder.insert_text_cell("A"),
             FieldType::Number => row_builder.insert_number_cell("1"),
-            FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+            FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
               row_builder.insert_date_cell("1647251762", None, None, &field_type)
             },
             FieldType::MultiSelect => row_builder
@@ -145,7 +145,7 @@ pub fn make_test_grid() -> DatabaseData {
           match field_type {
             FieldType::RichText => row_builder.insert_text_cell(""),
             FieldType::Number => row_builder.insert_number_cell("2"),
-            FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+            FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
               row_builder.insert_date_cell("1647251762", None, None, &field_type)
             },
             FieldType::MultiSelect => row_builder
@@ -160,7 +160,7 @@ pub fn make_test_grid() -> DatabaseData {
           match field_type {
             FieldType::RichText => row_builder.insert_text_cell("C"),
             FieldType::Number => row_builder.insert_number_cell("3"),
-            FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+            FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
               row_builder.insert_date_cell("1647251762", None, None, &field_type)
             },
             FieldType::SingleSelect => {
@@ -179,7 +179,7 @@ pub fn make_test_grid() -> DatabaseData {
           match field_type {
             FieldType::RichText => row_builder.insert_text_cell("DA"),
             FieldType::Number => row_builder.insert_number_cell("14"),
-            FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+            FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
               row_builder.insert_date_cell("1668704685", None, None, &field_type)
             },
             FieldType::SingleSelect => {
@@ -195,7 +195,7 @@ pub fn make_test_grid() -> DatabaseData {
           match field_type {
             FieldType::RichText => row_builder.insert_text_cell("AE"),
             FieldType::Number => row_builder.insert_number_cell(""),
-            FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+            FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
               row_builder.insert_date_cell("1668359085", None, None, &field_type)
             },
             FieldType::SingleSelect => {
@@ -212,7 +212,7 @@ pub fn make_test_grid() -> DatabaseData {
           match field_type {
             FieldType::RichText => row_builder.insert_text_cell("AE"),
             FieldType::Number => row_builder.insert_number_cell("5"),
-            FieldType::DateTime | FieldType::UpdatedAt | FieldType::CreatedAt => {
+            FieldType::DateTime | FieldType::LastEditedTime | FieldType::CreatedTime => {
               row_builder.insert_date_cell("1671938394", None, None, &field_type)
             },
             FieldType::SingleSelect => {

+ 4 - 4
frontend/rust-lib/flowy-database2/tests/database/share_test/export_test.rs

@@ -96,8 +96,8 @@ async fn export_and_then_import_meta_csv_test() {
           FieldType::Checkbox => {},
           FieldType::URL => {},
           FieldType::Checklist => {},
-          FieldType::UpdatedAt => {},
-          FieldType::CreatedAt => {},
+          FieldType::LastEditedTime => {},
+          FieldType::CreatedTime => {},
         }
       } else {
         panic!(
@@ -177,8 +177,8 @@ async fn history_database_import_test() {
             }
           },
           FieldType::Checklist => {},
-          FieldType::UpdatedAt => {},
-          FieldType::CreatedAt => {},
+          FieldType::LastEditedTime => {},
+          FieldType::CreatedTime => {},
         }
       } else {
         panic!(