test: rewrite bloc tests (AppFlowy-IO#6492)

LucasXu0 · Oct 7, 2024 · 9ee39f4 · 9ee39f4
1 parent a763304
commit 9ee39f4
Show file tree

Hide file tree

Showing 18 changed files with 1,359 additions and 737 deletions.
diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/field/field_controller.dart b/frontend/appflowy_flutter/lib/plugins/database/application/field/field_controller.dart
@@ -174,7 +174,8 @@ class FieldController {
           (FilterChangesetNotificationPB changeset) {
             _filterNotifier?.filters =
                 _filterListFromPBs(changeset.filters.items);
-            _updateFieldInfos();
+            _fieldNotifier.fieldInfos =
+                _updateFieldInfos(_fieldNotifier.fieldInfos);
           },
           (err) => Log.error(err),
         );
@@ -396,7 +397,7 @@ class FieldController {
             (updatedFields, fieldInfos) =
                 await updateFields(changeset.updatedFields, fieldInfos);
 
-            _fieldNotifier.fieldInfos = fieldInfos;
+            _fieldNotifier.fieldInfos = _updateFieldInfos(fieldInfos);
             for (final listener in _updatedFieldCallbacks.values) {
               listener(updatedFields);
             }
@@ -465,25 +466,22 @@ class FieldController {
     _fieldSettings.clear();
     _fieldSettings.addAll(setting.fieldSettings.items);
 
-    _updateFieldInfos();
+    _fieldNotifier.fieldInfos = _updateFieldInfos(_fieldNotifier.fieldInfos);
   }
 
   /// Attach sort, filter, group information and field settings to `FieldInfo`
-  void _updateFieldInfos() {
-    final List<FieldInfo> newFieldInfos = [];
-    for (final field in _fieldNotifier.fieldInfos) {
-      newFieldInfos.add(
-        field.copyWith(
-          fieldSettings: _fieldSettings
-              .firstWhereOrNull((setting) => setting.fieldId == field.id),
-          isGroupField: _groupConfigurationByFieldId[field.id] != null,
-          hasFilter: getFilterByFieldId(field.id) != null,
-          hasSort: getSortByFieldId(field.id) != null,
-        ),
-      );
-    }
-
-    _fieldNotifier.fieldInfos = newFieldInfos;
+  List<FieldInfo> _updateFieldInfos(List<FieldInfo> fieldInfos) {
+    return fieldInfos
+        .map(
+          (field) => field.copyWith(
+            fieldSettings: _fieldSettings
+                .firstWhereOrNull((setting) => setting.fieldId == field.id),
+            isGroupField: _groupConfigurationByFieldId[field.id] != null,
+            hasFilter: getFilterByFieldId(field.id) != null,
+            hasSort: getSortByFieldId(field.id) != null,
+          ),
+        )
+        .toList();
   }
 
   /// Load all of the fields. This is required when opening the database
@@ -506,7 +504,8 @@ class FieldController {
             _loadAllFieldSettings(),
             _loadSettings(),
           ]);
-          _updateFieldInfos();
+          _fieldNotifier.fieldInfos =
+              _updateFieldInfos(_fieldNotifier.fieldInfos);
 
           return FlowyResult.success(null);
         },

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
@@ -14,11 +14,12 @@ import 'package:appflowy/plugins/database/widgets/cell_editor/extension.dart';
 import 'package:appflowy/util/int64_extension.dart';
 import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:equatable/equatable.dart';
 import 'package:fixnum/fixnum.dart';
 import 'package:flowy_infra_ui/flowy_infra_ui.dart';
 import 'package:flutter/widgets.dart';
 
-abstract class DatabaseFilter {
+abstract class DatabaseFilter extends Equatable {
   const DatabaseFilter({
     required this.filterId,
     required this.fieldId,
@@ -112,16 +113,18 @@ abstract class DatabaseFilter {
 }
 
 final class TextFilter extends DatabaseFilter {
-  const TextFilter({
+  TextFilter({
     required super.filterId,
     required super.fieldId,
     required super.fieldType,
     required this.condition,
-    required this.content,
-  });
+    required String content,
+  }) {
+    this.content = canAttachContent ? content : "";
+  }
 
   final TextFilterConditionPB condition;
-  final String content;
+  late final String content;
 
   @override
   String get conditionName => condition.filterName;
@@ -182,19 +185,24 @@ final class TextFilter extends DatabaseFilter {
       content: content ?? this.content,
     );
   }
+
+  @override
+  List<Object?> get props => [filterId, fieldId, condition, content];
 }
 
 final class NumberFilter extends DatabaseFilter {
-  const NumberFilter({
+  NumberFilter({
     required super.filterId,
     required super.fieldId,
     required super.fieldType,
     required this.condition,
-    required this.content,
-  });
+    required String content,
+  }) {
+    this.content = canAttachContent ? content : "";
+  }
 
   final NumberFilterConditionPB condition;
-  final String content;
+  late final String content;
 
   @override
   String get conditionName => condition.filterName;
@@ -253,6 +261,9 @@ final class NumberFilter extends DatabaseFilter {
       content: content ?? this.content,
     );
   }
+
+  @override
+  List<Object?> get props => [filterId, fieldId, condition, content];
 }
 
 final class CheckboxFilter extends DatabaseFilter {
@@ -289,6 +300,9 @@ final class CheckboxFilter extends DatabaseFilter {
       condition: condition ?? this.condition,
     );
   }
+
+  @override
+  List<Object?> get props => [filterId, fieldId, condition];
 }
 
 final class ChecklistFilter extends DatabaseFilter {
@@ -325,19 +339,33 @@ final class ChecklistFilter extends DatabaseFilter {
       condition: condition ?? this.condition,
     );
   }
+
+  @override
+  List<Object?> get props => [filterId, fieldId, condition];
 }
 
 final class SelectOptionFilter extends DatabaseFilter {
-  const SelectOptionFilter({
+  SelectOptionFilter({
     required super.filterId,
     required super.fieldId,
     required super.fieldType,
     required this.condition,
-    required this.optionIds,
-  });
+    required List<String> optionIds,
+  }) {
+    if (canAttachContent) {
+      if (fieldType == FieldType.SingleSelect &&
+          (condition == SelectOptionFilterConditionPB.OptionIs ||
+              condition == SelectOptionFilterConditionPB.OptionIsNot) &&
+          optionIds.isNotEmpty) {
+        this.optionIds.add(optionIds.first);
+      } else {
+        this.optionIds.addAll(optionIds);
+      }
+    }
+  }
 
   final SelectOptionFilterConditionPB condition;
-  final List<String> optionIds;
+  final List<String> optionIds = [];
 
   @override
   String get conditionName => condition.i18n;
@@ -428,6 +456,9 @@ final class SelectOptionFilter extends DatabaseFilter {
       field.fieldType == FieldType.SingleSelect
           ? const SingleSelectOptionFilterDelegateImpl()
           : const MultiSelectOptionFilterDelegateImpl();
+
+  @override
+  List<Object?> get props => [filterId, fieldId, condition, optionIds];
 }
 
 enum DateTimeFilterCondition {
@@ -491,7 +522,8 @@ enum DateTimeFilterCondition {
   }
 
   static List<DateTimeFilterCondition> availableConditionsForFieldType(
-      FieldType fieldType,) {
+    FieldType fieldType,
+  ) {
     final result = [...values];
     if (fieldType == FieldType.CreatedTime ||
         fieldType == FieldType.LastEditedTime) {
@@ -504,20 +536,37 @@ enum DateTimeFilterCondition {
 }
 
 final class DateTimeFilter extends DatabaseFilter {
-  const DateTimeFilter({
+  DateTimeFilter({
     required super.filterId,
     required super.fieldId,
     required super.fieldType,
     required this.condition,
-    this.timestamp,
-    this.start,
-    this.end,
-  });
+    DateTime? timestamp,
+    DateTime? start,
+    DateTime? end,
+  }) {
+    if (canAttachContent) {
+      if (condition == DateFilterConditionPB.DateStartsBetween ||
+          condition == DateFilterConditionPB.DateEndsBetween) {
+        this.start = start;
+        this.end = end;
+        this.timestamp = null;
+      } else {
+        this.timestamp = timestamp;
+        this.start = null;
+        this.end = null;
+      }
+    } else {
+      this.timestamp = null;
+      this.start = null;
+      this.end = null;
+    }
+  }
 
   final DateFilterConditionPB condition;
-  final DateTime? timestamp;
-  final DateTime? start;
-  final DateTime? end;
+  late final DateTime? timestamp;
+  late final DateTime? start;
+  late final DateTime? end;
 
   @override
   String get conditionName => condition.toCondition().filterName;
@@ -654,6 +703,10 @@ final class DateTimeFilter extends DatabaseFilter {
       timestamp: timestamp,
     );
   }
+
+  @override
+  List<Object?> get props =>
+      [filterId, fieldId, condition, timestamp, start, end];
 }
 
 final class TimeFilter extends DatabaseFilter {
@@ -703,4 +756,7 @@ final class TimeFilter extends DatabaseFilter {
       content: content ?? this.content,
     );
   }
+
+  @override
+  List<Object?> get props => [filterId, fieldId, condition, content];
 }
diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/share/import_service.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/share/import_service.dart
@@ -1,7 +1,6 @@
 import 'package:appflowy_backend/dispatch/dispatch.dart';
 import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
-import 'package:appflowy_backend/protobuf/flowy-folder/import.pb.dart';
-import 'package:appflowy_backend/protobuf/flowy-folder/view.pbenum.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
 import 'package:appflowy_result/appflowy_result.dart';
 
 class ImportPayload {
@@ -17,7 +16,7 @@ class ImportPayload {
 }
 
 class ImportBackendService {
-  static Future<FlowyResult<void, FlowyError>> importPages(
+  static Future<FlowyResult<RepeatedViewPB, FlowyError>> importPages(
     String parentViewId,
     List<ImportValuePayloadPB> values,
   ) async {