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.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
feat(flutter_desktop): open created filtered rows (#6522)
Richard Shiueea61c81cced5
diff --git a/frontend/appflowy_flutter/integration_test/desktop/database/database_calendar_test.dart b/frontend/appflowy_flutter/integration_test/desktop/database/database_calendar_test.dartindex 2af635e478..d976499586 100644--- a/frontend/appflowy_flutter/integration_test/desktop/database/database_calendar_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/database/database_calendar_test.dart@@ -323,7 +323,7 @@ void main() {tester.assertNumberOfEventsInCalendar(1);await tester.tapFilterButtonInGrid('Tags');- await tester.tapSelectFilterCondition(+ await tester.changeSelectFilterCondition(SelectOptionFilterConditionPB.OptionIsEmpty,);await tester.dismissCellEditor();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.dartindex b6278018e5..47ca742c6e 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,7 +1,7 @@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/plugins/database/widgets/row/row_detail.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';@@ -154,10 +154,10 @@ void main() {tester.assertNumberOfRowsInGridPage(0);await tester.tapFilterButtonInGrid('date');- await tester.tapDateFilterCondition(DateTimeFilterCondition.before);+ await tester.changeDateFilterCondition(DateTimeFilterCondition.before);tester.assertNumberOfRowsInGridPage(7);- await tester.tapDateFilterCondition(DateTimeFilterCondition.isEmpty);+ await tester.changeDateFilterCondition(DateTimeFilterCondition.isEmpty);tester.assertNumberOfRowsInGridPage(3);await tester.pumpAndSettle();@@ -169,8 +169,6 @@ void main() {await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Grid);- await tester.scrollToRight(find.byType(GridPage));-await tester.createField(FieldType.CreatedTime,name: 'Created at',@@ -187,8 +185,38 @@ void main() {tester.assertNumberOfRowsInGridPage(3);await tester.tapFilterButtonInGrid('Created at');- await tester.tapDateFilterCondition(DateTimeFilterCondition.before);+ await tester.changeDateFilterCondition(DateTimeFilterCondition.before);+ tester.assertNumberOfRowsInGridPage(0);++ await tester.pumpAndSettle();+ });++ testWidgets('create new row when filters don\'t autofill', (tester) async {+ await tester.initializeAppFlowy();+ await tester.tapAnonymousSignInButton();++ await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Grid);++ // create a filter+ await tester.tapDatabaseFilterButton();+ await tester.tapCreateFilterByFieldType(+ FieldType.RichText,+ 'Name',+ );+ tester.assertNumberOfRowsInGridPage(3);++ await tester.tapCreateRowButtonInGrid();+ tester.assertNumberOfRowsInGridPage(4);++ await tester.tapFilterButtonInGrid('Name');+ await tester+ .changeTextFilterCondition(TextFilterConditionPB.TextIsNotEmpty);+ await tester.dismissCellEditor();+ tester.assertNumberOfRowsInGridPage(0);++ await tester.tapCreateRowButtonInGrid();tester.assertNumberOfRowsInGridPage(0);+ expect(find.byType(RowDetailPage), findsOneWidget);await tester.pumpAndSettle();});diff --git a/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart b/frontend/appflowy_flutter/integration_test/shared/database_test_op.dartindex 6546280a71..5261b9818c 100644--- a/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart+++ b/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart@@ -1215,7 +1215,21 @@ extension AppFlowyDatabaseTest on WidgetTester {await tapButton(button);}- Future<void> tapSelectFilterCondition(+ Future<void> changeTextFilterCondition(+ TextFilterConditionPB condition,+ ) async {+ await tapButton(find.byType(TextFilterConditionList));+ final button = find.descendant(+ of: find.byType(HoverButton),+ matching: find.text(+ condition.filterName,+ ),+ );++ await tapButton(button);+ }++ Future<void> changeSelectFilterCondition(SelectOptionFilterConditionPB condition,) async {await tapButton(find.byType(SelectOptionFilterConditionList));@@ -1227,7 +1241,9 @@ extension AppFlowyDatabaseTest on WidgetTester {await tapButton(button);}- Future<void> tapDateFilterCondition(DateTimeFilterCondition condition) async {+ Future<void> changeDateFilterCondition(+ DateTimeFilterCondition condition,+ ) async {await tapButton(find.byType(DateFilterConditionList));final button = find.descendant(of: find.byType(HoverButton),diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/defines.dart b/frontend/appflowy_flutter/lib/plugins/database/application/defines.dartindex 96725ca80f..65deae7e58 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/defines.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/defines.dart@@ -1,7 +1,7 @@import 'dart:collection';import 'package:appflowy/plugins/database/application/field/filter_entities.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/database_entities.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_result/appflowy_result.dart';import 'package:freezed_annotation/freezed_annotation.dart';@@ -18,7 +18,7 @@ typedef OnFiltersChanged = void Function(List<DatabaseFilter>);typedef OnSortsChanged = void Function(List<DatabaseSort>);typedef OnDatabaseChanged = void Function(DatabasePB);-typedef OnRowsCreated = void Function(List<RowId> rowIds);+typedef OnRowsCreated = void Function(List<InsertedRowPB> rows);typedef OnRowsUpdated = void Function(List<RowId> rowIds,ChangedReason reason,diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/row/row_cache.dart b/frontend/appflowy_flutter/lib/plugins/database/application/row/row_cache.dartindex d7a4e4ebdb..be5ba29dfc 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/row/row_cache.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/row/row_cache.dart@@ -93,12 +93,9 @@ class RowCache {}void setRowMeta(RowMetaPB rowMeta) {- var rowInfo = _rowList.get(rowMeta.id);+ final rowInfo = _rowList.get(rowMeta.id);if (rowInfo != null) {rowInfo.updateRowMeta(rowMeta);- } else {- rowInfo = buildGridRow(rowMeta);- _rowList.add(rowInfo);}_changedNotifier?.receive(const ChangedReason.didFetchRow());@@ -162,13 +159,19 @@ class RowCache {}void _insertRows(List<InsertedRowPB> insertRows) {+ final InsertedIndexs insertedIndices = [];for (final insertedRow in insertRows) {- final insertedIndex =- _rowList.insert(insertedRow.index, buildGridRow(insertedRow.rowMeta));- if (insertedIndex != null) {- _changedNotifier?.receive(ChangedReason.insert(insertedIndex));+ if (insertedRow.hasIndex()) {+ final index = _rowList.insert(+ insertedRow.index,+ buildGridRow(insertedRow.rowMeta),+ );+ if (index != null) {+ insertedIndices.add(index);+ }}}+ _changedNotifier?.receive(ChangedReason.insert(insertedIndices));}void _updateRows(List<UpdatedRowPB> updatedRows) {@@ -211,7 +214,7 @@ class RowCache {final insertedIndex =_rowList.insert(insertedRow.index, buildGridRow(insertedRow.rowMeta));if (insertedIndex != null) {- _changedNotifier?.receive(ChangedReason.insert(insertedIndex));+ _changedNotifier?.receive(ChangedReason.insert([insertedIndex]));}}}@@ -365,7 +368,7 @@ typedef UpdatedIndexMap = LinkedHashMap<RowId, UpdatedIndex>;@freezedclass ChangedReason with _$ChangedReason {- const factory ChangedReason.insert(InsertedIndex item) = _Insert;+ const factory ChangedReason.insert(InsertedIndexs items) = _Insert;const factory ChangedReason.delete(DeletedIndex item) = _Delete;const factory ChangedReason.update(UpdatedIndexMap indexs) = _Update;const factory ChangedReason.fieldDidChange() = _FieldDidChange;diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/view/view_cache.dart b/frontend/appflowy_flutter/lib/plugins/database/application/view/view_cache.dartindex 77670fb0bb..754b2d1c23 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/view/view_cache.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/view/view_cache.dart@@ -69,11 +69,7 @@ class DatabaseViewCache {if (changeset.insertedRows.isNotEmpty) {for (final callback in _callbacks) {- callback.onRowsCreated?.call(- changeset.insertedRows- .map((insertedRow) => insertedRow.rowMeta.id)- .toList(),- );+ callback.onRowsCreated?.call(changeset.insertedRows);}}},diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/application/board_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/board/application/board_bloc.dartindex ad6b82e7df..f1b9c3f8be 100644--- a/frontend/appflowy_flutter/lib/plugins/database/board/application/board_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/board/application/board_bloc.dart@@ -273,6 +273,11 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {);}},+ openRowDetail: (rowMeta) {+ final copyState = state;+ emit(BoardState.openRowDetail(rowMeta: rowMeta));+ emit(copyState);+ },);},);@@ -477,8 +482,18 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {add(BoardEvent.didReceiveGroups(groupList));},);+ final onDatabaseChanged = DatabaseCallbacks(+ onRowsCreated: (rows) {+ for (final row in rows) {+ if (!isClosed && row.isHiddenInView) {+ add(BoardEvent.openRowDetail(row.rowMeta));+ }+ }+ },+ );databaseController.addListener(+ onDatabaseChanged: onDatabaseChanged,onLayoutSettingsChanged: onLayoutSettingsChanged,onGroupChanged: onGroupChanged,);@@ -581,6 +596,7 @@ class BoardEvent with _$BoardEvent {GroupedRowId groupedRowId,bool toPrevious,) = _MoveGroupToAdjacentGroup;+ const factory BoardEvent.openRowDetail(RowMetaPB rowMeta) = _OpenRowDetail;}@freezed@@ -607,6 +623,10 @@ class BoardState with _$BoardState {required List<GroupedRowId> groupedRowIds,}) = _BoardSetFocusState;+ const factory BoardState.openRowDetail({+ required RowMetaPB rowMeta,+ }) = _BoardOpenRowDetailState;+factory BoardState.initial(String viewId) => BoardState.ready(viewId: viewId,groupIds: [],diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dartindex 8ba4cde4c2..66395724df 100644--- a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart@@ -292,6 +292,14 @@ class _BoardContentState extends State<_BoardContent> {ready: (value) {widget.onEditStateChanged?.call();},+ openRowDetail: (value) {+ _openCard(+ context: context,+ databaseController:+ context.read<BoardBloc>().databaseController,+ rowMeta: value.rowMeta,+ );+ },orElse: () {},);},diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_bloc.dartindex f16a11cbe7..003fd3494b 100644--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/application/calendar_bloc.dart@@ -131,6 +131,20 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {),);},+ openRowDetail: (row) {+ emit(+ state.copyWith(+ openRow: row,+ ),+ );+ },+ resetOpenRowDetail: () {+ emit(+ state.copyWith(+ openRow: null,+ ),+ );+ },);},);@@ -306,14 +320,18 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {for (final fieldInfo in fieldInfos) fieldInfo.field.id: fieldInfo,};},- onRowsCreated: (rowIds) async {+ onRowsCreated: (rows) async {if (isClosed) {return;}- for (final id in rowIds) {- final event = await _loadEvent(id);- if (event != null && !isClosed) {- add(CalendarEvent.didReceiveEvent(event));+ for (final row in rows) {+ if (row.isHiddenInView) {+ add(CalendarEvent.openRowDetail(row.rowMeta));+ } else {+ final event = await _loadEvent(row.rowMeta.id);+ if (event != null) {+ add(CalendarEvent.didReceiveEvent(event));+ }}}},@@ -463,6 +481,10 @@ class CalendarEvent with _$CalendarEvent {const factory CalendarEvent.deleteEvent(String viewId, String rowId) =_DeleteEvent;++ const factory CalendarEvent.openRowDetail(RowMetaPB row) = _OpenRowDetail;++ const factory CalendarEvent.resetOpenRowDetail() = _ResetRowDetail;}@freezed@@ -477,6 +499,7 @@ class CalendarState with _$CalendarState {CalendarEventData<CalendarDayEvent>? updateEvent,required List<String> deleteEventIds,required CalendarLayoutSettingPB? settings,+ required RowMetaPB? openRow,required LoadingState loadingState,required FlowyError? noneOrError,}) = _CalendarState;@@ -487,6 +510,7 @@ class CalendarState with _$CalendarState {initialEvents: [],deleteEventIds: [],settings: null,+ openRow: null,noneOrError: null,loadingState: LoadingState.loading(),);diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/application/unschedule_event_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/application/unschedule_event_bloc.dartindex 4b5ab8e201..83cce129be 100644--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/application/unschedule_event_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/application/unschedule_event_bloc.dart@@ -104,12 +104,12 @@ class UnscheduleEventsBlocvoid _startListening() {final onDatabaseChanged = DatabaseCallbacks(- onRowsCreated: (rowIds) async {+ onRowsCreated: (rows) async {if (isClosed) {return;}- for (final id in rowIds) {- final event = await _loadEvent(id);+ for (final row in rows) {+ final event = await _loadEvent(row.rowMeta.id);if (event != null && !isClosed) {add(UnscheduleEventsEvent.didReceiveEvent(event));}diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dartindex 40ea55ddf7..96d48ff8f2 100644--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart@@ -1,5 +1,6 @@import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';import 'package:appflowy/plugins/database/tab_bar/desktop/setting_menu.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:flutter/material.dart';import 'package:appflowy/generated/flowy_svgs.g.dart';@@ -13,7 +14,6 @@ import 'package:appflowy/plugins/database/calendar/application/unschedule_event_import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';import 'package:appflowy/plugins/database/tab_bar/tab_bar_view.dart';import 'package:appflowy/workspace/application/view/view_bloc.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/calendar_entities.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:calendar_view/calendar_view.dart';@@ -168,6 +168,19 @@ class _CalendarPageState extends State<CalendarPage> {}},),+ BlocListener<CalendarBloc, CalendarState>(+ listenWhen: (p, c) => p.openRow != c.openRow,+ listener: (context, state) {+ if (state.openRow != null) {+ showEventDetails(+ context: context,+ databaseController: _calendarBloc.databaseController,+ rowMeta: state.openRow!,+ );+ _calendarBloc.add(const CalendarEvent.resetOpenRowDetail());+ }+ },+ ),],child: BlocBuilder<CalendarBloc, CalendarState>(builder: (context, state) {@@ -367,10 +380,10 @@ class _CalendarPageState extends State<CalendarPage> {void showEventDetails({required BuildContext context,required DatabaseController databaseController,- required CalendarEventPB event,+ required RowMetaPB rowMeta,}) {final rowController = RowController(- rowMeta: event.rowMeta,+ rowMeta: rowMeta,viewId: databaseController.viewId,rowCache: databaseController.rowCache,);@@ -521,7 +534,7 @@ class UnscheduleEventsList extends StatelessWidget {} else {showEventDetails(context: context,- event: event,+ rowMeta: event.rowMeta,databaseController: databaseController,);PopoverContainer.of(context).close();diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/application/grid_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/application/grid_bloc.dartindex 9649f4491a..12afc9ca50 100644--- a/frontend/appflowy_flutter/lib/plugins/database/grid/application/grid_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/application/grid_bloc.dart@@ -46,6 +46,14 @@ class GridBloc extends Bloc<GridEvent, GridState> {_startListening();await _openGrid(emit);},+ openRowDetail: (row) {+ emit(+ state.copyWith(+ createdRow: row,+ openRowDetail: true,+ ),+ );+ },createRow: (openRowDetail) async {final result = await RowBackendService.createRow(viewId: viewId);result.fold(@@ -75,9 +83,6 @@ class GridBloc extends Bloc<GridEvent, GridState> {databaseController.moveRow(fromRowId: fromRow, toRowId: toRow);},- didReceiveGridUpdate: (grid) {- emit(state.copyWith(grid: grid));- },didReceiveFieldUpdate: (fields) {emit(state.copyWith(@@ -112,20 +117,22 @@ class GridBloc extends Bloc<GridEvent, GridState> {);}- RowCache getRowCache(RowId rowId) => databaseController.rowCache;+ RowCache get rowCache => databaseController.rowCache;void _startListening() {final onDatabaseChanged = DatabaseCallbacks(- onDatabaseChanged: (database) {- if (!isClosed) {- add(GridEvent.didReceiveGridUpdate(database));- }- },onNumOfRowsChanged: (rowInfos, _, reason) {if (!isClosed) {add(GridEvent.didLoadRows(rowInfos, reason));}},+ onRowsCreated: (rows) {+ for (final row in rows) {+ if (!isClosed && row.isHiddenInView) {+ add(GridEvent.openRowDetail(row.rowMeta));+ }+ }+ },onRowsUpdated: (rows, reason) {// TODO(nathan): separate different reasonsif (!isClosed) {@@ -176,6 +183,7 @@ class GridBloc extends Bloc<GridEvent, GridState> {@freezedclass GridEvent with _$GridEvent {const factory GridEvent.initial() = InitialGrid;+ const factory GridEvent.openRowDetail(RowMetaPB row) = _OpenRowDetail;const factory GridEvent.createRow({bool? openRowDetail}) = _CreateRow;const factory GridEvent.resetCreatedRow() = _ResetCreatedRow;const factory GridEvent.deleteRow(RowInfo rowInfo) = _DeleteRow;@@ -188,10 +196,6 @@ class GridEvent with _$GridEvent {List<FieldInfo> fields,) = _DidReceiveFieldUpdate;- const factory GridEvent.didReceiveGridUpdate(- DatabasePB grid,- ) = _DidReceiveGridUpdate;-const factory GridEvent.didReceveFilters(List<DatabaseFilter> filters) =_DidReceiveFilters;const factory GridEvent.didReceveSorts(List<DatabaseSort> sorts) =@@ -202,7 +206,6 @@ class GridEvent with _$GridEvent {class GridState with _$GridState {const factory GridState({required String viewId,- required DatabasePB? grid,required List<FieldInfo> fields,required List<RowInfo> rowInfos,required int rowCount,@@ -220,7 +223,6 @@ class GridState with _$GridState {rowInfos: [],rowCount: 0,createdRow: null,- grid: null,viewId: viewId,reorderable: true,loadingState: const LoadingState.loading(),diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/grid_page.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/grid_page.dartindex a2ae293187..ae27893e8b 100755--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/grid_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/grid_page.dart@@ -1,9 +1,11 @@+import 'dart:async';import 'dart:math';import 'package:flutter/material.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database/application/row/row_service.dart';+import 'package:appflowy/plugins/database/application/tab_bar_bloc.dart';import 'package:appflowy/plugins/database/domain/sort_service.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/calculations/calculations_row.dart';import 'package:appflowy/plugins/database/grid/presentation/widgets/toolbar/grid_setting_bar.dart';@@ -143,18 +145,7 @@ class _GridPageState extends State<GridPage> {}},child: BlocConsumer<GridBloc, GridState>(- listener: (context, state) => state.loadingState.whenOrNull(- // If initial row id is defined, open row details overlay- finish: (_) {- if (widget.initialRowId != null && !_didOpenInitialRow) {- _didOpenInitialRow = true;-- _openRow(context, widget.initialRowId!);- }-- return;- },- ),+ listener: listener,builder: (context, state) => state.loadingState.map(loading: (_) => const Center(child: CircularProgressIndicator.adaptive(),@@ -185,7 +176,7 @@ class _GridPageState extends State<GridPage> {) {WidgetsBinding.instance.addPostFrameCallback((_) {final gridBloc = context.read<GridBloc>();- final rowCache = gridBloc.getRowCache(rowId);+ final rowCache = gridBloc.rowCache;final rowMeta = rowCache.getRow(rowId)?.rowMeta;if (rowMeta == null) {return;@@ -210,6 +201,48 @@ class _GridPageState extends State<GridPage> {);});}++ void listener(BuildContext context, GridState state) {+ state.loadingState.whenOrNull(+ // If initial row id is defined, open row details overlay+ finish: (_) async {+ if (widget.initialRowId != null && !_didOpenInitialRow) {+ _didOpenInitialRow = true;++ _openRow(context, widget.initialRowId!);+ return;+ }++ final bloc = context.read<DatabaseTabBarBloc>();+ final isCurrentView =+ bloc.state.tabBars[bloc.state.selectedIndex].viewId ==+ widget.view.id;++ if (state.openRowDetail && state.createdRow != null && isCurrentView) {+ final rowController = RowController(+ viewId: widget.view.id,+ rowMeta: state.createdRow!,+ rowCache: context.read<GridBloc>().rowCache,+ );+ unawaited(+ FlowyOverlay.show(+ context: context,+ builder: (_) => BlocProvider.value(+ value: context.read<ViewBloc>(),+ child: RowDetailPage(+ databaseController:+ context.read<GridBloc>().databaseController,+ rowController: rowController,+ userProfile: context.read<GridBloc>().userProfile,+ ),+ ),+ ),+ );+ context.read<GridBloc>().add(const GridEvent.resetCreatedRow());+ }+ },+ );+ }}class GridPageContent extends StatefulWidget {diff --git a/frontend/appflowy_flutter/pubspec.lock b/frontend/appflowy_flutter/pubspec.lockindex 5ef0d4cf02..28779f3182 100644--- a/frontend/appflowy_flutter/pubspec.lock+++ b/frontend/appflowy_flutter/pubspec.lock@@ -1535,10 +1535,10 @@ packages:dependency: transitivedescription:name: platform- sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"+ sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"url: "https://pub.dev"source: hosted- version: "3.1.5"+ version: "3.1.4"plugin_platform_interface:dependency: "direct dev"description:@@ -1933,10 +1933,10 @@ packages:dependency: transitivedescription:name: string_scanner- sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"+ sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"url: "https://pub.dev"source: hosted- version: "1.3.0"+ version: "1.2.0"string_validator:dependency: "direct main"description:@@ -2238,10 +2238,10 @@ packages:dependency: transitivedescription:name: vm_service- sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"+ sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"url: "https://pub.dev"source: hosted- version: "14.2.5"+ version: "14.2.1"watcher:dependency: transitivedescription:diff --git a/frontend/rust-lib/flowy-database2/src/entities/filter_entities/relation_filter.rs b/frontend/rust-lib/flowy-database2/src/entities/filter_entities/relation_filter.rsindex 1a186eb038..7c5d3d358d 100644--- a/frontend/rust-lib/flowy-database2/src/entities/filter_entities/relation_filter.rs+++ b/frontend/rust-lib/flowy-database2/src/entities/filter_entities/relation_filter.rs@@ -16,7 +16,7 @@ impl ParseFilterData for RelationFilterPB {}impl PreFillCellsWithFilter for RelationFilterPB {- fn get_compliant_cell(&self, _field: &Field) -> (Option<Cell>, bool) {- (None, false)+ fn get_compliant_cell(&self, _field: &Field) -> Option<Cell> {+ None}}diff --git a/frontend/rust-lib/flowy-database2/src/entities/row_entities.rs b/frontend/rust-lib/flowy-database2/src/entities/row_entities.rsindex 936d41a64c..192145ed48 100644--- a/frontend/rust-lib/flowy-database2/src/entities/row_entities.rs+++ b/frontend/rust-lib/flowy-database2/src/entities/row_entities.rs@@ -345,6 +345,9 @@ pub struct InsertedRowPB {#[pb(index = 3)]pub is_new: bool,++ #[pb(index = 4)]+ pub is_hidden_in_view: bool,}impl InsertedRowPB {@@ -353,6 +356,7 @@ impl InsertedRowPB {row_meta,index: None,is_new: false,+ is_hidden_in_view: false,}}@@ -368,6 +372,7 @@ impl std::convert::From<RowMetaPB> for InsertedRowPB {row_meta,index: None,is_new: false,+ is_hidden_in_view: false,}}}@@ -378,6 +383,7 @@ impl From<InsertedRow> for InsertedRowPB {row_meta: data.row_detail.into(),index: data.index,is_new: data.is_new,+ is_hidden_in_view: false,}}}diff --git a/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs b/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rsindex 998f57c6e9..d59f65ca3d 100644--- a/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs@@ -215,11 +215,15 @@ impl DatabaseViewEditor {}pub async fn v_did_update_row_meta(&self, row_id: &RowId, row_detail: &RowDetail) {- let update_row = UpdatedRow::new(row_id.as_str()).with_row_meta(row_detail.clone());- let changeset = RowsChangePB::from_update(update_row.into());- send_notification(&self.view_id, DatabaseNotification::DidUpdateRow)- .payload(changeset)- .send();+ let rows = vec![Arc::new(row_detail.row.clone())];+ let mut rows = self.v_filter_rows(rows).await;+ if rows.pop().is_some() {+ let update_row = UpdatedRow::new(row_id.as_str()).with_row_meta(row_detail.clone());+ let changeset = RowsChangePB::from_update(update_row.into());+ send_notification(&self.view_id, DatabaseNotification::DidUpdateRow)+ .payload(changeset)+ .send();+ }}pub async fn v_did_create_row(@@ -227,7 +231,7 @@ impl DatabaseViewEditor {row_detail: &RowDetail,index: u32,is_move_row: bool,- _is_local_change: bool,+ is_local_change: bool,row_changes: &DashMap<String, RowsChangePB>,) {// Send the group notification if the current view has groups@@ -242,23 +246,27 @@ impl DatabaseViewEditor {}}- if let Some(index) = self+ let index = self.sort_controller.write().await.did_create_row(&row_detail.row)- .await- {- row_changes- .entry(self.view_id.clone())- .or_insert_with(|| {- let mut change = RowsChangePB::new();- change.is_move_row = is_move_row;- change- })- .inserted_rows- .push(InsertedRowPB::new(RowMetaPB::from(row_detail)).with_index(index as i32));- };+ .await;++ row_changes+ .entry(self.view_id.clone())+ .or_insert_with(|| {+ let mut change = RowsChangePB::new();+ change.is_move_row = is_move_row;+ change+ })+ .inserted_rows+ .push(InsertedRowPB {+ row_meta: RowMetaPB::from(row_detail),+ index: index.map(|index| index as i32),+ is_new: true,+ is_hidden_in_view: is_local_change && index.is_none(),+ });self.gen_did_create_row_view_tasks(row_detail.row.clone())diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/checkbox_type_option/checkbox_filter.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/checkbox_type_option/checkbox_filter.rsindex dad9793c71..79e18c58aa 100644--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/checkbox_type_option/checkbox_filter.rs+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/checkbox_type_option/checkbox_filter.rs@@ -13,16 +13,13 @@ impl CheckboxFilterPB {}impl PreFillCellsWithFilter for CheckboxFilterPB {- fn get_compliant_cell(&self, field: &Field) -> (Option<Cell>, bool) {+ fn get_compliant_cell(&self, field: &Field) -> Option<Cell> {let is_checked = match self.condition {CheckboxFilterConditionPB::IsChecked => Some(true),CheckboxFilterConditionPB::IsUnChecked => None,};- (- is_checked.map(|is_checked| insert_checkbox_cell(is_checked, field)),- false,- )+ is_checked.map(|is_checked| insert_checkbox_cell(is_checked, field))}}diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/checklist_type_option/checklist_filter.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/checklist_type_option/checklist_filter.rsindex 71372b90c9..2dfbe23759 100644--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/checklist_type_option/checklist_filter.rs+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/checklist_type_option/checklist_filter.rs@@ -43,7 +43,7 @@ impl ChecklistFilterPB {}impl PreFillCellsWithFilter for ChecklistFilterPB {- fn get_compliant_cell(&self, _field: &Field) -> (Option<Cell>, bool) {- (None, true)+ fn get_compliant_cell(&self, _field: &Field) -> Option<Cell> {+ None}}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.rsindex 4632484651..2b3f58b177 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@@ -128,7 +128,7 @@ impl DateFilterStrategy {}impl PreFillCellsWithFilter for DateFilterPB {- fn get_compliant_cell(&self, field: &Field) -> (Option<Cell>, bool) {+ fn get_compliant_cell(&self, field: &Field) -> Option<Cell> {let start_timestamp = match self.condition {DateFilterConditionPB::DateStartsOn| DateFilterConditionPB::DateStartsOnOrBefore@@ -160,18 +160,7 @@ impl PreFillCellsWithFilter for DateFilterPB {_ => None,};- let end_timestamp = if self.condition.is_filter_on_start_timestamp() {- start_timestamp- } else {- None- };-- let cell = start_timestamp- .map(|timestamp| insert_date_cell(timestamp, None, end_timestamp, None, field));-- let open_after_create = matches!(self.condition, DateFilterConditionPB::DateStartIsNotEmpty);-- (cell, open_after_create)+ start_timestamp.map(|timestamp| insert_date_cell(timestamp, None, None, None, field))}}diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/media_type_option/media_filter.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/media_type_option/media_filter.rsindex f5da10f482..f3a02b137c 100644--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/media_type_option/media_filter.rs+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/media_type_option/media_filter.rs@@ -2,7 +2,7 @@ use collab_database::{fields::Field, rows::Cell};use crate::{entities::{MediaFilterConditionPB, MediaFilterPB},- services::{cell::insert_text_cell, filter::PreFillCellsWithFilter},+ services::filter::PreFillCellsWithFilter,};impl MediaFilterPB {@@ -16,16 +16,7 @@ impl MediaFilterPB {}impl PreFillCellsWithFilter for MediaFilterPB {- fn get_compliant_cell(&self, field: &Field) -> (Option<Cell>, bool) {- let text = match self.condition {- MediaFilterConditionPB::MediaIsNotEmpty if !self.content.is_empty() => {- Some(self.content.clone())- },- _ => None,- };-- let open_after_create = matches!(self.condition, MediaFilterConditionPB::MediaIsNotEmpty);-- (text.map(|s| insert_text_cell(s, field)), open_after_create)+ fn get_compliant_cell(&self, _field: &Field) -> Option<Cell> {+ None}}diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_filter.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_filter.rsindex 2c66a9fcfc..01b6f6dd90 100644--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_filter.rs+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_filter.rs@@ -35,7 +35,7 @@ impl NumberFilterPB {}impl PreFillCellsWithFilter for NumberFilterPB {- fn get_compliant_cell(&self, field: &Field) -> (Option<Cell>, bool) {+ fn get_compliant_cell(&self, field: &Field) -> Option<Cell> {let expected_decimal = || Decimal::from_str(&self.content).ok();let text = match self.condition {@@ -61,10 +61,8 @@ impl PreFillCellsWithFilter for NumberFilterPB {_ => None,};- let open_after_create = matches!(self.condition, NumberFilterConditionPB::NumberIsNotEmpty);-// use `insert_text_cell` because self.content might not be a parsable i64.- (text.map(|s| insert_text_cell(s, field)), open_after_create)+ text.map(|s| insert_text_cell(s, field))}}enum NumberFilterStrategy {diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/selection_type_option/select_filter.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/selection_type_option/select_filter.rsindex 63de18c28a..d6ff1d4fda 100644--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/selection_type_option/select_filter.rs+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/selection_type_option/select_filter.rs@@ -97,7 +97,7 @@ impl SelectOptionFilterStrategy {}impl PreFillCellsWithFilter for SelectOptionFilterPB {- fn get_compliant_cell(&self, field: &Field) -> (Option<Cell>, bool) {+ fn get_compliant_cell(&self, field: &Field) -> Option<Cell> {let get_non_empty_expected_options = || {if !self.option_ids.is_empty() {Some(self.option_ids.clone())@@ -124,10 +124,7 @@ impl PreFillCellsWithFilter for SelectOptionFilterPB {_ => None,};- (- option_ids.map(|ids| insert_select_option_cell(ids, field)),- false,- )+ option_ids.map(|ids| insert_select_option_cell(ids, field))}}#[cfg(test)]diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/text_type_option/text_filter.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/text_type_option/text_filter.rsindex a378824929..8ba903f217 100644--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/text_type_option/text_filter.rs+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/text_type_option/text_filter.rs@@ -33,7 +33,7 @@ impl TextFilterPB {}impl PreFillCellsWithFilter for TextFilterPB {- fn get_compliant_cell(&self, field: &Field) -> (Option<Cell>, bool) {+ fn get_compliant_cell(&self, field: &Field) -> Option<Cell> {let text = match self.condition {TextFilterConditionPB::TextIs| TextFilterConditionPB::TextContains@@ -46,9 +46,7 @@ impl PreFillCellsWithFilter for TextFilterPB {_ => None,};- let open_after_create = matches!(self.condition, TextFilterConditionPB::TextIsNotEmpty);-- (text.map(|s| insert_text_cell(s, field)), open_after_create)+ text.map(|s| insert_text_cell(s, field))}}diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/time_type_option/time_filter.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/time_type_option/time_filter.rsindex 0620317dc0..13455a4ad0 100644--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/time_type_option/time_filter.rs+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/time_type_option/time_filter.rs@@ -38,7 +38,7 @@ impl TimeFilterPB {}impl PreFillCellsWithFilter for TimeFilterPB {- fn get_compliant_cell(&self, field: &Field) -> (Option<Cell>, bool) {+ fn get_compliant_cell(&self, field: &Field) -> Option<Cell> {let expected_decimal = || self.content.parse::<i64>().ok();let text = match self.condition {@@ -64,9 +64,7 @@ impl PreFillCellsWithFilter for TimeFilterPB {_ => None,};- let open_after_create = matches!(self.condition, NumberFilterConditionPB::NumberIsNotEmpty);-// use `insert_text_cell` because self.content might not be a parsable i64.- (text.map(|s| insert_text_cell(s, field)), open_after_create)+ text.map(|s| insert_text_cell(s, field))}}diff --git a/frontend/rust-lib/flowy-database2/src/services/filter/controller.rs b/frontend/rust-lib/flowy-database2/src/services/filter/controller.rsindex 27d7733b93..edb9783154 100644--- a/frontend/rust-lib/flowy-database2/src/services/filter/controller.rs+++ b/frontend/rust-lib/flowy-database2/src/services/filter/controller.rs@@ -34,7 +34,7 @@ pub trait FilterDelegate: Send + Sync + 'static {}pub trait PreFillCellsWithFilter {- fn get_compliant_cell(&self, field: &Field) -> (Option<Cell>, bool);+ fn get_compliant_cell(&self, field: &Field) -> Option<Cell>;}pub struct FilterController {@@ -222,11 +222,9 @@ impl FilterController {FilterChangesetNotificationPB::from_filters(&self.view_id, &filters)}- pub async fn fill_cells(&self, cells: &mut Cells) -> bool {+ pub async fn fill_cells(&self, cells: &mut Cells) {let filters = self.filters.read().await;- let mut open_after_create = false;-let mut min_required_filters: Vec<&FilterInner> = vec![];for filter in filters.iter() {filter.get_min_effective_filters(&mut min_required_filters);@@ -247,12 +245,11 @@ impl FilterController {min_required_filters.retain(|inner| matches!(inner, FilterInner::Data { field_id: other_id, .. } if other_id != field_id),);- open_after_create = true;continue;}if let Some(field) = field_map.get(field_id) {- let (cell, flag) = match field_type {+ let cell = match field_type {FieldType::RichText | FieldType::URL => {let filter = condition_and_content.cloned::<TextFilterPB>().unwrap();filter.get_compliant_cell(field)@@ -289,21 +286,15 @@ impl FilterController {let filter = condition_and_content.cloned::<TimeFilterPB>().unwrap();filter.get_compliant_cell(field)},- _ => (None, false),+ _ => None,};if let Some(cell) = cell {cells.insert(field_id.clone(), cell);}-- if flag {- open_after_create = flag;- }}}}-- open_after_create}#[tracing::instrument(diff --git a/frontend/rust-lib/flowy-database2/src/services/group/controller.rs b/frontend/rust-lib/flowy-database2/src/services/group/controller.rsindex 0b02bb1350..5d832e3da1 100644--- a/frontend/rust-lib/flowy-database2/src/services/group/controller.rs+++ b/frontend/rust-lib/flowy-database2/src/services/group/controller.rs@@ -247,6 +247,7 @@ whererow_meta: row.into(),index: Some(index as i32),is_new: true,+ is_hidden_in_view: false,}],);changesets.push(changeset);@@ -266,6 +267,7 @@ whererow_meta: row.into(),index: Some(index as i32),is_new: true,+ is_hidden_in_view: false,}],);changesets.push(changeset);diff --git a/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/default_controller.rs b/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/default_controller.rsindex 8895654199..3169198c08 100644--- a/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/default_controller.rs+++ b/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/default_controller.rs@@ -80,6 +80,7 @@ impl GroupController for DefaultGroupController {row_meta: row.into(),index: Some(index as i32),is_new: true,+ is_hidden_in_view: false,}],)]}