Merge branch 'main' into enable_ci_on_windows_linux_2

Author: LucasXu0

frontend/Makefile.toml

@@ -26,7 +26,7 @@ CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
 CARGO_MAKE_CRATE_FS_NAME = "dart_ffi"
 CARGO_MAKE_CRATE_NAME = "dart-ffi"
 LIB_NAME = "dart_ffi"
-APPFLOWY_VERSION = "0.8.8"
+APPFLOWY_VERSION = "0.8.9"
 FLUTTER_DESKTOP_FEATURES = "dart"
 PRODUCT_NAME = "AppFlowy"
 MACOSX_DEPLOYMENT_TARGET = "11.0"

frontend/appflowy_flutter/analysis_options.yaml

@@ -4,6 +4,7 @@ analyzer:
   exclude:
     - "**/*.g.dart"
     - "**/*.freezed.dart"
+    - "packages/**/*.dart"
 
 linter:
   rules:

frontend/appflowy_flutter/assets/translations/mr-IN.json

@@ -15,7 +15,6 @@ void main() {
         cloudType: AuthenticatorType.appflowyCloudSelfHost,
       );
 
-      await tester.tapContinousAnotherWay();
       await tester.tapAnonymousSignInButton();
       await tester.expectToSeeHomePageWithGetStartedPage();
 

frontend/appflowy_flutter/integration_test/desktop/cloud/data_migration/anon_user_data_migration_test.dart

@@ -15,6 +15,7 @@ void main() {
       await tester.initializeAppFlowy();
       await tester.tapAnonymousSignInButton();
 
+      // create a database and add a linked database view
       await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Grid);
       await tester.tapCreateLinkedDatabaseViewButton(DatabaseLayoutPB.Grid);
 
@@ -29,6 +30,11 @@ void main() {
       await tester.tapHidePropertyButton();
       tester.noFieldWithName('New field 1');
 
+      // create another field, New field 1 to be hidden still
+      await tester.tapNewPropertyButton();
+      await tester.dismissFieldEditor();
+      tester.noFieldWithName('New field 1');
+
       // go back to inline database view, expect field to be shown
       await tester.tapTabBarLinkedViewByViewName('Untitled');
       tester.findFieldWithName('New field 1');
@@ -60,5 +66,40 @@ void main() {
       await tester.tapDatabaseSortButton();
       await tester.tapCreateSortByFieldType(FieldType.RichText, "New field 1");
     });
+
+    testWidgets('field cell width', (tester) async {
+      await tester.initializeAppFlowy();
+      await tester.tapAnonymousSignInButton();
+
+      // create a database and add a linked database view
+      await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Grid);
+      await tester.tapCreateLinkedDatabaseViewButton(DatabaseLayoutPB.Grid);
+
+      // create a field
+      await tester.scrollToRight(find.byType(GridPage));
+      await tester.tapNewPropertyButton();
+      await tester.renameField('New field 1');
+      await tester.dismissFieldEditor();
+
+      // check the width of the field
+      expect(tester.getFieldWidth('New field 1'), 150);
+
+      // change the width of the field
+      await tester.changeFieldWidth('New field 1', 200);
+      expect(tester.getFieldWidth('New field 1'), 205);
+
+      // create another field, New field 1 to be same width
+      await tester.tapNewPropertyButton();
+      await tester.dismissFieldEditor();
+      expect(tester.getFieldWidth('New field 1'), 205);
+
+      // go back to inline database view, expect New field 1 to be 150px
+      await tester.tapTabBarLinkedViewByViewName('Untitled');
+      expect(tester.getFieldWidth('New field 1'), 150);
+
+      // go back to linked database view, expect New field 1 to be 205px
+      await tester.tapTabBarLinkedViewByViewName('Grid');
+      expect(tester.getFieldWidth('New field 1'), 205);
+    });
   });
 }

frontend/appflowy_flutter/integration_test/desktop/database/database_field_settings_test.dart

@@ -1,10 +1,12 @@
+import 'dart:async';
 import 'dart:io';
 
 import 'package:appflowy/generated/locale_keys.g.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/block_menu/block_menu_button.dart';
 import 'package:appflowy/plugins/document/presentation/editor_plugins/copy_and_paste/clipboard_service.dart';
 import 'package:appflowy/plugins/document/presentation/editor_plugins/image/custom_image_block_component/custom_image_block_component.dart';
 import 'package:appflowy/plugins/document/presentation/editor_plugins/link_preview/custom_link_preview.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/link_preview/link_preview_menu.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/link_preview/paste_as/paste_as_menu.dart';
 import 'package:appflowy/startup/startup.dart';
 import 'package:appflowy_editor/appflowy_editor.dart';
 import 'package:appflowy_editor_plugins/appflowy_editor_plugins.dart';
@@ -320,8 +322,14 @@ void main() {
       (tester) async {
         const url = 'https://appflowy.io';
         await tester.pasteContent(plainText: url, (editorState) async {
+          final pasteAsMenu = find.byType(PasteAsMenu);
+          expect(pasteAsMenu, findsOneWidget);
+          final bookmarkButton = find.text(
+            LocaleKeys.document_plugins_linkPreview_typeSelection_bookmark.tr(),
+          );
+          await tester.tapButton(bookmarkButton);
           // the second one is the paragraph node
-          expect(editorState.document.root.children.length, 2);
+          expect(editorState.document.root.children.length, 1);
           final node = editorState.getNodeAtPath([0])!;
           expect(node.type, LinkPreviewBlockKeys.type);
           expect(node.attributes[LinkPreviewBlockKeys.url], url);
@@ -333,19 +341,19 @@ void main() {
         await tester.hoverOnWidget(
           find.byType(CustomLinkPreviewWidget),
           onHover: () async {
-            final convertToLinkButton = find.byWidgetPredicate((widget) {
-              return widget is MenuBlockButton &&
-                  widget.tooltip ==
-                      LocaleKeys.document_plugins_urlPreview_convertToLink.tr();
-            });
+            /// show menu
+            final menu = find.byType(CustomLinkPreviewMenu);
+            expect(menu, findsOneWidget);
+            await tester.tapButton(menu);
+
+            final convertToLinkButton = find.text(
+                LocaleKeys.document_plugins_linkPreview_linkPreviewMenu_toUrl.tr(),
+              );
             expect(convertToLinkButton, findsOneWidget);
-            await tester.tap(convertToLinkButton);
-            await tester.pumpAndSettle();
+            await tester.tapButton(convertToLinkButton);
           },
         );
 
-        await tester.pumpAndSettle();
-
         final editorState = tester.editor.getCurrentEditorState();
         final textNode = editorState.getNodeAtPath([0])!;
         expect(textNode.type, ParagraphBlockKeys.type);
@@ -363,14 +371,20 @@ void main() {
       (tester) async {
         const url = 'https://appflowy.io';
         await tester.pasteContent(plainText: url, (editorState) async {
+          final pasteAsMenu = find.byType(PasteAsMenu);
+          expect(pasteAsMenu, findsOneWidget);
+          final bookmarkButton = find.text(
+            LocaleKeys.document_plugins_linkPreview_typeSelection_bookmark.tr(),
+          );
+          await tester.tapButton(bookmarkButton);
           // the second one is the paragraph node
-          expect(editorState.document.root.children.length, 2);
+          expect(editorState.document.root.children.length, 1);
           final node = editorState.getNodeAtPath([0])!;
           expect(node.type, LinkPreviewBlockKeys.type);
           expect(node.attributes[LinkPreviewBlockKeys.url], url);
         });
 
-        await tester.editor.tapLineOfEditorAt(0);
+      
         await tester.simulateKeyEvent(
           LogicalKeyboardKey.keyZ,
           isControlPressed:
@@ -521,7 +535,7 @@ void main() {
 
 extension on WidgetTester {
   Future<void> pasteContent(
-    void Function(EditorState editorState) test, {
+    FutureOr<void> Function(EditorState editorState) test, {
     Future<void> Function(EditorState editorState)? beforeTest,
     String? plainText,
     String? html,
@@ -558,6 +572,6 @@ extension on WidgetTester {
     );
     await pumpAndSettle(const Duration(milliseconds: 1000));
 
-    test(editor.getCurrentEditorState());
+    await test(editor.getCurrentEditorState());
   }
 }