feat: disable moving page into the database (#3107)

LucasXu0 · web-flow · commit fb9bc359b8d9 · 2023-08-03T15:06:02.000+08:00
diff --git a/frontend/appflowy_flutter/integration_test/sidebar/sidebar_test.dart b/frontend/appflowy_flutter/integration_test/sidebar/sidebar_test.dart
@@ -2,7 +2,9 @@ import 'package:appflowy/plugins/database_view/board/presentation/board_page.dar
 import 'package:appflowy/plugins/database_view/calendar/presentation/calendar_page.dart';
 import 'package:appflowy/plugins/database_view/grid/presentation/grid_page.dart';
 import 'package:appflowy/workspace/presentation/home/menu/view/draggable_view_item.dart';
+import 'package:appflowy/workspace/presentation/home/menu/view/view_add_button.dart';
 import 'package:appflowy/workspace/presentation/home/menu/view/view_item.dart';
+import 'package:appflowy/workspace/presentation/home/menu/view/view_more_action_button.dart';
 import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';
 import 'package:appflowy_editor/appflowy_editor.dart';
 import 'package:flutter/material.dart';
@@ -138,5 +140,70 @@ void main() {
             .id,
       );
     });
+
+    testWidgets('unable to move a document into a database', (tester) async {
+      await tester.initializeAppFlowy();
+      await tester.tapGoButton();
+
+      const document = 'document';
+      await tester.createNewPageWithName(
+        name: document,
+        openAfterCreated: false,
+      );
+      tester.expectToSeePageName(document, layout: ViewLayoutPB.Document);
+
+      const grid = 'grid';
+      await tester.createNewPageWithName(
+        name: grid,
+        layout: ViewLayoutPB.Grid,
+        openAfterCreated: false,
+      );
+      tester.expectToSeePageName(grid, layout: ViewLayoutPB.Grid);
+
+      // move the document to the grid page
+      await tester.movePageToOtherPage(
+        name: document,
+        parentName: grid,
+        layout: ViewLayoutPB.Document,
+        parentLayout: ViewLayoutPB.Grid,
+      );
+
+      // it should not be moved
+      final childViews = tester
+          .widget<SingleInnerViewItem>(tester.findPageName(gettingStated))
+          .view
+          .childViews;
+      expect(
+        childViews[0].name,
+        document,
+      );
+      expect(
+        childViews[1].name,
+        grid,
+      );
+    });
+
+    testWidgets('unable to create a new database inside the existing one',
+        (tester) async {
+      await tester.initializeAppFlowy();
+      await tester.tapGoButton();
+
+      const grid = 'grid';
+      await tester.createNewPageWithName(
+        name: grid,
+        layout: ViewLayoutPB.Grid,
+        openAfterCreated: true,
+      );
+      tester.expectToSeePageName(grid, layout: ViewLayoutPB.Grid);
+
+      await tester.hoverOnPageName(
+        grid,
+        layout: ViewLayoutPB.Grid,
+        onHover: () async {
+          expect(find.byType(ViewAddButton), findsNothing);
+          expect(find.byType(ViewMoreActionButton), findsOneWidget);
+        },
+      );
+    });
   });
 }
diff --git a/frontend/appflowy_flutter/integration_test/util/common_operations.dart b/frontend/appflowy_flutter/integration_test/util/common_operations.dart
@@ -351,7 +351,7 @@ extension CommonOperations on WidgetTester {
     await hoverOnPageName(
       name,
       layout: layout,
-      useLast: false,
+      useLast: true,
       onHover: () async {
         await tapFavoritePageButton();
         await pumpAndSettle();
@@ -366,7 +366,7 @@ extension CommonOperations on WidgetTester {
     await hoverOnPageName(
       name,
       layout: layout,
-      useLast: false,
+      useLast: true,
       onHover: () async {
         await tapUnfavoritePageButton();
         await pumpAndSettle();
@@ -397,7 +397,7 @@ extension CommonOperations on WidgetTester {
         break;
       default:
     }
-    await gesture.moveTo(offset);
+    await gesture.moveTo(offset, timeStamp: const Duration(milliseconds: 400));
     await gesture.up();
     await pumpAndSettle();
   }
diff --git a/frontend/appflowy_flutter/lib/workspace/application/menu/menu_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/menu/menu_bloc.dart
@@ -42,7 +42,7 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> {
           final result = await _workspaceService.createApp(
             name: event.name,
             desc: event.desc,
-            index: 0, // default to the first index
+            index: event.index,
           );
           result.fold(
             (app) => emit(state.copyWith(plugin: app.plugin())),
@@ -111,7 +111,8 @@ class MenuBloc extends Bloc<MenuEvent, MenuState> {
 class MenuEvent with _$MenuEvent {
   const factory MenuEvent.initial() = _Initial;
   const factory MenuEvent.openPage(Plugin plugin) = _OpenPage;
-  const factory MenuEvent.createApp(String name, {String? desc}) = _CreateApp;
+  const factory MenuEvent.createApp(String name, {String? desc, int? index}) =
+      _CreateApp;
   const factory MenuEvent.moveApp(int fromIndex, int toIndex) = _MoveApp;
   const factory MenuEvent.didReceiveApps(
     Either<List<ViewPB>, FlowyError> appsOrFail,
diff --git a/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart b/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart
@@ -125,4 +125,17 @@ extension ViewLayoutExtension on ViewLayoutPB {
         throw Exception('Unknown layout type');
     }
   }
+
+  bool get isDatabaseView {
+    switch (this) {
+      case ViewLayoutPB.Grid:
+      case ViewLayoutPB.Board:
+      case ViewLayoutPB.Calendar:
+        return true;
+      case ViewLayoutPB.Document:
+        return false;
+      default:
+        throw Exception('Unknown layout type');
+    }
+  }
 }
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/folder/personal_folder.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/folder/personal_folder.dart
@@ -49,6 +49,7 @@ class PersonalFolder extends StatelessWidget {
                     isFirstChild: view.id == views.first.id,
                     view: view,
                     level: 0,
+                    leftPadding: 16,
                     onSelected: (view) {
                       getIt<TabsBloc>().add(
                         TabsEvent.openPlugin(
@@ -114,6 +115,7 @@ class _PersonalFolderHeaderState extends State<PersonalFolderHeader> {
                 context.read<MenuBloc>().add(
                       MenuEvent.createApp(
                         LocaleKeys.menuAppHeader_defaultNewPageName.tr(),
+                        index: 0,
                       ),
                     );
                 widget.onAdded();
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_new_page_button.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_new_page_button.dart
@@ -48,7 +48,12 @@ class SidebarNewPageButton extends StatelessWidget {
       value: '',
       confirm: (value) {
         if (value.isNotEmpty) {
-          context.read<MenuBloc>().add(MenuEvent.createApp(value, desc: ''));
+          context.read<MenuBloc>().add(
+                MenuEvent.createApp(
+                  value,
+                  desc: '',
+                ),
+              );
         }
       },
     ).show(context);
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/draggable_view_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/draggable_view_item.dart
@@ -1,4 +1,5 @@
 import 'package:appflowy/workspace/application/view/view_bloc.dart';
+import 'package:appflowy/workspace/application/view/view_ext.dart';
 import 'package:appflowy/workspace/presentation/widgets/draggable_item/draggable_item.dart';
 import 'package:appflowy_backend/log.dart';
 import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';
@@ -70,16 +71,17 @@ class _DraggableViewItemState extends State<DraggableViewItem> {
       data: widget.view,
       onWillAccept: (data) => true,
       onMove: (data) {
-        if (!_shouldAccept(data.data)) {
-          return;
-        }
         final renderBox = context.findRenderObject() as RenderBox;
         final offset = renderBox.globalToLocal(data.offset);
+        final position = _computeHoverPosition(offset, renderBox.size);
+        if (!_shouldAccept(data.data, position)) {
+          return;
+        }
         setState(() {
-          position = _computeHoverPosition(offset, renderBox.size);
           Log.debug(
             'offset: $offset, position: $position, size: ${renderBox.size}',
           );
+          this.position = position;
         });
       },
       onLeave: (_) => setState(
@@ -102,6 +104,12 @@ class _DraggableViewItemState extends State<DraggableViewItem> {
   }
 
   void _move(ViewPB from, ViewPB to) {
+    if (position == DraggableHoverPosition.center &&
+        to.layout != ViewLayoutPB.Document) {
+      // not support moving into a database
+      return;
+    }
+
     switch (position) {
       case DraggableHoverPosition.top:
         context.read<ViewBloc>().add(
@@ -136,7 +144,7 @@ class _DraggableViewItemState extends State<DraggableViewItem> {
   }
 
   DraggableHoverPosition _computeHoverPosition(Offset offset, Size size) {
-    final threshold = size.height / 4.0;
+    final threshold = size.height / 3.0;
     if (widget.isFirstChild && offset.dy < -5.0) {
       return DraggableHoverPosition.top;
     }
@@ -146,7 +154,13 @@ class _DraggableViewItemState extends State<DraggableViewItem> {
     return DraggableHoverPosition.center;
   }
 
-  bool _shouldAccept(ViewPB data) {
+  bool _shouldAccept(ViewPB data, DraggableHoverPosition position) {
+    // could not move the view to a database
+    if (widget.view.layout.isDatabaseView &&
+        position == DraggableHoverPosition.center) {
+      return false;
+    }
+
     // ignore moving the view to itself
     if (data.id == widget.view.id) {
       return false;
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart
diff --git a/frontend/appflowy_flutter/test/bloc_test/home_test/menu_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/home_test/menu_bloc_test.dart

Original file line number	Diff line number	Diff line change
`@@ -125,4 +125,17 @@ extension ViewLayoutExtension on ViewLayoutPB {`
`125`	`125`	`throw Exception('Unknown layout type');`
`126`	`126`	`}`
`127`	`127`	`}`
	`128`	`+`
	`129`	`+ bool get isDatabaseView {`
	`130`	`+ switch (this) {`
	`131`	`+ case ViewLayoutPB.Grid:`
	`132`	`+ case ViewLayoutPB.Board:`
	`133`	`+ case ViewLayoutPB.Calendar:`
	`134`	`+ return true;`
	`135`	`+ case ViewLayoutPB.Document:`
	`136`	`+ return false;`
	`137`	`+ default:`
	`138`	`+ throw Exception('Unknown layout type');`
	`139`	`+ }`
	`140`	`+ }`
`128`	`141`	`}`