[PR #4961] [MERGED] fix: collab workspace issues #6553

Closed
opened 2026-03-23 22:23:44 +00:00 by mirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/4961
Author: @LucasXu0
Created: 3/22/2024
Status: Merged
Merged: 3/22/2024
Merged by: @LucasXu0

Base: mainHead: workspace_improvement


📝 Commits (10+)

  • 1f6747d chore: enable feature flags in settings
  • 0e29344 feat: improve workspace/member limit exceeded error message
  • e644eeb chore: enable feature flags
  • 9530960 fix: unable to delete trash
  • 8eeaa1a fix: exclude invalid view IDs when retrieving public or private views
  • 3da1811 Revert "chore: enable feature flags in settings"
  • 60f3e6e Revert "chore: enable feature flags"
  • 5abd00a feat: improve user workspace bloc logic
  • 4a79dd9 feat: improve member bloc logic
  • d33b901 fix: create view under private section by default if collab workspace is on

📊 Changes

37 files changed (+649 additions, -481 deletions)

View changed files

📝 frontend/appflowy_flutter/integration_test/shared/workspace.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_folders.dart (+2 -3)
📝 frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_page_header.dart (+1 -3)
📝 frontend/appflowy_flutter/lib/plugins/document/application/doc_service.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/shared/feature_flags.dart (+2 -2)
📝 frontend/appflowy_flutter/lib/user/presentation/screens/splash_screen.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/workspace/application/user/user_workspace_bloc.dart (+150 -160)
📝 frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart (+1 -4)
📝 frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_folder.dart (+2 -3)
📝 frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_new_page_button.dart (+7 -1)
📝 frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_workspace.dart (+67 -76)
📝 frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_menu.dart (+61 -48)
📝 frontend/appflowy_flutter/lib/workspace/presentation/home/toast.dart (+2 -2)
📝 frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart (+1 -0)
📝 frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/members/workspace_member_bloc.dart (+144 -55)
📝 frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/members/workspace_member_page.dart (+62 -13)
📝 frontend/appflowy_flutter/lib/workspace/presentation/widgets/dialogs.dart (+9 -3)
📝 frontend/appflowy_flutter/packages/appflowy_result/lib/src/async_result.dart (+2 -2)
📝 frontend/appflowy_flutter/packages/appflowy_result/lib/src/result.dart (+18 -14)

...and 17 more files

📄 Description

Feature Preview

  • exclude invalid view IDs when retrieving public or private views.
  • improve error message.
  • limit the move / delete permission.

PR Checklist

  • My code adheres to AppFlowy's Conventions
  • I've listed at least one issue that this PR fixes in the description above.
  • I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes.
  • All existing tests are passing.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/AppFlowy-IO/AppFlowy/pull/4961 **Author:** [@LucasXu0](https://github.com/LucasXu0) **Created:** 3/22/2024 **Status:** ✅ Merged **Merged:** 3/22/2024 **Merged by:** [@LucasXu0](https://github.com/LucasXu0) **Base:** `main` ← **Head:** `workspace_improvement` --- ### 📝 Commits (10+) - [`1f6747d`](https://github.com/AppFlowy-IO/AppFlowy/commit/1f6747dae14702b8fe1b24664323c2c89a28a191) chore: enable feature flags in settings - [`0e29344`](https://github.com/AppFlowy-IO/AppFlowy/commit/0e2934490e5de705efb5ed1f5af07c0dbe2dda0b) feat: improve workspace/member limit exceeded error message - [`e644eeb`](https://github.com/AppFlowy-IO/AppFlowy/commit/e644eeb8e1de414f8274bace68a3b47e626d1a20) chore: enable feature flags - [`9530960`](https://github.com/AppFlowy-IO/AppFlowy/commit/95309600d30ab2ed9b1253d107365bf49a8c2a3f) fix: unable to delete trash - [`8eeaa1a`](https://github.com/AppFlowy-IO/AppFlowy/commit/8eeaa1a2c955f98f2d0280c31584bedf5a026b85) fix: exclude invalid view IDs when retrieving public or private views - [`3da1811`](https://github.com/AppFlowy-IO/AppFlowy/commit/3da1811575b398ca52dfae5187cb927cb3c404b0) Revert "chore: enable feature flags in settings" - [`60f3e6e`](https://github.com/AppFlowy-IO/AppFlowy/commit/60f3e6e2e5ea5aa5f71a15ec8eecb8bd1893f178) Revert "chore: enable feature flags" - [`5abd00a`](https://github.com/AppFlowy-IO/AppFlowy/commit/5abd00a90349f20055fc0c43616b716412dbf875) feat: improve user workspace bloc logic - [`4a79dd9`](https://github.com/AppFlowy-IO/AppFlowy/commit/4a79dd9851ebc1aed553a492da579e4fe026b163) feat: improve member bloc logic - [`d33b901`](https://github.com/AppFlowy-IO/AppFlowy/commit/d33b9016f5082878917e38bb545141493a866454) fix: create view under private section by default if collab workspace is on ### 📊 Changes **37 files changed** (+649 additions, -481 deletions) <details> <summary>View changed files</summary> 📝 `frontend/appflowy_flutter/integration_test/shared/workspace.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_folders.dart` (+2 -3) 📝 `frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_page_header.dart` (+1 -3) 📝 `frontend/appflowy_flutter/lib/plugins/document/application/doc_service.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/shared/feature_flags.dart` (+2 -2) 📝 `frontend/appflowy_flutter/lib/user/presentation/screens/splash_screen.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/workspace/application/user/user_workspace_bloc.dart` (+150 -160) 📝 `frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart` (+1 -4) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_folder.dart` (+2 -3) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_new_page_button.dart` (+7 -1) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_workspace.dart` (+67 -76) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_menu.dart` (+61 -48) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/home/toast.dart` (+2 -2) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart` (+1 -0) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/members/workspace_member_bloc.dart` (+144 -55) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/members/workspace_member_page.dart` (+62 -13) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/widgets/dialogs.dart` (+9 -3) 📝 `frontend/appflowy_flutter/packages/appflowy_result/lib/src/async_result.dart` (+2 -2) 📝 `frontend/appflowy_flutter/packages/appflowy_result/lib/src/result.dart` (+18 -14) _...and 17 more files_ </details> ### 📄 Description <!--- Thank you for submitting a pull request to AppFlowy. The team will dedicate their best efforts to reviewing and approving your pull request. If you have any questions about the project or feedback for us, please join our [Discord](https://discord.gg/wdjWUXXhtw). --> <!--- If your pull request adds a new feature, please drag and drop a video into this section to showcase what you've done! If not, you may delete this section. --> ### Feature Preview <!--- List at least one issue here that this PR addresses. If it fixes the issue, please use the [fixes](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests) keyword to close the issue. For example: fixes https://github.com/AppFlowy-IO/AppFlowy/pull/2106 --> - [x] exclude invalid view IDs when retrieving public or private views. - [x] improve error message. - [ ] limit the move / delete permission. --- <!--- Before you mark this PR ready for review, run through this checklist! --> #### PR Checklist - [x] My code adheres to [AppFlowy's Conventions](https://docs.appflowy.io/docs/documentation/software-contributions/conventions) - [x] I've listed at least one issue that this PR fixes in the description above. - [ ] I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes. - [x] All existing tests are passing. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
mirror 2026-03-23 22:23:44 +00:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
AppFlowy-IO/AppFlowy#6553
No description provided.