Fix/grid group (#1787)

* ci: config rust log

* chore: rename flowy-sdk to appflowy-core

* fix: create group after editing the url

* fix: start listen on new group

* chore: add tests

* refactor: mock data

* ci: update command

Author: appflowy

.github/workflows/rust_ci.yaml

@@ -59,7 +59,7 @@ jobs:
       - name: Build FlowySDK
         working-directory: frontend
         run: |
-          cargo make --profile development-linux-x86_64 appflowy-sdk-dev
+          cargo make --profile development-linux-x86_64 appflowy-core-dev
 
       - name: rustfmt rust-lib
         run: cargo fmt --all -- --check

frontend/.vscode/launch.json

@@ -23,7 +23,7 @@
             "type": "dart",
             "preLaunchTask": "AF: build_flowy_sdk",
             "env": {
-                "RUST_LOG": "info"
+                "RUST_LOG": "debug"
             },
             "cwd": "${workspaceRoot}/app_flowy"
         },

frontend/.vscode/tasks.json

@@ -48,7 +48,7 @@
 		{
 			"label": "AF: build_flowy_sdk_for_android",
 			"type": "shell",
-			"command": "cargo make --profile development-android appflowy-sdk-dev-android",
+			"command": "cargo make --profile development-android appflowy-core-dev-android",
 			"group": "build",
 			"options": {
 				"cwd": "${workspaceFolder}"

frontend/Makefile.toml

@@ -18,7 +18,7 @@ on_error_task = "catch"
 run_task = { name = ["restore-crate-type"] }
 
 [env]
-RUST_LOG = "info"
+RUST_LOG = "debug"
 CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
 CARGO_MAKE_CRATE_FS_NAME = "dart_ffi"
 CARGO_MAKE_CRATE_NAME = "dart-ffi"

frontend/app_flowy/lib/plugins/board/application/board_bloc.dart

@@ -186,43 +186,20 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
     return super.close();
   }
 
-  void initializeGroups(List<GroupPB> groupsData) {
+  void initializeGroups(List<GroupPB> groups) {
     for (var controller in groupControllers.values) {
       controller.dispose();
     }
     groupControllers.clear();
     boardController.clear();
 
-    //
-    List<AppFlowyGroupData> groups = groupsData
+    boardController.addGroups(groups
         .where((group) => fieldController.getField(group.fieldId) != null)
-        .map((group) {
-      return AppFlowyGroupData(
-        id: group.groupId,
-        name: group.desc,
-        items: _buildGroupItems(group),
-        customData: GroupData(
-          group: group,
-          fieldInfo: fieldController.getField(group.fieldId)!,
-        ),
-      );
-    }).toList();
-    boardController.addGroups(groups);
-
-    for (final group in groupsData) {
-      final delegate = GroupControllerDelegateImpl(
-        controller: boardController,
-        fieldController: fieldController,
-        onNewColumnItem: (groupId, row, index) {
-          add(BoardEvent.didCreateRow(group, row, index));
-        },
-      );
-      final controller = GroupController(
-        databaseId: state.databaseId,
-        group: group,
-        delegate: delegate,
-      );
-      controller.startListening();
+        .map((group) => initializeGroupData(group))
+        .toList());
+
+    for (final group in groups) {
+      final controller = initializeGroupController(group);
       groupControllers[controller.group.groupId] = (controller);
     }
   }
@@ -245,11 +222,15 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
       },
       onDeletedGroup: (groupIds) {
         if (isClosed) return;
-        //
+        boardController.removeGroups(groupIds);
       },
-      onInsertedGroup: (insertedGroups) {
+      onInsertedGroup: (insertedGroup) {
         if (isClosed) return;
-        //
+        final group = insertedGroup.group;
+        final newGroup = initializeGroupData(group);
+        final controller = initializeGroupController(group);
+        groupControllers[controller.group.groupId] = (controller);
+        boardController.addGroup(newGroup);
       },
       onUpdatedGroup: (updatedGroups) {
         if (isClosed) return;
@@ -294,6 +275,35 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
       ),
     );
   }
+
+  GroupController initializeGroupController(GroupPB group) {
+    final delegate = GroupControllerDelegateImpl(
+      controller: boardController,
+      fieldController: fieldController,
+      onNewColumnItem: (groupId, row, index) {
+        add(BoardEvent.didCreateRow(group, row, index));
+      },
+    );
+    final controller = GroupController(
+      databaseId: state.databaseId,
+      group: group,
+      delegate: delegate,
+    );
+    controller.startListening();
+    return controller;
+  }
+
+  AppFlowyGroupData initializeGroupData(GroupPB group) {
+    return AppFlowyGroupData(
+      id: group.groupId,
+      name: group.desc,
+      items: _buildGroupItems(group),
+      customData: GroupData(
+        group: group,
+        fieldInfo: fieldController.getField(group.fieldId)!,
+      ),
+    );
+  }
 }
 
 @freezed

frontend/app_flowy/lib/plugins/board/application/board_data_controller.dart

@@ -17,7 +17,7 @@ typedef OnGridChanged = void Function(DatabasePB);
 typedef DidLoadGroups = void Function(List<GroupPB>);
 typedef OnUpdatedGroup = void Function(List<GroupPB>);
 typedef OnDeletedGroup = void Function(List<String>);
-typedef OnInsertedGroup = void Function(List<InsertedGroupPB>);
+typedef OnInsertedGroup = void Function(InsertedGroupPB);
 typedef OnResetGroups = void Function(List<GroupPB>);
 
 typedef OnRowsChanged = void Function(
@@ -90,8 +90,8 @@ class BoardDataController {
               onDeletedGroup.call(changeset.deletedGroups);
             }
 
-            if (changeset.insertedGroups.isNotEmpty) {
-              onInsertedGroup.call(changeset.insertedGroups);
+            for (final insertedGroup in changeset.insertedGroups) {
+              onInsertedGroup.call(insertedGroup);
             }
           },
           (e) => _onError?.call(e),

frontend/app_flowy/lib/plugins/board/application/board_listener.dart

@@ -46,7 +46,7 @@ class BoardListener {
       case DatabaseNotification.DidGroupByNewField:
         result.fold(
           (payload) => _groupByNewFieldNotifier?.value =
-              left(GroupViewChangesetPB.fromBuffer(payload).newGroups),
+              left(GroupViewChangesetPB.fromBuffer(payload).initialGroups),
           (error) => _groupByNewFieldNotifier?.value = right(error),
         );
         break;

frontend/app_flowy/lib/plugins/grid/application/cell/cell_service/cell_controller.dart

@@ -270,7 +270,7 @@ class GridCellController<T, D> extends Equatable {
   /// You can set [deduplicate] to true (default is false) to reduce the save operation.
   /// It's useful when you call this method when user editing the [TextField].
   /// The default debounce interval is 300 milliseconds.
-  void saveCellData(
+  Future<void> saveCellData(
     D data, {
     bool deduplicate = false,
     void Function(Option<FlowyError>)? onFinish,

frontend/app_flowy/lib/plugins/grid/application/cell/url_cell_editor_bloc.dart

@@ -14,13 +14,16 @@ class URLCellEditorBloc extends Bloc<URLCellEditorEvent, URLCellEditorState> {
   }) : super(URLCellEditorState.initial(cellController)) {
     on<URLCellEditorEvent>(
       (event, emit) async {
-        event.when(
+        await event.when(
           initial: () {
             _startListening();
           },
-          updateText: (text) {
-            cellController.saveCellData(text, deduplicate: true);
-            emit(state.copyWith(content: text));
+          updateText: (text) async {
+            await cellController.saveCellData(text);
+            emit(state.copyWith(
+              content: text,
+              isFinishEditing: true,
+            ));
           },
           didReceiveCellUpdate: (cellData) {
             emit(state.copyWith(content: cellData?.content ?? ""));
@@ -63,12 +66,14 @@ class URLCellEditorEvent with _$URLCellEditorEvent {
 class URLCellEditorState with _$URLCellEditorState {
   const factory URLCellEditorState({
     required String content,
+    required bool isFinishEditing,
   }) = _URLCellEditorState;
 
   factory URLCellEditorState.initial(GridURLCellController context) {
     final cellData = context.getCellData();
     return URLCellEditorState(
       content: cellData?.content ?? "",
+      isFinishEditing: true,
     );
   }
 }

frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/url_cell/cell_editor.dart

@@ -6,9 +6,13 @@ import 'dart:async';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 class URLCellEditor extends StatefulWidget {
+  final VoidCallback onExit;
   final GridURLCellController cellController;
-  const URLCellEditor({required this.cellController, Key? key})
-      : super(key: key);
+  const URLCellEditor({
+    required this.cellController,
+    required this.onExit,
+    Key? key,
+  }) : super(key: key);
 
   @override
   State<URLCellEditor> createState() => _URLCellEditorState();
@@ -36,12 +40,17 @@ class _URLCellEditorState extends State<URLCellEditor> {
           if (_controller.text != state.content) {
             _controller.text = state.content;
           }
+
+          if (state.isFinishEditing) {
+            widget.onExit();
+          }
         },
         child: TextField(
           autofocus: true,
           controller: _controller,
-          onChanged: (value) => focusChanged(),
-          maxLines: null,
+          onSubmitted: (value) => focusChanged(),
+          onEditingComplete: () => focusChanged(),
+          maxLines: 1,
           style: Theme.of(context).textTheme.bodyMedium,
           decoration: const InputDecoration(
             contentPadding: EdgeInsets.zero,
@@ -57,11 +66,10 @@ class _URLCellEditorState extends State<URLCellEditor> {
   @override
   Future<void> dispose() async {
     _cellBloc.close();
-
     super.dispose();
   }
 
-  Future<void> focusChanged() async {
+  void focusChanged() {
     if (mounted) {
       if (_cellBloc.isClosed == false &&
           _controller.text != _cellBloc.state.content) {
@@ -72,9 +80,13 @@ class _URLCellEditorState extends State<URLCellEditor> {
 }
 
 class URLEditorPopover extends StatelessWidget {
+  final VoidCallback onExit;
   final GridURLCellController cellController;
-  const URLEditorPopover({required this.cellController, Key? key})
-      : super(key: key);
+  const URLEditorPopover({
+    required this.cellController,
+    required this.onExit,
+    Key? key,
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -84,6 +96,7 @@ class URLEditorPopover extends StatelessWidget {
         padding: const EdgeInsets.all(6),
         child: URLCellEditor(
           cellController: cellController,
+          onExit: onExit,
         ),
       ),
     );