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.

feat: allow filtering by last modified and created at field types (#6407)

Richard Shiuee1c60084d36c
diff --git a/frontend/appflowy_flutter/integration_test/desktop/database/database_field_test.dart b/frontend/appflowy_flutter/integration_test/desktop/database/database_field_test.dart
index 45d05207ff..5b2a6a8924 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/database/database_field_test.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/database/database_field_test.dart
@@ -126,7 +126,7 @@ void main() {
await tester.dismissFieldEditor();
tester.findFieldWithName('Right');
- // insert new field to the right
+ // insert new field to the left
await tester.tapGridFieldWithName('Type');
await tester.tapInsertFieldButton(left: true, name: "Left");
await tester.dismissFieldEditor();
diff --git a/frontend/appflowy_flutter/integration_test/desktop/database/database_filter_test.dart b/frontend/appflowy_flutter/integration_test/desktop/database/database_filter_test.dart
index 6d19ca5d39..d4e0f6be5d 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/database/database_filter_test.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/database/database_filter_test.dart
@@ -1,11 +1,14 @@
import 'package:appflowy/plugins/database/application/field/filter_entities.dart';
+import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';
import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/checkbox.dart';
import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';
import '../../shared/database_test_op.dart';
+import '../../shared/util.dart';
void main() {
IntegrationTestWidgetsFlutterBinding.ensureInitialized();
@@ -161,5 +164,36 @@ void main() {
await tester.pumpAndSettle();
});
+
+ testWidgets('add timestamp filter', (tester) async {
+ await tester.initializeAppFlowy();
+ await tester.tapAnonymousSignInButton();
+
+ await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Grid);
+
+ await tester.scrollToRight(find.byType(GridPage));
+
+ await tester.createField(
+ FieldType.CreatedTime,
+ name: 'Created at',
+ );
+
+ // create a filter
+ await tester.tapDatabaseFilterButton();
+ await tester.tapCreateFilterByFieldType(
+ FieldType.CreatedTime,
+ 'Created at',
+ );
+ await tester.pumpAndSettle();
+
+ tester.assertNumberOfRowsInGridPage(3);
+
+ await tester.tapFilterButtonInGrid('Created at');
+ await tester.tapDateFilterButtonInGrid();
+ await tester.tapDateFilterCondition(DateTimeFilterCondition.before);
+ tester.assertNumberOfRowsInGridPage(0);
+
+ await tester.pumpAndSettle();
+ });
});
}
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_bottom_sheet.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_bottom_sheet.dart
index 8008edb5d9..3acede8392 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_bottom_sheet.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_bottom_sheet.dart
@@ -363,7 +363,7 @@ class _FilterItem extends StatelessWidget {
.startEditingFilterCondition(
filter.filterId,
filter,
- filter.fieldType.isDate,
+ filter.fieldType == FieldType.DateTime,
),
child: FlowyText(
filter.conditionName,
@@ -683,7 +683,11 @@ class _FilterConditionList extends StatelessWidget {
if (filter is DateTimeFilter?) {
return _DateTimeFilterConditionList(
onSelect: (filter) {
- context.read<MobileFilterEditorCubit>().updateFilter(filter);
+ if (filter.fieldType == FieldType.DateTime) {
+ context.read<MobileFilterEditorCubit>().updateFilter(filter);
+ } else {
+ onSelect(filter);
+ }
},
);
}
@@ -783,6 +787,10 @@ class _DateTimeFilterConditionList extends StatelessWidget {
orElse: () => const SizedBox.shrink(),
editCondition: (filterId, newFilter, _) {
final filter = newFilter as DateTimeFilter;
+ final conditions =
+ DateTimeFilterCondition.availableConditionsForFieldType(
+ filter.fieldType,
+ );
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -813,17 +821,17 @@ class _DateTimeFilterConditionList extends StatelessWidget {
),
Expanded(
child: ListView.builder(
- itemCount: DateTimeFilterCondition.values.length,
+ itemCount: conditions.length,
itemBuilder: (context, index) {
- final condition = DateTimeFilterCondition.values[index];
return FlowyOptionTile.checkbox(
- text: condition.filterName,
+ text: conditions[index].filterName,
showTopBorder: false,
- isSelected: filter.condition.toCondition() == condition,
+ isSelected:
+ filter.condition.toCondition() == conditions[index],
onTap: () {
final newFilter = filter.copyWithCondition(
isStart: filter.condition.isStart,
- condition: condition,
+ condition: conditions[index],
);
onSelect(newFilter);
},
@@ -922,6 +930,8 @@ class _FilterContentEditor extends StatelessWidget {
filter: filter as SelectOptionFilter,
field: field,
),
+ FieldType.CreatedTime ||
+ FieldType.LastEditedTime ||
FieldType.DateTime =>
_DateTimeFilterContentEditor(filter: filter as DateTimeFilter),
_ => const SizedBox.shrink(),
@@ -1002,7 +1012,9 @@ class _SelectOptionFilterContentEditorState
}
MobileSelectedOptionIndicator _getIndicator() {
- return widget.filter.condition == SelectOptionFilterConditionPB.OptionIs &&
+ return (widget.filter.condition == SelectOptionFilterConditionPB.OptionIs ||
+ widget.filter.condition ==
+ SelectOptionFilterConditionPB.OptionIsNot) &&
widget.field.fieldType == FieldType.SingleSelect
? MobileSelectedOptionIndicator.single
: MobileSelectedOptionIndicator.multi;
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_condition_list.dart b/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_condition_list.dart
index a2177479d9..0dfde2a543 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_condition_list.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/database/view/database_filter_condition_list.dart
@@ -93,6 +93,8 @@ final class SingleSelectOptionFilterCondition
return [
SelectOptionFilterConditionPB.OptionIs,
SelectOptionFilterConditionPB.OptionIsNot,
+ SelectOptionFilterConditionPB.OptionContains,
+ SelectOptionFilterConditionPB.OptionDoesNotContain,
SelectOptionFilterConditionPB.OptionIsEmpty,
SelectOptionFilterConditionPB.OptionIsNotEmpty,
].map((e) => (e, e.i18n)).toList();
diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/field/filter_entities.dart b/frontend/appflowy_flutter/lib/plugins/database/application/field/filter_entities.dart
index a8bf8ccdaa..b9abb24bf6 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/application/field/filter_entities.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/application/field/filter_entities.dart
@@ -73,6 +73,8 @@ abstract class DatabaseFilter {
condition: data.condition,
optionIds: data.optionIds,
);
+ case FieldType.LastEditedTime:
+ case FieldType.CreatedTime:
case FieldType.DateTime:
final data = DateFilterPB.fromBuffer(filterPB.data.data);
return DateTimeFilter(
@@ -354,8 +356,10 @@ final class SelectOptionFilter extends DatabaseFilter {
final delegate = makeDelegate(field);
final options = delegate.getOptions(field);
- final optionNames =
- options.where((option) => optionIds.contains(option.id)).join(', ');
+ final optionNames = options
+ .where((option) => optionIds.contains(option.id))
+ .map((option) => option.name)
+ .join(', ');
return "${condition.i18n} $optionNames";
}
@@ -406,7 +410,8 @@ final class SelectOptionFilter extends DatabaseFilter {
}) {
final options = optionIds ?? this.optionIds;
if (fieldType == FieldType.SingleSelect &&
- condition == SelectOptionFilterConditionPB.OptionIs &&
+ (condition == SelectOptionFilterConditionPB.OptionIs ||
+ condition == SelectOptionFilterConditionPB.OptionIsNot) &&
options.length > 1) {
options.removeRange(1, options.length);
}
@@ -484,6 +489,18 @@ enum DateTimeFilterCondition {
isNotEmpty => LocaleKeys.grid_dateFilter_notEmpty.tr(),
};
}
+
+ static List<DateTimeFilterCondition> availableConditionsForFieldType(
+ FieldType fieldType,) {
+ final result = [...values];
+ if (fieldType == FieldType.CreatedTime ||
+ fieldType == FieldType.LastEditedTime) {
+ result.remove(isEmpty);
+ result.remove(isNotEmpty);
+ }
+
+ return result;
+ }
}
final class DateTimeFilter extends DatabaseFilter {
diff --git a/frontend/appflowy_flutter/lib/plugins/database/domain/filter_service.dart b/frontend/appflowy_flutter/lib/plugins/database/domain/filter_service.dart
index e4c4d47a86..4e191bf019 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/domain/filter_service.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/domain/filter_service.dart
@@ -92,6 +92,7 @@ class FilterBackendService {
Future<FlowyResult<void, FlowyError>> insertDateFilter({
required String fieldId,
+ required FieldType fieldType,
String? filterId,
required DateFilterConditionPB condition,
int? start,
@@ -113,13 +114,13 @@ class FilterBackendService {
return filterId == null
? insertFilter(
fieldId: fieldId,
- fieldType: FieldType.DateTime,
+ fieldType: fieldType,
data: filter.writeToBuffer(),
)
: updateFilter(
filterId: filterId,
fieldId: fieldId,
- fieldType: FieldType.DateTime,
+ fieldType: fieldType,
data: filter.writeToBuffer(),
);
}
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_editor_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_editor_bloc.dart
index 61b503f7d1..43f0c398d8 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_editor_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/filter_editor_bloc.dart
@@ -121,6 +121,7 @@ class FilterEditorBloc extends Bloc<FilterEditorEvent, FilterEditorState> {
return _filterBackendSvc.insertDateFilter(
filterId: filterId,
fieldId: fieldId,
+ fieldType: field.fieldType,
condition: DateFilterConditionPB.DateStartsOn,
timestamp: timestamp,
);
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/select_option_loader.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/select_option_loader.dart
index 505aa0e12d..703be6414f 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/select_option_loader.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/application/filter/select_option_loader.dart
@@ -34,12 +34,14 @@ class SingleSelectOptionFilterDelegateImpl
switch (condition) {
case SelectOptionFilterConditionPB.OptionIs:
+ case SelectOptionFilterConditionPB.OptionIsNot:
if (selectOptionIds.isNotEmpty) {
selectOptionIds.clear();
}
selectOptionIds.add(optionId);
break;
- case SelectOptionFilterConditionPB.OptionIsNot:
+ case SelectOptionFilterConditionPB.OptionContains:
+ case SelectOptionFilterConditionPB.OptionDoesNotContain:
selectOptionIds.add(optionId);
break;
case SelectOptionFilterConditionPB.OptionIsEmpty ||
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart
index c36f5edecd..7a2c9ed967 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart
@@ -107,19 +107,24 @@ class _DateFilterEditorState extends State<DateFilterEditor> {
child: Row(
children: [
Expanded(
- child: DateFilterIsStartList(
- filter: filter,
- popoverMutex: popoverMutex,
- onChangeIsStart: (isStart) {
- final newFilter = filter.copyWithCondition(
- isStart: isStart,
- condition: filter.condition.toCondition(),
- );
- context
- .read<FilterEditorBloc>()
- .add(FilterEditorEvent.updateFilter(newFilter));
- },
- ),
+ child: field.fieldType == FieldType.DateTime
+ ? DateFilterIsStartList(
+ filter: filter,
+ popoverMutex: popoverMutex,
+ onChangeIsStart: (isStart) {
+ final newFilter = filter.copyWithCondition(
+ isStart: isStart,
+ condition: filter.condition.toCondition(),
+ );
+ context
+ .read<FilterEditorBloc>()
+ .add(FilterEditorEvent.updateFilter(newFilter));
+ },
+ )
+ : FlowyText(
+ field.name,
+ overflow: TextOverflow.ellipsis,
+ ),
),
const HSpace(4),
Expanded(
@@ -307,11 +312,14 @@ class DateFilterConditionList extends StatelessWidget {
@override
Widget build(BuildContext context) {
+ final conditions = DateTimeFilterCondition.availableConditionsForFieldType(
+ filter.fieldType,
+ );
return PopoverActionList<ConditionWrapper>(
asBarrier: true,
mutex: popoverMutex,
direction: PopoverDirection.bottomWithCenterAligned,
- actions: DateTimeFilterCondition.values
+ actions: conditions
.map(
(action) => ConditionWrapper(
action,
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dart
index f74361d03c..4840ccc48a 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/condition_list.dart
@@ -1,5 +1,6 @@
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/mobile/presentation/database/view/database_filter_condition_list.dart';
import 'package:appflowy/plugins/database/application/field/filter_entities.dart';
import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/condition_button.dart';
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
@@ -28,11 +29,12 @@ class SelectOptionFilterConditionList extends StatelessWidget {
asBarrier: true,
mutex: popoverMutex,
direction: PopoverDirection.bottomWithCenterAligned,
- actions: _conditionsForFieldType(fieldType)
+ actions: SingleSelectOptionFilterCondition()
+ .conditions
.map(
(action) => ConditionWrapper(
- action,
- filter.condition == action,
+ action.$1,
+ filter.condition == action.$1,
),
)
.toList(),
@@ -48,29 +50,6 @@ class SelectOptionFilterConditionList extends StatelessWidget {
},
);
}
-
- List<SelectOptionFilterConditionPB> _conditionsForFieldType(
- FieldType fieldType,
- ) {
- // SelectOptionFilterConditionPB.values is not in order
- return switch (fieldType) {
- FieldType.SingleSelect => [
- SelectOptionFilterConditionPB.OptionIs,
- SelectOptionFilterConditionPB.OptionIsNot,
- SelectOptionFilterConditionPB.OptionIsEmpty,
- SelectOptionFilterConditionPB.OptionIsNotEmpty,
- ],
- FieldType.MultiSelect => [
- SelectOptionFilterConditionPB.OptionContains,
- SelectOptionFilterConditionPB.OptionDoesNotContain,
- SelectOptionFilterConditionPB.OptionIs,
- SelectOptionFilterConditionPB.OptionIsNot,
- SelectOptionFilterConditionPB.OptionIsEmpty,
- SelectOptionFilterConditionPB.OptionIsNotEmpty,
- ],
- _ => [],
- };
- }
}
class ConditionWrapper extends ActionCell {
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/option_list.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/option_list.dart
index d36b34c226..29ca24d5f0 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/option_list.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/option_list.dart
@@ -19,12 +19,14 @@ class SelectOptionFilterList extends StatelessWidget {
required this.field,
required this.delegate,
required this.options,
+ required this.onTap,
});
final SelectOptionFilter filter;
final FieldInfo field;
final SelectOptionFilterDelegate delegate;
final List<SelectOptionPB> options;
+ final VoidCallback onTap;
@override
Widget build(BuildContext context) {
@@ -65,6 +67,7 @@ class SelectOptionFilterList extends StatelessWidget {
_updateSelectOptions(context, filter, selectedOptionIds);
}
+ onTap();
}
void _updateSelectOptions(
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart
index 4a50fff143..d4d461f3a2 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart
@@ -90,6 +90,7 @@ class _SelectOptionFilterEditorState extends State<SelectOptionFilterEditor> {
field: field,
delegate: delegate,
options: delegate.getOptions(field),
+ onTap: () => popoverMutex.close(),
),
),
);
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_menu_item.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_menu_item.dart
index afc4b631dd..d7e45840e6 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_menu_item.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_menu_item.dart
@@ -27,7 +27,10 @@ class FilterMenuItem extends StatelessWidget {
FieldType.URL => URLFilterChoicechip(filterId: filterId),
FieldType.Checkbox => CheckboxFilterChoicechip(filterId: filterId),
FieldType.Checklist => ChecklistFilterChoicechip(filterId: filterId),
- FieldType.DateTime => DateFilterChoicechip(filterId: filterId),
+ FieldType.DateTime ||
+ FieldType.LastEditedTime ||
+ FieldType.CreatedTime =>
+ DateFilterChoicechip(filterId: filterId),
FieldType.SingleSelect ||
FieldType.MultiSelect =>
SelectOptionFilterChoicechip(filterId: filterId),
diff --git a/frontend/appflowy_flutter/lib/util/field_type_extension.dart b/frontend/appflowy_flutter/lib/util/field_type_extension.dart
index e7b9d10911..8baea35630 100644
--- a/frontend/appflowy_flutter/lib/util/field_type_extension.dart
+++ b/frontend/appflowy_flutter/lib/util/field_type_extension.dart
@@ -93,14 +93,6 @@ extension FieldTypeExtension on FieldType {
_ => throw UnimplementedError(),
};
- bool get isDate => switch (this) {
- FieldType.DateTime ||
- FieldType.CreatedTime ||
- FieldType.LastEditedTime =>
- true,
- _ => false,
- };
-
bool get canBeGroup => switch (this) {
FieldType.URL ||
FieldType.Checkbox ||
@@ -119,7 +111,9 @@ extension FieldTypeExtension on FieldType {
FieldType.SingleSelect ||
FieldType.Checklist ||
FieldType.URL ||
- FieldType.DateTime =>
+ FieldType.DateTime ||
+ FieldType.CreatedTime ||
+ FieldType.LastEditedTime =>
true,
_ => false
};
diff --git a/frontend/rust-lib/flowy-database2/src/entities/filter_entities/date_filter.rs b/frontend/rust-lib/flowy-database2/src/entities/filter_entities/date_filter.rs
index edb863aae0..9172c96c32 100644
--- a/frontend/rust-lib/flowy-database2/src/entities/filter_entities/date_filter.rs
+++ b/frontend/rust-lib/flowy-database2/src/entities/filter_entities/date_filter.rs
@@ -131,3 +131,13 @@ impl ParseFilterData for DateFilterPB {
date_filter
}
}
+
+impl DateFilterPB {
+ pub fn remove_end_date_conditions(self) -> Self {
+ if self.condition.is_filter_on_start_timestamp() {
+ self
+ } else {
+ Self::default()
+ }
+ }
+}
diff --git a/frontend/rust-lib/flowy-database2/src/entities/filter_entities/select_option_filter.rs b/frontend/rust-lib/flowy-database2/src/entities/filter_entities/select_option_filter.rs
index 3c1c5f9a3e..d6775cf374 100644
--- a/frontend/rust-lib/flowy-database2/src/entities/filter_entities/select_option_filter.rs
+++ b/frontend/rust-lib/flowy-database2/src/entities/filter_entities/select_option_filter.rs
@@ -58,3 +58,10 @@ impl ParseFilterData for SelectOptionFilterPB {
}
}
}
+
+impl SelectOptionFilterPB {
+ pub fn remove_extra_option_ids(mut self) -> Self {
+ self.option_ids.truncate(1);
+ self
+ }
+}
diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/date_type_option/date_filter.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/date_type_option/date_filter.rs
index 85cf805636..29112a4cc5 100644
--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/date_type_option/date_filter.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/date_type_option/date_filter.rs
@@ -1,5 +1,6 @@
use crate::entities::{DateFilterConditionPB, DateFilterPB};
use crate::services::cell::insert_date_cell;
+use crate::services::field::TimestampCellData;
use crate::services::filter::PreFillCellsWithFilter;
use chrono::{Duration, NaiveDate};
@@ -12,6 +13,24 @@ impl DateFilterPB {
/// the condition. For example, `start` and `end` timestamps for
/// `DateFilterConditionPB::DateStartsBetween`.
pub fn is_visible(&self, cell_data: &DateCellData) -> Option<bool> {
+ let strategy = self.get_strategy()?;
+
+ let timestamp = if self.condition.is_filter_on_start_timestamp() {
+ cell_data.timestamp
+ } else {
+ cell_data.end_timestamp.or_else(|| cell_data.timestamp)
+ };
+
+ Some(strategy.filter(timestamp))
+ }
+
+ pub fn is_timestamp_cell_data_visible(&self, cell_data: &TimestampCellData) -> Option<bool> {
+ let strategy = self.get_strategy()?;
+
+ Some(strategy.filter(cell_data.timestamp))
+ }
+
+ fn get_strategy(&self) -> Option<DateFilterStrategy> {
let strategy = match self.condition {
DateFilterConditionPB::DateStartsOn | DateFilterConditionPB::DateEndsOn => {
DateFilterStrategy::On(self.timestamp?)
@@ -42,13 +61,7 @@ impl DateFilterPB {
},
};
- let timestamp = if self.condition.is_filter_on_start_timestamp() {
- cell_data.timestamp
- } else {
- cell_data.end_timestamp.or_else(|| cell_data.timestamp)
- };
-
- Some(strategy.filter(timestamp))
+ Some(strategy)
}
}
diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/timestamp_type_option/timestamp_type_option.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/timestamp_type_option/timestamp_type_option.rs
index 16f1800045..d8ce77ebe0 100644
--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/timestamp_type_option/timestamp_type_option.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/timestamp_type_option/timestamp_type_option.rs
@@ -74,10 +74,12 @@ impl CellDataChangeset for TimestampTypeOption {
impl TypeOptionCellDataFilter for TimestampTypeOption {
fn apply_filter(
&self,
- _filter: &<Self as TypeOption>::CellFilter,
- _cell_data: &<Self as TypeOption>::CellData,
+ filter: &<Self as TypeOption>::CellFilter,
+ cell_data: &<Self as TypeOption>::CellData,
) -> bool {
- true
+ filter
+ .is_timestamp_cell_data_visible(cell_data)
+ .unwrap_or(true)
}
}
diff --git a/frontend/rust-lib/flowy-database2/src/services/filter/controller.rs b/frontend/rust-lib/flowy-database2/src/services/filter/controller.rs
index 21c7bb180b..b4178afeb9 100644
--- a/frontend/rust-lib/flowy-database2/src/services/filter/controller.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/filter/controller.rs
@@ -20,7 +20,7 @@ use crate::entities::filter_entities::*;
use crate::entities::{FieldType, InsertedRowPB, RowMetaPB};
use crate::services::cell::CellCache;
use crate::services::database_view::{DatabaseViewChanged, DatabaseViewChangedNotifier};
-use crate::services::field::TypeOptionCellExt;
+use crate::services::field::{TimestampCellData, TimestampCellDataWrapper, TypeOptionCellExt};
use crate::services::filter::{Filter, FilterChangeset, FilterInner, FilterResultNotification};
#[async_trait]
@@ -524,7 +524,20 @@ fn apply_filter(
error!("field type of filter doesn't match field type of field");
return Some(false);
}
- let cell = row.cells.get(field_id).cloned();
+ let timestamp_cell = match field_type {
+ FieldType::LastEditedTime | FieldType::CreatedTime => {
+ let timestamp = if field_type.is_created_time() {
+ row.created_at
+ } else {
+ row.modified_at
+ };
+ let cell =
+ TimestampCellDataWrapper::from((*field_type, TimestampCellData::new(timestamp)));
+ Some(cell.into())
+ },
+ _ => None,
+ };
+ let cell = timestamp_cell.or_else(|| row.cells.get(field_id).cloned());
if let Some(handler) = TypeOptionCellExt::new(field, Some(cell_data_cache.clone()))
.get_type_option_cell_data_handler()
{
diff --git a/frontend/rust-lib/flowy-database2/src/services/filter/entities.rs b/frontend/rust-lib/flowy-database2/src/services/filter/entities.rs
index 535b374dc6..7fefc95729 100644
--- a/frontend/rust-lib/flowy-database2/src/services/filter/entities.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/filter/entities.rs
@@ -275,12 +275,17 @@ impl FilterInner {
BoxAny::new(TextFilterPB::parse(condition as u8, content))
},
FieldType::Number => BoxAny::new(NumberFilterPB::parse(condition as u8, content)),
- FieldType::DateTime | FieldType::CreatedTime | FieldType::LastEditedTime => {
- BoxAny::new(DateFilterPB::parse(condition as u8, content))
+ FieldType::DateTime => BoxAny::new(DateFilterPB::parse(condition as u8, content)),
+ FieldType::CreatedTime | FieldType::LastEditedTime => {
+ let filter = DateFilterPB::parse(condition as u8, content).remove_end_date_conditions();
+ BoxAny::new(filter)
},
- FieldType::SingleSelect | FieldType::MultiSelect => {
- BoxAny::new(SelectOptionFilterPB::parse(condition as u8, content))
+ FieldType::SingleSelect => {
+ let filter =
+ SelectOptionFilterPB::parse(condition as u8, content).remove_extra_option_ids();
+ BoxAny::new(filter)
},
+ FieldType::MultiSelect => BoxAny::new(SelectOptionFilterPB::parse(condition as u8, content)),
FieldType::Checklist => BoxAny::new(ChecklistFilterPB::parse(condition as u8, content)),
FieldType::Checkbox => BoxAny::new(CheckboxFilterPB::parse(condition as u8, content)),
FieldType::Relation => BoxAny::new(RelationFilterPB::parse(condition as u8, content)),