Merge branch 'main' into fix_team_workspace_issues

AppFlowy-IO · Apr 7, 2024 · c79b5fe · c79b5fe
2 parents bde35a0 + 81594fa
commit c79b5fe
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 318 deletions.
diff --git a/frontend/appflowy_flutter/integration_test/shared/base.dart b/frontend/appflowy_flutter/integration_test/shared/base.dart
@@ -180,7 +180,11 @@ extension AppFlowyTestBase on WidgetTester {
       buttons: buttons,
       warnIfMissed: warnIfMissed,
     );
-    await pumpAndSettle(Duration(milliseconds: milliseconds));
+    await pumpAndSettle(
+      Duration(milliseconds: milliseconds),
+      EnginePhase.sendSemanticsUpdate,
+      const Duration(seconds: 5),
+    );
   }
 
   Future<void> tapButtonWithName(

diff --git a/frontend/appflowy_flutter/integration_test/shared/common_operations.dart b/frontend/appflowy_flutter/integration_test/shared/common_operations.dart
@@ -528,7 +528,7 @@ extension CommonOperations on WidgetTester {
     final workspace = find.byType(SidebarWorkspace);
     expect(workspace, findsOneWidget);
     // click it
-    await tapButton(workspace);
+    await tapButton(workspace, milliseconds: 2000);
   }
 
   Future<void> closeCollaborativeWorkspaceMenu() async {

diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lock
diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.toml
@@ -87,7 +87,7 @@ yrs = { git = "https://github.com/appflowy/y-crdt", rev = "3f25bb510ca5274e7657d
 # Run the script:
 # scripts/tool/update_client_api_rev.sh  new_rev_id
 # ⚠️⚠️⚠️️
-client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" }
+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "b1a6338527e7a4836f77eae3ba00f9b09de223a3" }
 # Please use the following script to update collab.
 # Working directory: frontend
 #

diff --git a/frontend/appflowy_web/wasm-libs/Cargo.toml b/frontend/appflowy_web/wasm-libs/Cargo.toml
@@ -55,7 +55,7 @@ codegen-units = 1
 # Run the script:
 # scripts/tool/update_client_api_rev.sh  new_rev_id
 # ⚠️⚠️⚠️️
-client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" }
+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "b1a6338527e7a4836f77eae3ba00f9b09de223a3" }
 # Please use the following script to update collab.
 # Working directory: frontend
 #