Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

feat: custom namespace/domain (#6614)

Lucas07e34609e72e
diff --git a/.github/workflows/flutter_ci.yaml b/.github/workflows/flutter_ci.yaml
index 2938a5fc43..2dc45f879a 100644
--- a/.github/workflows/flutter_ci.yaml
+++ b/.github/workflows/flutter_ci.yaml
@@ -28,7 +28,7 @@ env:
FLUTTER_VERSION: "3.22.2"
RUST_TOOLCHAIN: "1.80.1"
CARGO_MAKE_VERSION: "0.37.18"
- CLOUD_VERSION: 0.6.51-amd64
+ CLOUD_VERSION: 0.6.54-amd64
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -40,7 +40,7 @@ jobs:
strategy:
fail-fast: true
matrix:
- os: [ ubuntu-latest ]
+ os: [ubuntu-latest]
include:
- os: ubuntu-latest
flutter_profile: development-linux-x86_64
@@ -74,7 +74,7 @@ jobs:
strategy:
fail-fast: true
matrix:
- os: [ windows-latest ]
+ os: [windows-latest]
include:
- os: windows-latest
flutter_profile: development-windows-x86
@@ -101,7 +101,7 @@ jobs:
strategy:
fail-fast: true
matrix:
- os: [ macos-latest ]
+ os: [macos-latest]
include:
- os: macos-latest
flutter_profile: development-mac-x86_64
@@ -123,12 +123,12 @@ jobs:
flutter_profile: ${{ matrix.flutter_profile }}
unit_test:
- needs: [ prepare-linux ]
+ needs: [prepare-linux]
if: github.event.pull_request.draft != true
strategy:
fail-fast: false
matrix:
- os: [ ubuntu-latest ]
+ os: [ubuntu-latest]
include:
- os: ubuntu-latest
flutter_profile: development-linux-x86_64
@@ -217,11 +217,11 @@ jobs:
shell: bash
cloud_integration_test:
- needs: [ prepare-linux ]
+ needs: [prepare-linux]
strategy:
fail-fast: false
matrix:
- os: [ ubuntu-latest ]
+ os: [ubuntu-latest]
include:
- os: ubuntu-latest
flutter_profile: development-linux-x86_64
@@ -269,7 +269,7 @@ jobs:
else
echo "No containers to remove."
fi
-
+
# Remove all volumes if any exist
if [ "$(docker volume ls -q)" ]; then
docker volume rm $(docker volume ls -q)
@@ -340,13 +340,13 @@ jobs:
shell: bash
integration_test:
- needs: [ prepare-linux ]
+ needs: [prepare-linux]
if: github.event.pull_request.draft != true
strategy:
fail-fast: false
matrix:
- os: [ ubuntu-latest ]
- test_number: [ 1, 2, 3, 4, 5, 6, 7, 8 ]
+ os: [ubuntu-latest]
+ test_number: [1, 2, 3, 4, 5, 6, 7, 8]
include:
- os: ubuntu-latest
target: "x86_64-unknown-linux-gnu"
diff --git a/frontend/appflowy_flutter/integration_test/desktop/cloud/document/document_publish_test.dart b/frontend/appflowy_flutter/integration_test/desktop/cloud/document/document_publish_test.dart
new file mode 100644
index 0000000000..b53dcbaf2b
--- /dev/null
+++ b/frontend/appflowy_flutter/integration_test/desktop/cloud/document/document_publish_test.dart
@@ -0,0 +1,161 @@
+// ignore_for_file: unused_import
+
+import 'package:appflowy/env/cloud_env.dart';
+import 'package:appflowy/generated/flowy_svgs.g.dart';
+import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/copy_and_paste/clipboard_service.dart';
+import 'package:appflowy/plugins/shared/share/constants.dart';
+import 'package:appflowy/plugins/shared/share/publish_tab.dart';
+import 'package:appflowy/plugins/shared/share/share_menu.dart';
+import 'package:appflowy/shared/feature_flags.dart';
+import 'package:appflowy/shared/patterns/common_patterns.dart';
+import 'package:appflowy/startup/startup.dart';
+import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';
+import 'package:appflowy/user/application/auth/auth_service.dart';
+import 'package:appflowy/workspace/application/settings/prelude.dart';
+import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_icon.dart';
+import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flowy_infra/uuid.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
+import 'package:path/path.dart' as p;
+
+import '../../../shared/constants.dart';
+import '../../../shared/mock/mock_file_picker.dart';
+import '../../../shared/util.dart';
+import '../../../shared/workspace.dart';
+
+void main() {
+ IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+ group('Publish:', () {
+ testWidgets('publish document', (tester) async {
+ await tester.initializeAppFlowy(
+ cloudType: AuthenticatorType.appflowyCloudSelfHost,
+ );
+ await tester.tapGoogleLoginInButton();
+ await tester.expectToSeeHomePageWithGetStartedPage();
+
+ const pageName = 'Document';
+
+ await tester.createNewPageInSpace(
+ spaceName: Constants.generalSpaceName,
+ layout: ViewLayoutPB.Document,
+ pageName: pageName,
+ );
+
+ // open the publish menu
+ await tester.openPublishMenu();
+
+ // publish the document
+ final publishButton = find.byType(PublishButton);
+ final unpublishButton = find.byType(UnPublishButton);
+ await tester.tapButton(publishButton);
+
+ // expect to see unpublish, visit site and manage all sites button
+ expect(unpublishButton, findsOneWidget);
+ expect(find.text(LocaleKeys.shareAction_visitSite.tr()), findsOneWidget);
+ expect(
+ find.text(LocaleKeys.shareAction_manageAllSites.tr()),
+ findsOneWidget,
+ );
+
+ // unpublish the document
+ await tester.tapButton(unpublishButton);
+
+ // expect to see publish button
+ expect(publishButton, findsOneWidget);
+ });
+
+ testWidgets('rename path name', (tester) async {
+ await tester.initializeAppFlowy(
+ cloudType: AuthenticatorType.appflowyCloudSelfHost,
+ );
+ await tester.tapGoogleLoginInButton();
+ await tester.expectToSeeHomePageWithGetStartedPage();
+
+ const pageName = 'Document';
+
+ await tester.createNewPageInSpace(
+ spaceName: Constants.generalSpaceName,
+ layout: ViewLayoutPB.Document,
+ pageName: pageName,
+ );
+
+ // open the publish menu
+ await tester.openPublishMenu();
+
+ // publish the document
+ final publishButton = find.byType(PublishButton);
+ await tester.tapButton(publishButton);
+
+ // rename the path name
+ final inputField = find.descendant(
+ of: find.byType(ShareMenu),
+ matching: find.byType(TextField),
+ );
+
+ // rename with invalid name
+ await tester.tap(inputField);
+ await tester.enterText(inputField, '&&&&????');
+ await tester.tapButton(find.text(LocaleKeys.button_save.tr()));
+ await tester.pumpAndSettle();
+
+ // expect to see the toast with error message
+ final errorToast1 = find.text(
+ LocaleKeys.settings_sites_error_publishNameContainsInvalidCharacters
+ .tr(),
+ );
+ await tester.pumpUntilFound(errorToast1);
+ await tester.pumpUntilNotFound(errorToast1);
+
+ // rename with long name
+ await tester.tap(inputField);
+ await tester.enterText(inputField, 'long-path-name' * 200);
+ await tester.tapButton(find.text(LocaleKeys.button_save.tr()));
+ await tester.pumpAndSettle();
+
+ // expect to see the toast with error message
+ final errorToast2 = find.text(
+ LocaleKeys.settings_sites_error_publishNameTooLong.tr(),
+ );
+ await tester.pumpUntilFound(errorToast2);
+ await tester.pumpUntilNotFound(errorToast2);
+
+ await tester.tap(inputField);
+
+ // input the new path name
+ await tester.enterText(inputField, 'new-path-name');
+ // click save button
+ await tester.tapButton(find.text(LocaleKeys.button_save.tr()));
+ await tester.pumpAndSettle();
+
+ // expect to see the toast with success message
+ final successToast = find.text(
+ LocaleKeys.settings_sites_success_updatePathNameSuccess.tr(),
+ );
+ await tester.pumpUntilFound(successToast);
+ await tester.pumpUntilNotFound(successToast);
+
+ // click the copy link button
+ await tester.tapButton(
+ find.byWidgetPredicate(
+ (widget) =>
+ widget is FlowySvg &&
+ widget.svg.path == FlowySvgs.m_toolbar_link_m.path,
+ ),
+ );
+ await tester.pumpAndSettle();
+ // check the clipboard has the link
+ final content = await Clipboard.getData(Clipboard.kTextPlain);
+ expect(
+ content?.text?.contains('new-path-name'),
+ isTrue,
+ );
+ });
+ });
+}
diff --git a/frontend/appflowy_flutter/integration_test/desktop/cloud/document/document_test_runner.dart b/frontend/appflowy_flutter/integration_test/desktop/cloud/document/document_test_runner.dart
index 3a9af560ce..88d7db8a71 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/cloud/document/document_test_runner.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/cloud/document/document_test_runner.dart
@@ -3,10 +3,12 @@ import 'package:integration_test/integration_test.dart';
import 'document_copy_link_to_block_test.dart'
as document_copy_link_to_block_test;
import 'document_option_actions_test.dart' as document_option_actions_test;
+import 'document_publish_test.dart' as document_publish_test;
void main() {
IntegrationTestWidgetsFlutterBinding.ensureInitialized();
document_option_actions_test.main();
document_copy_link_to_block_test.main();
+ document_publish_test.main();
}
diff --git a/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/share_menu_test.dart b/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/share_menu_test.dart
index f497094e46..8512222f15 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/share_menu_test.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/share_menu_test.dart
@@ -6,6 +6,7 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/copy_and_p
import 'package:appflowy/plugins/shared/share/constants.dart';
import 'package:appflowy/plugins/shared/share/share_menu.dart';
import 'package:appflowy/shared/feature_flags.dart';
+import 'package:appflowy/shared/patterns/common_patterns.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';
import 'package:appflowy/user/application/auth/auth_service.dart';
@@ -61,11 +62,11 @@ void main() {
final plainText = clipboardContent.plainText;
expect(
plainText,
- startsWith(ShareConstants.shareBaseUrl),
+ matches(appflowySharePageLinkPattern),
);
final shareValues = plainText!
- .replaceAll('${ShareConstants.shareBaseUrl}/', '')
+ .replaceAll('https://${ShareConstants.shareBaseUrl}/', '')
.split('/');
final workspaceId = shareValues[0];
expect(workspaceId, isNotEmpty);
diff --git a/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/workspace_settings_test.dart b/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/workspace_settings_test.dart
index 83e5ca626e..dca4847177 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/workspace_settings_test.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/cloud/workspace/workspace_settings_test.dart
@@ -6,6 +6,7 @@ import 'package:appflowy/env/cloud_env.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/loading.dart';
import 'package:appflowy/plugins/document/presentation/editor_style.dart';
+import 'package:appflowy/plugins/shared/share/publish_tab.dart';
import 'package:appflowy/shared/feature_flags.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/user/application/auth/af_cloud_mock_auth_service.dart';
@@ -15,6 +16,11 @@ import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sid
import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_menu.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/sidebar_workspace.dart';
import 'package:appflowy/workspace/presentation/settings/pages/settings_workspace_view.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/domain/domain_item.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/domain/domain_more_action.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/domain/domain_settings_dialog.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/domain/home_page_menu.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/published_page/published_view_item.dart';
import 'package:appflowy/workspace/presentation/settings/shared/setting_list_tile.dart';
import 'package:appflowy/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart';
import 'package:appflowy/workspace/presentation/widgets/user_avatar.dart';
@@ -27,6 +33,7 @@ import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';
import 'package:path/path.dart' as p;
+import '../../../shared/constants.dart';
import '../../../shared/database_test_op.dart';
import '../../../shared/dir.dart';
import '../../../shared/emoji.dart';
@@ -93,4 +100,138 @@ void main() {
},
);
});
+
+ group('sites settings:', () {
+ testWidgets(
+ 'manage published page, set it as homepage, remove the homepage',
+ (tester) async {
+ await tester.initializeAppFlowy(
+ cloudType: AuthenticatorType.appflowyCloudSelfHost,
+ );
+ await tester.tapGoogleLoginInButton();
+ await tester.expectToSeeHomePageWithGetStartedPage();
+
+ const pageName = 'Document';
+
+ await tester.createNewPageInSpace(
+ spaceName: Constants.generalSpaceName,
+ layout: ViewLayoutPB.Document,
+ pageName: pageName,
+ );
+
+ // open the publish menu
+ await tester.openPublishMenu();
+
+ // publish the document
+ await tester.tapButton(find.byType(PublishButton));
+
+ // click empty area to close the publish menu
+ await tester.tapAt(Offset.zero);
+ await tester.pumpAndSettle();
+ // check if the page is published in sites page
+ await tester.openSettings();
+ await tester.openSettingsPage(SettingsPage.sites);
+ // wait the backend return the sites data
+ await tester.wait(1000);
+
+ // check if the page is published in sites page
+ final pageItem = find.byWidgetPredicate(
+ (widget) =>
+ widget is PublishedViewItem &&
+ widget.publishInfoView.view.name == pageName,
+ );
+ expect(pageItem, findsOneWidget);
+
+ // comment it out because it's not allowed to update the namespace in free plan
+ // // set it to homepage
+ // await tester.tapButton(
+ // find.textContaining(
+ // LocaleKeys.settings_sites_selectHomePage.tr(),
+ // ),
+ // );
+ // await tester.tapButton(
+ // find.descendant(
+ // of: find.byType(SelectHomePageMenu),
+ // matching: find.text(pageName),
+ // ),
+ // );
+ // await tester.pumpAndSettle();
+
+ // // check if the page is set to homepage
+ // final homePageItem = find.descendant(
+ // of: find.byType(DomainItem),
+ // matching: find.text(pageName),
+ // );
+ // expect(homePageItem, findsOneWidget);
+
+ // // remove the homepage
+ // await tester.tapButton(find.byType(DomainMoreAction));
+ // await tester.tapButton(
+ // find.text(LocaleKeys.settings_sites_removeHomepage.tr()),
+ // );
+ // await tester.pumpAndSettle();
+
+ // // check if the page is removed from homepage
+ // expect(homePageItem, findsNothing);
+ });
+
+ testWidgets('update namespace', (tester) async {
+ await tester.initializeAppFlowy(
+ cloudType: AuthenticatorType.appflowyCloudSelfHost,
+ );
+ await tester.tapGoogleLoginInButton();
+ await tester.expectToSeeHomePageWithGetStartedPage();
+
+ // check if the page is published in sites page
+ await tester.openSettings();
+ await tester.openSettingsPage(SettingsPage.sites);
+ // wait the backend return the sites data
+ await tester.wait(1000);
+
+ // update the domain
+ final domainMoreAction = find.byType(DomainMoreAction);
+ await tester.tapButton(domainMoreAction);
+ final updateNamespaceButton = find.text(
+ LocaleKeys.settings_sites_updateNamespace.tr(),
+ );
+ await tester.pumpUntilFound(updateNamespaceButton);
+
+ // click the update namespace button
+
+ await tester.tapButton(updateNamespaceButton);
+
+ // comment it out because it's not allowed to update the namespace in free plan
+ // expect to see the dialog
+ // await tester.updateNamespace('&&&???');
+
+ // // need to upgrade to pro plan to update the namespace
+ // final errorToast = find.text(
+ // LocaleKeys.settings_sites_error_proPlanLimitation.tr(),
+ // );
+ // await tester.pumpUntilFound(errorToast);
+ // expect(errorToast, findsOneWidget);
+ // await tester.pumpUntilNotFound(errorToast);
+
+ // comment it out because it's not allowed to update the namespace in free plan
+ // // short namespace
+ // await tester.updateNamespace('a');
+
+ // // expect to see the toast with error message
+ // final errorToast2 = find.text(
+ // LocaleKeys.settings_sites_error_namespaceTooShort.tr(),
+ // );
+ // await tester.pumpUntilFound(errorToast2);
+ // expect(errorToast2, findsOneWidget);
+ // await tester.pumpUntilNotFound(errorToast2);
+ // // valid namespace
+ // await tester.updateNamespace('AppFlowy');
+
+ // // expect to see the toast with success message
+ // final successToast = find.text(
+ // LocaleKeys.settings_sites_success_namespaceUpdated.tr(),
+ // );
+ // await tester.pumpUntilFound(successToast);
+ // expect(successToast, findsOneWidget);
+ });
+ });
}
diff --git a/frontend/appflowy_flutter/integration_test/shared/common_operations.dart b/frontend/appflowy_flutter/integration_test/shared/common_operations.dart
index 5c1369cf89..522259c99a 100644
--- a/frontend/appflowy_flutter/integration_test/shared/common_operations.dart
+++ b/frontend/appflowy_flutter/integration_test/shared/common_operations.dart
@@ -316,6 +316,15 @@ extension CommonOperations on WidgetTester {
await tapButton(shareButton);
}
+ // open the share menu and then click the publish tab
+ Future<void> openPublishMenu() async {
+ await tapShareButton();
+ final publishButton = find.textContaining(
+ LocaleKeys.shareAction_publishTab.tr(),
+ );
+ await tapButton(publishButton);
+ }
+
/// Tap the export markdown button
///
/// Must call [tapShareButton] first.
diff --git a/frontend/appflowy_flutter/integration_test/shared/settings.dart b/frontend/appflowy_flutter/integration_test/shared/settings.dart
index a4e56c59e1..aade7bb4c9 100644
--- a/frontend/appflowy_flutter/integration_test/shared/settings.dart
+++ b/frontend/appflowy_flutter/integration_test/shared/settings.dart
@@ -4,11 +4,13 @@ import 'package:appflowy/workspace/application/settings/prelude.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/shared/sidebar_setting.dart';
import 'package:appflowy/workspace/presentation/settings/pages/account/account_user_profile.dart';
import 'package:appflowy/workspace/presentation/settings/pages/settings_workspace_view.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/domain/domain_settings_dialog.dart';
import 'package:appflowy/workspace/presentation/settings/settings_dialog.dart';
import 'package:appflowy/workspace/presentation/settings/widgets/settings_menu_element.dart';
import 'package:appflowy/workspace/presentation/widgets/toggle/toggle.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/style_widget/text_field.dart';
+import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'base.dart';
@@ -116,4 +118,20 @@ extension AppFlowySettings on WidgetTester {
await tapAt(Offset.zero);
await pumpAndSettle();
}
+
+ Future<void> updateNamespace(String namespace) async {
+ final dialog = find.byType(DomainSettingsDialog);
+ expect(dialog, findsOneWidget);
+
+ // input the new namespace
+ await enterText(
+ find.descendant(
+ of: dialog,
+ matching: find.byType(TextField),
+ ),
+ namespace,
+ );
+ await tapButton(find.text(LocaleKeys.button_save.tr()));
+ await pumpAndSettle();
+ }
}
diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_column_header.dart b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_column_header.dart
index 7039dbe8b8..abd28ac022 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_column_header.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_column_header.dart
@@ -8,7 +8,6 @@ import 'package:appflowy/util/field_type_extension.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
import 'package:appflowy_board/appflowy_board.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_hidden_groups.dart b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_hidden_groups.dart
index 7edcbd9d49..9aa7f5f289 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_hidden_groups.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_hidden_groups.dart
@@ -16,7 +16,6 @@ import 'package:appflowy/plugins/database/widgets/cell/card_cell_builder.dart';
import 'package:appflowy/plugins/database/widgets/cell/card_cell_skeleton/text_card_cell.dart';
import 'package:appflowy/plugins/database/widgets/row/row_detail.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_card.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_card.dart
index 634dca5ce2..d4abb79a32 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_card.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_card.dart
@@ -9,7 +9,6 @@ import 'package:appflowy/plugins/database/widgets/card/card.dart';
import 'package:appflowy/plugins/database/widgets/cell/card_cell_builder.dart';
import 'package:appflowy/plugins/database/widgets/cell/card_cell_style_maps/calendar_card_cell_style.dart';
import 'package:appflowy/workspace/application/view/view_bloc.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_editor.dart
index da461b93fe..40f57b5e9a 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_editor.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_editor.dart
@@ -13,7 +13,6 @@ import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/te
import 'package:appflowy/plugins/database/widgets/row/accessory/cell_accessory.dart';
import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart
index 6d86a57d90..231c8830d9 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_page.dart
@@ -15,7 +15,6 @@ import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy/plugins/database/tab_bar/tab_bar_view.dart';
import 'package:appflowy/workspace/application/view/view_bloc.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:calendar_view/calendar_view.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/size.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/toolbar/calendar_layout_setting.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/toolbar/calendar_layout_setting.dart
index c72ddea576..8a66191950 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/toolbar/calendar_layout_setting.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/toolbar/calendar_layout_setting.dart
@@ -8,7 +8,6 @@ import 'package:appflowy/plugins/database/calendar/application/calendar_setting_
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy/workspace/presentation/widgets/toggle/toggle.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/calculations/calculate_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/calculations/calculate_cell.dart
index 1040081d51..5ea364bc72 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/calculations/calculate_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/calculations/calculate_cell.dart
@@ -10,7 +10,6 @@ import 'package:appflowy/shared/patterns/common_patterns.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/calculation_entities.pb.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pbenum.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/number_entities.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checkbox.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checkbox.dart
index 05948a8adb..bda8634cdb 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checkbox.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checkbox.dart
@@ -4,7 +4,6 @@ import 'package:appflowy/plugins/database/application/field/filter_entities.dart
import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/checkbox_filter.pbenum.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checklist.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checklist.dart
index 6db41242e6..9dd302ecf7 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checklist.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/checklist.dart
@@ -3,7 +3,6 @@ import 'package:appflowy/plugins/database/application/field/filter_entities.dart
import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/checklist_filter.pbenum.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart
index 752c484c40..b9e4890a3f 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/date.dart
@@ -6,7 +6,6 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:appflowy/workspace/presentation/widgets/date_picker/appflowy_date_picker.dart';
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/number.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/number.dart
index 3f9fe361de..cc38b4eaba 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/number.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/number.dart
@@ -5,7 +5,6 @@ import 'package:appflowy/plugins/database/application/field/filter_entities.dart
import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart
index 1aa7acac47..50984bbf3d 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart
@@ -1,7 +1,6 @@
import 'package:appflowy/plugins/database/application/field/field_info.dart';
import 'package:appflowy/plugins/database/application/field/filter_entities.dart';
import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart
index 6fe184fbe1..548f21efbe 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart
@@ -5,7 +5,6 @@ import 'package:appflowy/plugins/database/application/field/filter_entities.dart
import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/time.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/time.dart
index 1891704e88..dcd33f66c3 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/time.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/time.dart
@@ -5,7 +5,6 @@ import 'package:appflowy/plugins/database/application/field/filter_entities.dart
import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/url.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/url.dart
index 3536d6cbe9..7e453b9ab7 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/url.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/choicechip/url.dart
@@ -1,7 +1,6 @@
import 'package:appflowy/plugins/database/application/field/filter_entities.dart';
import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';
import 'package:appflowy/plugins/database/grid/presentation/widgets/filter/choicechip/text.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_menu.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_menu.dart
index cea141caa7..c91b47e2b7 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_menu.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/filter/filter_menu.dart
@@ -2,7 +2,6 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/database/application/field/field_controller.dart';
import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/desktop_field_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/desktop_field_cell.dart
index 617722a806..f0597c15e4 100755
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/desktop_field_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/header/desktop_field_cell.dart
@@ -9,7 +9,6 @@ import 'package:appflowy/plugins/database/application/field/field_info.dart';
import 'package:appflowy/plugins/database/widgets/field/field_editor.dart';
import 'package:appflowy/util/field_type_extension.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/style_widget/hover.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/action.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/action.dart
index ab93967d52..d212c50746 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/action.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/action.dart
@@ -6,7 +6,6 @@ import 'package:appflowy/plugins/database/grid/application/grid_bloc.dart';
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/row.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/row.dart
index 9d83bd4a01..855c73ce8a 100755
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/row.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/row/row.dart
@@ -12,7 +12,6 @@ import 'package:appflowy/plugins/database/application/row/row_service.dart';
import 'package:appflowy/plugins/database/grid/application/row/row_bloc.dart';
import 'package:appflowy/plugins/database/tab_bar/tab_bar_view.dart';
import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_editor.dart
index d7d972a2fa..2f7f68e2f6 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_editor.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_editor.dart
@@ -10,7 +10,6 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/database/grid/application/sort/sort_editor_bloc.dart';
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/sort_entities.pbenum.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_menu.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_menu.dart
index 9355b5f697..fc35e76241 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_menu.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/sort/sort_menu.dart
@@ -4,7 +4,6 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/plugins/database/application/field/field_controller.dart';
import 'package:appflowy/plugins/database/application/field/sort_entities.dart';
import 'package:appflowy/plugins/database/grid/application/sort/sort_editor_bloc.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/filter_button.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/filter_button.dart
index dfeb665cb7..ece2658cf2 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/filter_button.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/filter_button.dart
@@ -1,7 +1,6 @@
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/database/grid/application/filter/filter_editor_bloc.dart';
import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra/theme_extension.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/sort_button.dart b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/sort_button.dart
index a333d26410..e16c851f3a 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/sort_button.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/grid/presentation/widgets/toolbar/sort_button.dart
@@ -1,7 +1,6 @@
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/database/grid/application/sort/sort_editor_bloc.dart';
import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra/theme_extension.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/tab_bar_add_button.dart b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/tab_bar_add_button.dart
index e91e739b97..71b9fddda5 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/tab_bar_add_button.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/tab_bar_add_button.dart
@@ -3,7 +3,6 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy/plugins/database/widgets/database_layout_ext.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/setting_entities.pbenum.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra/theme_extension.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/tab_bar_header.dart b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/tab_bar_header.dart
index 23b97e0f66..936a59335d 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/tab_bar_header.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/tab_bar/desktop/tab_bar_header.dart
@@ -6,7 +6,6 @@ import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra/theme_extension.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card.dart
index 3ee506f918..6c3a0f7544 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/card.dart
@@ -12,7 +12,6 @@ import 'package:appflowy/shared/flowy_gradient_colors.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checklist_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checklist_cell.dart
index 95ba57c21d..f5ad4f3970 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checklist_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_checklist_cell.dart
@@ -5,7 +5,6 @@ import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy/plugins/database/widgets/cell_editor/checklist_cell_editor.dart';
import 'package:appflowy/plugins/database/widgets/cell_editor/checklist_progress_bar.dart';
import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_date_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_date_cell.dart
index ee6e2e2ead..21bbee23ff 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_date_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_date_cell.dart
@@ -4,7 +4,6 @@ import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
import 'package:appflowy/plugins/database/application/cell/bloc/date_cell_bloc.dart';
import 'package:appflowy/plugins/database/widgets/cell_editor/date_cell_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/widgets.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_media_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_media_cell.dart
index f1fc6beb4b..2b6dd08d26 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_media_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_media_cell.dart
@@ -11,7 +11,6 @@ import 'package:appflowy/plugins/database/widgets/media_file_type_ext.dart';
import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
import 'package:appflowy/shared/af_image.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/media_entities.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_relation_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_relation_cell.dart
index e1f873083c..f4b8fb97f0 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_relation_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_relation_cell.dart
@@ -4,7 +4,6 @@ import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart'
import 'package:appflowy/plugins/database/widgets/cell_editor/relation_cell_editor.dart';
import 'package:appflowy/plugins/database/application/cell/bloc/relation_cell_bloc.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_select_option_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_select_option_cell.dart
index ee283d6ccc..8cebb2d77a 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_select_option_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_select_option_cell.dart
@@ -4,7 +4,6 @@ import 'package:appflowy/plugins/database/widgets/cell_editor/extension.dart';
import 'package:appflowy/plugins/database/widgets/cell_editor/select_option_cell_editor.dart';
import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checklist_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checklist_cell.dart
index 34489af254..48d49f85aa 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checklist_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_checklist_cell.dart
@@ -7,7 +7,6 @@ import 'package:appflowy/plugins/database/widgets/cell_editor/checklist_cell_edi
import 'package:appflowy/plugins/database/widgets/cell_editor/checklist_cell_textfield.dart';
import 'package:appflowy/plugins/database/widgets/cell_editor/checklist_progress_bar.dart';
import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/size.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_date_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_date_cell.dart
index c3f20f9183..9d0c0f0324 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_date_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_date_cell.dart
@@ -4,7 +4,6 @@ import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/da
import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
import 'package:appflowy/plugins/database/application/cell/bloc/date_cell_bloc.dart';
import 'package:appflowy/plugins/database/widgets/cell_editor/date_cell_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_media_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_media_cell.dart
index 97b5ed8ac8..7a27d0337a 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_media_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_media_cell.dart
@@ -19,7 +19,6 @@ import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy/workspace/presentation/widgets/image_viewer/image_provider.dart';
import 'package:appflowy/workspace/presentation/widgets/image_viewer/interactive_image_viewer.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:cross_file/cross_file.dart';
import 'package:easy_localization/easy_localization.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_relation_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_relation_cell.dart
index cefa11c7fc..996d04267c 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_relation_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_relation_cell.dart
@@ -3,7 +3,6 @@ import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart'
import 'package:appflowy/plugins/database/widgets/cell_editor/relation_cell_editor.dart';
import 'package:appflowy/plugins/database/application/cell/bloc/relation_cell_bloc.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_select_option_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_select_option_cell.dart
index dff883db1f..6eab6438dc 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_select_option_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_select_option_cell.dart
@@ -6,7 +6,6 @@ import 'package:appflowy/plugins/database/widgets/cell_editor/extension.dart';
import 'package:appflowy/plugins/database/widgets/cell_editor/select_option_cell_editor.dart';
import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checklist_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checklist_cell.dart
index 78bde58c9a..ff9f83319f 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checklist_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_checklist_cell.dart
@@ -4,7 +4,6 @@ import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart'
import 'package:appflowy/plugins/database/application/cell/bloc/checklist_cell_bloc.dart';
import 'package:appflowy/plugins/database/widgets/cell_editor/checklist_progress_bar.dart';
import 'package:appflowy/plugins/database/widgets/cell_editor/mobile_checklist_cell_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_date_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_date_cell.dart
index 5e45afd551..43b6b7f347 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_date_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_date_cell.dart
@@ -6,7 +6,6 @@ import 'package:appflowy/mobile/presentation/database/date_picker/mobile_date_pi
import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/date.dart';
import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
import 'package:appflowy/plugins/database/application/cell/bloc/date_cell_bloc.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
class MobileGridDateCellSkin extends IEditableDateCellSkin {
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_relation_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_relation_cell.dart
index 5c31d41b30..0951e2fb0d 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_relation_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_relation_cell.dart
@@ -1,7 +1,6 @@
import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';
import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
import 'package:appflowy/plugins/database/application/cell/bloc/relation_cell_bloc.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_select_option_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_select_option_cell.dart
index 9c01536e71..61f67fec4f 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_select_option_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_grid/mobile_grid_select_option_cell.dart
@@ -4,7 +4,6 @@ import 'package:appflowy/plugins/database/widgets/cell_editor/extension.dart';
import 'package:appflowy/plugins/database/widgets/cell_editor/mobile_select_option_editor.dart';
import 'package:appflowy/plugins/database/application/cell/bloc/select_option_cell_bloc.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/select_option_entities.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checklist_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checklist_cell.dart
index 11fa98a323..daf085e2ce 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checklist_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_checklist_cell.dart
@@ -4,7 +4,6 @@ import 'package:appflowy/plugins/database/application/cell/bloc/checklist_cell_b
import 'package:appflowy/plugins/database/widgets/cell_editor/checklist_progress_bar.dart';
import 'package:appflowy/plugins/database/widgets/cell_editor/mobile_checklist_cell_editor.dart';
import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_date_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_date_cell.dart
index 0ac1263e46..8671bacd8f 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_date_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_date_cell.dart
@@ -5,7 +5,6 @@ import 'package:appflowy/mobile/presentation/database/date_picker/mobile_date_pi
import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/date.dart';
import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
import 'package:appflowy/plugins/database/application/cell/bloc/date_cell_bloc.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_relation_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_relation_cell.dart
index cdbcef64c7..61a39a867a 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_relation_cell.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_relation_cell.dart
@@ -2,7 +2,6 @@ import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_she
import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/relation.dart';
import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
import 'package:appflowy/plugins/database/application/cell/bloc/relation_cell_bloc.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_select_cell_option.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_select_cell_option.dart
index 59941394fa..9dafb6afe0 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_select_cell_option.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/mobile_row_detail/mobile_row_detail_select_cell_option.dart
@@ -5,7 +5,6 @@ import 'package:appflowy/plugins/database/widgets/cell_editor/extension.dart';
import 'package:appflowy/plugins/database/widgets/cell_editor/mobile_select_option_editor.dart';
import 'package:appflowy/plugins/database/application/cell/bloc/select_option_cell_bloc.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/select_option_entities.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/media_cell_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/media_cell_editor.dart
index 59ef6e6283..4c0bfb7e17 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/media_cell_editor.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/media_cell_editor.dart
@@ -16,7 +16,6 @@ import 'package:appflowy/workspace/presentation/widgets/image_viewer/image_provi
import 'package:appflowy/workspace/presentation/widgets/image_viewer/interactive_image_viewer.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/file_entities.pbenum.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/media_entities.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:cross_file/cross_file.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/relation_cell_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/relation_cell_editor.dart
index d562e05349..3a739cc69c 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/relation_cell_editor.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/relation_cell_editor.dart
@@ -11,7 +11,6 @@ import 'package:appflowy_backend/dispatch/dispatch.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/size.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/select_option_cell_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/select_option_cell_editor.dart
index 52a5c644f0..6ac2a5b807 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/select_option_cell_editor.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/select_option_cell_editor.dart
@@ -10,7 +10,6 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/database/application/cell/bloc/select_option_cell_editor_bloc.dart';
import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/select_option_entities.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/field_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/field_editor.dart
index a8676a5e46..d91f207797 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/field_editor.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/field_editor.dart
@@ -15,7 +15,6 @@ import 'package:appflowy/util/field_type_extension.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy/workspace/presentation/widgets/toggle/toggle.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/field_type_list.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/field_type_list.dart
index e5e21ae7f2..fa5c45f0b2 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/field_type_list.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/field_type_list.dart
@@ -4,7 +4,6 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy/util/field_type_extension.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
typedef SelectFieldCallback = void Function(FieldType);
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/date.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/date.dart
index 1ce3b73dad..ab216c7b98 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/date.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/date.dart
@@ -1,6 +1,5 @@
import 'package:appflowy/plugins/database/application/field/type_option/type_option_data_parser.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:protobuf/protobuf.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/number.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/number.dart
index efa5866947..b8a40907c6 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/number.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/number.dart
@@ -3,7 +3,6 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/database/application/field/type_option/number_format_bloc.dart';
import 'package:appflowy/plugins/database/application/field/type_option/type_option_data_parser.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/relation.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/relation.dart
index 390d81e6af..2ee3222b23 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/relation.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/relation.dart
@@ -4,7 +4,6 @@ import 'package:appflowy/plugins/database/application/field/type_option/relation
import 'package:appflowy/plugins/database/application/field/type_option/type_option_data_parser.dart';
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/select/select_option.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/select/select_option.dart
index fddc97b0f5..5201630cc7 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/select/select_option.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/select/select_option.dart
@@ -7,7 +7,6 @@ import 'package:appflowy/plugins/database/application/field/type_option/select_t
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy/plugins/database/widgets/cell_editor/select_option_cell_editor.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/select_option_entities.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/timestamp.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/timestamp.dart
index be094c70a8..e67929d2dc 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/timestamp.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/timestamp.dart
@@ -1,7 +1,6 @@
import 'package:appflowy/plugins/database/application/field/type_option/type_option_data_parser.dart';
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:protobuf/protobuf.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/translate.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/translate.dart
index 6c7809a61b..70ce6e8049 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/translate.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/translate.dart
@@ -3,7 +3,6 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/database/application/field/type_option/translate_type_option_bloc.dart';
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart
index 1dc2854176..4e604d8c23 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart
@@ -27,7 +27,6 @@ import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
import 'package:appflowy_backend/protobuf/flowy-user/auth.pbenum.dart';
import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';
import 'package:appflowy_editor/appflowy_editor.dart' hide UploadImageMenu;
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_property.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_property.dart
index ad6b105488..240d33f0f2 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_property.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_property.dart
@@ -11,7 +11,6 @@ import 'package:appflowy/plugins/database/grid/presentation/widgets/header/deskt
import 'package:appflowy/plugins/database/widgets/field/field_editor.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/actions/block_action_button.dart';
import 'package:appflowy_backend/log.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/database_setting_action.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/database_setting_action.dart
index de50905dfa..409454848a 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/database_setting_action.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/database_setting_action.dart
@@ -6,7 +6,6 @@ import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy/plugins/database/widgets/setting/database_layout_selector.dart';
import 'package:appflowy/plugins/database/widgets/group/database_group.dart';
import 'package:appflowy/plugins/database/widgets/setting/setting_property_list.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_button.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_button.dart
index 53ef463d4f..4d31e5a79d 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_button.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_button.dart
@@ -4,7 +4,6 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/database/application/database_controller.dart';
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy/plugins/database/widgets/setting/database_settings_list.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra/theme_extension.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_property_list.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_property_list.dart
index fb4425dfe1..8c7d35b2e4 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_property_list.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/setting/setting_property_list.dart
@@ -9,7 +9,6 @@ import 'package:appflowy/plugins/database/grid/presentation/widgets/header/deskt
import 'package:appflowy/plugins/database/widgets/field/field_editor.dart';
import 'package:appflowy/plugins/database/widgets/setting/field_visibility_extension.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/database_document/presentation/database_document_title.dart b/frontend/appflowy_flutter/lib/plugins/database_document/presentation/database_document_title.dart
index efc4f7dd29..002596f0c9 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_document/presentation/database_document_title.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_document/presentation/database_document_title.dart
@@ -10,7 +10,6 @@ import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart'
import 'package:appflowy/plugins/document/presentation/editor_plugins/base/emoji_picker_button.dart';
import 'package:appflowy/workspace/presentation/widgets/view_title_bar.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/application/editor_transaction_adapter.dart b/frontend/appflowy_flutter/lib/plugins/document/application/editor_transaction_adapter.dart
index 7738ed655c..5617f80f25 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/application/editor_transaction_adapter.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/application/editor_transaction_adapter.dart
@@ -4,6 +4,7 @@ import 'dart:convert';
import 'package:appflowy/plugins/document/application/document_bloc.dart';
import 'package:appflowy/plugins/document/application/document_data_pb_extension.dart';
import 'package:appflowy/plugins/document/application/document_service.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/smart_edit_node_widget.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-document/protobuf.dart';
import 'package:appflowy_editor/appflowy_editor.dart'
@@ -175,6 +176,10 @@ extension on InsertOperation {
Path currentPath = path;
final List<BlockActionWrapper> actions = [];
for (final node in nodes) {
+ if (node.type == SmartEditBlockKeys.type) {
+ continue;
+ }
+
final parentId = node.parent?.id ??
editorState.getNodeAtPath(currentPath.parent)?.id ??
'';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/drag_to_reorder/draggable_option_button_feedback.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/drag_to_reorder/draggable_option_button_feedback.dart
index 89a75558be..d7faecd506 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/drag_to_reorder/draggable_option_button_feedback.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/drag_to_reorder/draggable_option_button_feedback.dart
@@ -8,7 +8,6 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/plugins.da
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/user/application/reminder/reminder_bloc.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/drag_to_reorder/option_button.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/drag_to_reorder/option_button.dart
index 2b093dcea3..97abb9c0a6 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/drag_to_reorder/option_button.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/drag_to_reorder/option_button.dart
@@ -4,7 +4,6 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/actions/bl
import 'package:appflowy/plugins/document/presentation/editor_plugins/actions/block_action_option_cubit.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/drag_to_reorder/util.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/drag_to_reorder/util.dart
index 32dd53b915..6cbf840efb 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/drag_to_reorder/util.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/drag_to_reorder/util.dart
@@ -52,11 +52,21 @@ Future<void> dragToMoveNode(
Log.info('Moving node($node, ${node.path}) to path($newPath)');
- // Perform the node move operation
- final transaction = editorState.transaction;
- transaction.deleteNode(node);
- transaction.insertNode(newPath, node.copyWith());
- await editorState.apply(transaction);
+ final newPathNode = editorState.getNodeAtPath(newPath);
+ if (newPathNode == null) {
+ // if the new path is not a valid path, it means the node is not in the editor.
+ // we should perform insertion before deletion.
+ final transaction = editorState.transaction;
+ transaction.insertNode(newPath, node.copyWith());
+ transaction.deleteNode(node);
+ await editorState.apply(transaction);
+ } else {
+ // Perform the node move operation
+ final transaction = editorState.transaction;
+ transaction.deleteNode(node);
+ transaction.insertNode(newPath, node.copyWith());
+ await editorState.apply(transaction);
+ }
}
(VerticalPosition, HorizontalPosition, Rect)? getDragAreaPosition(
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/option/color_option_action.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/option/color_option_action.dart
index d114a871e1..f9bcbc5ae6 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/option/color_option_action.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/option/color_option_action.dart
@@ -3,7 +3,6 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/plugins.dart';
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/option/turn_into_option_action.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/option/turn_into_option_action.dart
index 915189774a..6c1dda404c 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/option/turn_into_option_action.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/actions/option/turn_into_option_action.dart
@@ -4,7 +4,6 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/actions/bl
import 'package:appflowy/plugins/document/presentation/editor_plugins/plugins.dart';
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/align_toolbar_item/align_toolbar_item.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/align_toolbar_item/align_toolbar_item.dart
index 8d15c0e6be..09bdc06057 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/align_toolbar_item/align_toolbar_item.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/align_toolbar_item/align_toolbar_item.dart
@@ -1,7 +1,6 @@
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/built_in_page_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/built_in_page_widget.dart
index 1a0d9418ef..29a705204c 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/built_in_page_widget.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/built_in_page_widget.dart
@@ -10,7 +10,6 @@ import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_backend/protobuf/flowy-error/errors.pbserver.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:appflowy_result/appflowy_result.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/emoji_picker_button.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/emoji_picker_button.dart
index e372d7a9e9..2d9a48206d 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/emoji_picker_button.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/emoji_picker_button.dart
@@ -1,7 +1,6 @@
import 'package:appflowy/plugins/base/emoji/emoji_picker_screen.dart';
import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy/workspace/presentation/settings/widgets/emoji_picker/emoji_picker.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/code_block/code_block_language_selector.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/code_block/code_block_language_selector.dart
index 701e6f5642..a40cc59575 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/code_block/code_block_language_selector.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/code_block/code_block_language_selector.dart
@@ -4,7 +4,6 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/base/strin
import 'package:appflowy/plugins/document/presentation/editor_plugins/code_block/code_language_screen.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
import 'package:appflowy_editor_plugins/appflowy_editor_plugins.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_block_component.dart
index 2ccdd3077d..94a4361dda 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_block_component.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_block_component.dart
@@ -12,7 +12,6 @@ import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/workspace/presentation/home/toast.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:cross_file/cross_file.dart';
import 'package:desktop_drop/desktop_drop.dart';
import 'package:easy_localization/easy_localization.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_block_menu.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_block_menu.dart
index 133a9fb77a..d79d5a1994 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_block_menu.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_block_menu.dart
@@ -8,7 +8,6 @@ import 'package:appflowy/workspace/application/settings/date_time/date_format_ex
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart
index b51429da1a..e3b5c2578e 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart
@@ -21,7 +21,6 @@ import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy/workspace/application/view/view_listener.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:appflowy_editor/appflowy_editor.dart' hide UploadImageMenu;
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/widget/rounded_button.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/heading/heading_toolbar_item.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/heading/heading_toolbar_item.dart
index 30395143e8..0337b901db 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/heading/heading_toolbar_item.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/heading/heading_toolbar_item.dart
@@ -1,7 +1,6 @@
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/custom_image_block_component/image_menu.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/custom_image_block_component/image_menu.dart
index 80382243b8..8fabb23948 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/custom_image_block_component/image_menu.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/custom_image_block_component/image_menu.dart
@@ -14,7 +14,6 @@ import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy/workspace/presentation/widgets/image_viewer/image_provider.dart';
import 'package:appflowy/workspace/presentation/widgets/image_viewer/interactive_image_viewer.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/widget/ignore_parent_gesture.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/image_placeholder.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/image_placeholder.dart
index 739f5084b7..df975de731 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/image_placeholder.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/image_placeholder.dart
@@ -17,7 +17,6 @@ import 'package:appflowy/workspace/application/settings/application_data_storage
import 'package:appflowy/workspace/presentation/home/toast.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_editor/appflowy_editor.dart' hide UploadImageMenu;
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:desktop_drop/desktop_drop.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/uuid.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/multi_image_block_component/multi_image_menu.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/multi_image_block_component/multi_image_menu.dart
index d1fe23cb59..8abeaf9e99 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/multi_image_block_component/multi_image_menu.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/multi_image_block_component/multi_image_menu.dart
@@ -19,7 +19,6 @@ import 'package:appflowy/workspace/presentation/widgets/image_viewer/image_provi
import 'package:appflowy/workspace/presentation/widgets/image_viewer/interactive_image_viewer.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_editor/appflowy_editor.dart' hide UploadImageMenu;
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:cross_file/cross_file.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/size.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/multi_image_block_component/multi_image_placeholder.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/multi_image_block_component/multi_image_placeholder.dart
index f1095ff4e6..313022bfab 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/multi_image_block_component/multi_image_placeholder.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/multi_image_block_component/multi_image_placeholder.dart
@@ -16,7 +16,6 @@ import 'package:appflowy/workspace/application/settings/application_data_storage
import 'package:appflowy/workspace/presentation/home/toast.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_editor/appflowy_editor.dart' hide UploadImageMenu;
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:desktop_drop/desktop_drop.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/uuid.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/inline_math_equation/inline_math_equation.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/inline_math_equation/inline_math_equation.dart
index 7ce143acba..a5ede15906 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/inline_math_equation/inline_math_equation.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/inline_math_equation/inline_math_equation.dart
@@ -1,6 +1,5 @@
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/style_widget/text_input.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_date_block.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_date_block.dart
index eb27134c7f..851d56560f 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_date_block.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_date_block.dart
@@ -17,7 +17,6 @@ import 'package:appflowy/workspace/presentation/widgets/date_picker/widgets/mobi
import 'package:appflowy/workspace/presentation/widgets/date_picker/widgets/reminder_selector.dart';
import 'package:appflowy_backend/protobuf/flowy-user/reminder.pb.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:fixnum/fixnum.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/smart_edit_node_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/smart_edit_node_widget.dart
index b27efae62a..f6d0f53170 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/smart_edit_node_widget.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/smart_edit_node_widget.dart
@@ -9,7 +9,6 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/wid
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
@@ -172,9 +171,11 @@ class _SmartEditBlockComponentWidgetState
var width = double.infinity;
try {
final editorSize = editorState.renderBox?.size;
+ final editorWidth =
+ editorSize?.width.clamp(0, editorState.editorStyle.maxWidth ?? width);
final padding = editorState.editorStyle.padding;
- if (editorSize != null) {
- width = editorSize.width - padding.left - padding.right;
+ if (editorWidth != null) {
+ width = editorWidth - padding.left - padding.right;
}
} catch (_) {}
return width;
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/smart_edit_toolbar_item.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/smart_edit_toolbar_item.dart
index 9ace1035b2..c37458c25d 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/smart_edit_toolbar_item.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/smart_edit_toolbar_item.dart
@@ -6,7 +6,6 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/plugins.da
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/table/table_option_action.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/table/table_option_action.dart
index 6d0597319c..993ee9b5a7 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/table/table_option_action.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/table/table_option_action.dart
@@ -3,7 +3,6 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/extensions/flowy_tint_extension.dart';
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
diff --git a/frontend/appflowy_flutter/lib/plugins/shared/share/_shared.dart b/frontend/appflowy_flutter/lib/plugins/shared/share/_shared.dart
index 23bcb88395..7f41d6b30c 100644
--- a/frontend/appflowy_flutter/lib/plugins/shared/share/_shared.dart
+++ b/frontend/appflowy_flutter/lib/plugins/shared/share/_shared.dart
@@ -2,7 +2,7 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/database/application/tab_bar_bloc.dart';
import 'package:appflowy/plugins/shared/share/share_bloc.dart';
import 'package:appflowy/plugins/shared/share/share_menu.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
+import 'package:appflowy/workspace/application/user/user_workspace_bloc.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
@@ -20,15 +20,21 @@ class ShareMenuButton extends StatelessWidget {
Widget build(BuildContext context) {
final shareBloc = context.read<ShareBloc>();
final databaseBloc = context.read<DatabaseTabBarBloc?>();
+ final userWorkspaceBloc = context.read<UserWorkspaceBloc>();
return SizedBox(
height: 32.0,
child: IntrinsicWidth(
child: AppFlowyPopover(
direction: PopoverDirection.bottomWithRightAligned,
constraints: const BoxConstraints(
- maxWidth: 422,
+ maxWidth: 500,
),
offset: const Offset(0, 8),
+ onOpen: () {
+ context
+ .read<ShareBloc>()
+ .add(const ShareEvent.updatePublishStatus());
+ },
popupBuilder: (context) => MultiBlocProvider(
providers: [
if (databaseBloc != null)
@@ -36,6 +42,7 @@ class ShareMenuButton extends StatelessWidget {
value: databaseBloc,
),
BlocProvider.value(value: shareBloc),
+ BlocProvider.value(value: userWorkspaceBloc),
],
child: ShareMenu(
tabs: tabs,
diff --git a/frontend/appflowy_flutter/lib/plugins/shared/share/constants.dart b/frontend/appflowy_flutter/lib/plugins/shared/share/constants.dart
index d2ad662297..2be63c5879 100644
--- a/frontend/appflowy_flutter/lib/plugins/shared/share/constants.dart
+++ b/frontend/appflowy_flutter/lib/plugins/shared/share/constants.dart
@@ -1,12 +1,20 @@
class ShareConstants {
- static const String publishBaseUrl = 'https://appflowy.com';
- static const String shareBaseUrl = 'https://appflowy.com/app';
+ static const String publishBaseUrl = 'appflowy.com';
+ static const String shareBaseUrl = 'appflowy.com/app';
static String buildPublishUrl({
required String nameSpace,
required String publishName,
}) {
- return '$publishBaseUrl/$nameSpace/$publishName';
+ return 'https://$publishBaseUrl/$nameSpace/$publishName';
+ }
+
+ static String buildNamespaceUrl({
+ required String nameSpace,
+ bool withHttps = false,
+ }) {
+ final url = withHttps ? 'https://$publishBaseUrl' : publishBaseUrl;
+ return '$url/$nameSpace';
}
static String buildShareUrl({
@@ -14,7 +22,7 @@ class ShareConstants {
required String viewId,
String? blockId,
}) {
- final url = '$shareBaseUrl/$workspaceId/$viewId';
+ final url = 'https://$shareBaseUrl/$workspaceId/$viewId';
if (blockId == null || blockId.isEmpty) {
return url;
}
diff --git a/frontend/appflowy_flutter/lib/plugins/shared/share/publish_tab.dart b/frontend/appflowy_flutter/lib/plugins/shared/share/publish_tab.dart
index 1585ffde4f..493d93cdc2 100644
--- a/frontend/appflowy_flutter/lib/plugins/shared/share/publish_tab.dart
+++ b/frontend/appflowy_flutter/lib/plugins/shared/share/publish_tab.dart
@@ -3,11 +3,16 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/database/application/tab_bar_bloc.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/copy_and_paste/clipboard_service.dart';
+import 'package:appflowy/plugins/shared/share/constants.dart';
import 'package:appflowy/plugins/shared/share/publish_color_extension.dart';
import 'package:appflowy/plugins/shared/share/publish_name_generator.dart';
import 'package:appflowy/plugins/shared/share/share_bloc.dart';
+import 'package:appflowy/shared/error_code/error_code_map.dart';
import 'package:appflowy/startup/startup.dart';
+import 'package:appflowy/workspace/application/settings/prelude.dart';
+import 'package:appflowy/workspace/application/user/user_workspace_bloc.dart';
import 'package:appflowy/workspace/application/view/view_ext.dart';
+import 'package:appflowy/workspace/presentation/home/menu/sidebar/shared/sidebar_setting.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
@@ -32,6 +37,8 @@ class PublishTab extends StatelessWidget {
if (state.isPublished) {
return _PublishedWidget(
url: state.url,
+ pathName: state.pathName,
+ namespace: state.namespace,
onVisitSite: (url) => afLaunchUrlString(url),
onUnPublish: () {
context.read<ShareBloc>().add(const ShareEvent.unPublish());
@@ -78,6 +85,7 @@ class PublishTab extends StatelessWidget {
(error) => showToastNotification(
context,
message: '${LocaleKeys.publish_publishFailed.tr()}: ${error.code}',
+ type: ToastificationType.error,
),
);
} else if (state.unpublishResult != null) {
@@ -90,8 +98,26 @@ class PublishTab extends StatelessWidget {
context,
message: LocaleKeys.publish_unpublishFailed.tr(),
description: error.msg,
+ type: ToastificationType.error,
),
);
+ } else if (state.updatePathNameResult != null) {
+ state.updatePathNameResult!.fold(
+ (value) => showToastNotification(
+ context,
+ message: LocaleKeys.settings_sites_success_updatePathNameSuccess.tr(),
+ ),
+ (error) {
+ Log.error('update path name failed: $error');
+
+ showToastNotification(
+ context,
+ message: LocaleKeys.settings_sites_error_updatePathNameFailed.tr(),
+ type: ToastificationType.error,
+ description: error.code.publishErrorMessage,
+ );
+ },
+ );
}
}
}
@@ -99,11 +125,15 @@ class PublishTab extends StatelessWidget {
class _PublishedWidget extends StatefulWidget {
const _PublishedWidget({
required this.url,
+ required this.pathName,
+ required this.namespace,
required this.onVisitSite,
required this.onUnPublish,
});
final String url;
+ final String pathName;
+ final String namespace;
final void Function(String url) onVisitSite;
final VoidCallback onUnPublish;
@@ -117,7 +147,7 @@ class _PublishedWidgetState extends State<_PublishedWidget> {
@override
void initState() {
super.initState();
- controller.text = widget.url;
+ controller.text = widget.pathName;
}
@override
@@ -136,8 +166,11 @@ class _PublishedWidgetState extends State<_PublishedWidget> {
const _PublishTabHeader(),
const VSpace(16),
_PublishUrl(
+ namespace: widget.namespace,
controller: controller,
- onCopy: (url) {
+ onCopy: (_) {
+ final url = context.read<ShareBloc>().state.url;
+
getIt<ClipboardService>().setData(
ClipboardServiceData(plainText: url),
);
@@ -147,14 +180,20 @@ class _PublishedWidgetState extends State<_PublishedWidget> {
message: LocaleKeys.grid_url_copy.tr(),
);
},
- onSubmitted: (url) {},
+ onSubmitted: (pathName) {
+ context.read<ShareBloc>().add(ShareEvent.updatePathName(pathName));
+ },
),
const VSpace(16),
Row(
mainAxisSize: MainAxisSize.min,
children: [
- _buildUnpublishButton(),
+ _buildManageSiteButton(),
const Spacer(),
+ UnPublishButton(
+ onUnPublish: widget.onUnPublish,
+ ),
+ const HSpace(6),
_buildVisitSiteButton(),
],
),
@@ -162,31 +201,41 @@ class _PublishedWidgetState extends State<_PublishedWidget> {
);
}
- Widget _buildUnpublishButton() {
+ Widget _buildManageSiteButton() {
return SizedBox(
- width: 184,
+ width: 128,
height: 36,
child: FlowyButton(
- decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(10),
- border: Border.all(color: ShareMenuColors.borderColor(context)),
- ),
radius: BorderRadius.circular(10),
text: FlowyText.regular(
lineHeight: 1.0,
- LocaleKeys.shareAction_unPublish.tr(),
+ LocaleKeys.shareAction_manageAllSites.tr(),
textAlign: TextAlign.center,
+ overflow: TextOverflow.ellipsis,
),
- onTap: widget.onUnPublish,
+ onTap: () {
+ PopoverContainer.of(context).close();
+
+ // open settings sites page
+ showSettingsDialog(
+ context,
+ context.read<UserWorkspaceBloc>().userProfile,
+ context.read<UserWorkspaceBloc>(),
+ SettingsPage.sites,
+ );
+ },
),
);
}
Widget _buildVisitSiteButton() {
return RoundedTextButton(
- width: 184,
+ width: 108,
height: 36,
- onPressed: () => widget.onVisitSite(controller.text),
+ onPressed: () {
+ final url = context.read<ShareBloc>().state.url;
+ widget.onVisitSite(url);
+ },
title: LocaleKeys.shareAction_visitSite.tr(),
borderRadius: const BorderRadius.all(Radius.circular(10)),
fillColor: Theme.of(context).colorScheme.primary,
@@ -196,6 +245,36 @@ class _PublishedWidgetState extends State<_PublishedWidget> {
}
}
+class UnPublishButton extends StatelessWidget {
+ const UnPublishButton({
+ super.key,
+ required this.onUnPublish,
+ });
+
+ final VoidCallback onUnPublish;
+
+ @override
+ Widget build(BuildContext context) {
+ return SizedBox(
+ width: 108,
+ height: 36,
+ child: FlowyButton(
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(10),
+ border: Border.all(color: ShareMenuColors.borderColor(context)),
+ ),
+ radius: BorderRadius.circular(10),
+ text: FlowyText.regular(
+ lineHeight: 1.0,
+ LocaleKeys.shareAction_unPublish.tr(),
+ textAlign: TextAlign.center,
+ ),
+ onTap: onUnPublish,
+ ),
+ );
+ }
+}
+
class _PublishWidget extends StatefulWidget {
const _PublishWidget({
required this.onPublish,
@@ -229,7 +308,7 @@ class _PublishWidgetState extends State<_PublishWidget> {
),
const VSpace(16),
],
- _PublishButton(
+ PublishButton(
onPublish: () {
if (context.read<ShareBloc>().view.layout.isDatabaseView) {
// check if any database is selected
@@ -250,8 +329,9 @@ class _PublishWidgetState extends State<_PublishWidget> {
}
}
-class _PublishButton extends StatelessWidget {
- const _PublishButton({
+class PublishButton extends StatelessWidget {
+ const PublishButton({
+ super.key,
required this.onPublish,
});
@@ -298,40 +378,131 @@ class _PublishTabHeader extends StatelessWidget {
}
}
-class _PublishUrl extends StatelessWidget {
+class _PublishUrl extends StatefulWidget {
const _PublishUrl({
+ required this.namespace,
required this.controller,
required this.onCopy,
required this.onSubmitted,
});
+ final String namespace;
final TextEditingController controller;
final void Function(String url) onCopy;
final void Function(String url) onSubmitted;
+ @override
+ State<_PublishUrl> createState() => _PublishUrlState();
+}
+
+class _PublishUrlState extends State<_PublishUrl> {
+ final focusNode = FocusNode();
+ bool showSaveButton = false;
+
+ @override
+ void initState() {
+ super.initState();
+
+ focusNode.addListener(() {
+ setState(() {
+ showSaveButton = focusNode.hasFocus;
+ });
+ });
+ }
+
+ @override
+ void dispose() {
+ focusNode.dispose();
+
+ super.dispose();
+ }
+
@override
Widget build(BuildContext context) {
return SizedBox(
height: 36,
child: FlowyTextField(
- readOnly: true,
autoFocus: false,
- controller: controller,
+ controller: widget.controller,
+ focusNode: focusNode,
enableBorderColor: ShareMenuColors.borderColor(context),
- suffixIcon: _buildCopyLinkIcon(context),
+ prefixIcon: _buildPrefixIcon(context),
+ suffixIcon: _buildSuffixIcon(context),
+ textStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
+ fontSize: 14,
+ height: 18.0 / 14.0,
+ ),
+ ),
+ );
+ }
+
+ Widget _buildPrefixIcon(BuildContext context) {
+ return ConstrainedBox(
+ constraints: const BoxConstraints(maxWidth: 230),
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ const HSpace(8.0),
+ Flexible(
+ child: FlowyText.regular(
+ ShareConstants.buildNamespaceUrl(
+ nameSpace: '${widget.namespace}/',
+ ),
+ fontSize: 14,
+ figmaLineHeight: 18.0,
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+ const HSpace(6.0),
+ const Padding(
+ padding: EdgeInsets.symmetric(vertical: 2.0),
+ child: VerticalDivider(
+ thickness: 1.0,
+ width: 1.0,
+ ),
+ ),
+ const HSpace(6.0),
+ ],
+ ),
+ );
+ }
+
+ Widget _buildSuffixIcon(BuildContext context) {
+ return showSaveButton
+ ? _buildSaveButton(context)
+ : _buildCopyLinkIcon(context);
+ }
+
+ Widget _buildSaveButton(BuildContext context) {
+ return Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 6),
+ child: FlowyButton(
+ useIntrinsicWidth: true,
+ text: FlowyText.regular(
+ LocaleKeys.button_save.tr(),
+ figmaLineHeight: 18.0,
+ ),
+ onTap: () {
+ widget.onSubmitted(widget.controller.text);
+ focusNode.unfocus();
+ },
),
);
}
Widget _buildCopyLinkIcon(BuildContext context) {
return FlowyHover(
+ style: const HoverStyle(
+ contentMargin: EdgeInsets.all(4),
+ ),
child: GestureDetector(
- onTap: () => onCopy(controller.text),
+ behavior: HitTestBehavior.opaque,
+ onTap: () => widget.onCopy(widget.controller.text),
child: Container(
- width: 36,
- height: 36,
+ width: 32,
+ height: 32,
alignment: Alignment.center,
- padding: const EdgeInsets.all(10),
+ padding: const EdgeInsets.all(6),
decoration: const BoxDecoration(
border: Border(left: BorderSide(color: Color(0x141F2329))),
),
diff --git a/frontend/appflowy_flutter/lib/plugins/shared/share/share_bloc.dart b/frontend/appflowy_flutter/lib/plugins/shared/share/share_bloc.dart
index 775ba67361..a713af6b02 100644
--- a/frontend/appflowy_flutter/lib/plugins/shared/share/share_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/shared/share/share_bloc.dart
@@ -5,6 +5,7 @@ import 'package:appflowy/workspace/application/export/document_exporter.dart';
import 'package:appflowy/workspace/application/settings/share/export_service.dart';
import 'package:appflowy/workspace/application/view/view_listener.dart';
import 'package:appflowy/workspace/application/view/view_service.dart';
+import 'package:appflowy_backend/dispatch/dispatch.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
@@ -36,86 +37,19 @@ class ShareBloc extends Bloc<ShareEvent, ShareState> {
add(const ShareEvent.updatePublishStatus());
},
- share: (type, path) async {
- if (ShareType.unimplemented.contains(type)) {
- Log.error('DocumentShareType $type is not implemented');
- return;
- }
-
- emit(state.copyWith(isLoading: true));
-
- final result = await _export(type, path);
-
- emit(
- state.copyWith(
- isLoading: false,
- exportResult: result,
- ),
- );
- },
- publish: (nameSpace, publishName, selectedViewIds) async {
- // set space name
- try {
- final result =
- await ViewBackendService.getPublishNameSpace().getOrThrow();
-
- await ViewBackendService.publish(
- view,
- name: publishName,
- selectedViewIds: selectedViewIds,
- ).getOrThrow();
-
- emit(
- state.copyWith(
- isPublished: true,
- publishResult: FlowySuccess(null),
- unpublishResult: null,
- url: ShareConstants.buildPublishUrl(
- nameSpace: result.namespace,
- publishName: publishName,
- ),
- ),
- );
-
- Log.info('publish success: ${result.namespace}/$publishName');
- } catch (e) {
- Log.error('publish error: $e');
-
- emit(
- state.copyWith(
- isPublished: false,
- publishResult: FlowyResult.failure(
- FlowyError(msg: 'publish error: $e'),
- ),
- unpublishResult: null,
- url: '',
- ),
- );
- }
- },
- unPublish: () async {
- emit(
- state.copyWith(
- publishResult: null,
- unpublishResult: null,
- ),
- );
-
- final result = await ViewBackendService.unpublish(view);
- final isPublished = !result.isSuccess;
- result.onFailure((f) {
- Log.error('unpublish error: $f');
- });
-
- emit(
- state.copyWith(
- isPublished: isPublished,
- publishResult: null,
- unpublishResult: result,
- url: result.fold((_) => '', (_) => state.url),
- ),
- );
- },
+ share: (type, path) async => _share(
+ type,
+ path,
+ emit,
+ ),
+ publish: (nameSpace, publishName, selectedViewIds) => _publish(
+ nameSpace,
+ publishName,
+ selectedViewIds,
+ emit,
+ ),
+ unPublish: () async => _unpublish(emit),
+ updatePublishStatus: () async => _updatePublishStatus(emit),
updateViewName: (viewName, viewId) async {
emit(state.copyWith(viewName: viewName, viewId: viewId));
},
@@ -127,45 +61,10 @@ class ShareBloc extends Bloc<ShareEvent, ShareState> {
),
);
},
- updatePublishStatus: () async {
- final publishInfo = await ViewBackendService.getPublishInfo(view);
- final enablePublish =
- await UserBackendService.getCurrentUserProfile().fold(
- (v) => v.authenticator == AuthenticatorPB.AppFlowyCloud,
- (p) => false,
- );
- String workspaceId = state.workspaceId;
- if (workspaceId.isEmpty) {
- workspaceId = await UserBackendService.getCurrentWorkspace()
- .fold((s) => s.id, (f) => '');
- }
- publishInfo.fold((s) {
- emit(
- state.copyWith(
- isPublished: true,
- url: ShareConstants.buildPublishUrl(
- nameSpace: s.namespace,
- publishName: s.publishName,
- ),
- viewName: view.name,
- enablePublish: enablePublish,
- workspaceId: workspaceId,
- viewId: view.id,
- ),
- );
- }, (f) {
- emit(
- state.copyWith(
- isPublished: false,
- url: '',
- viewName: view.name,
- enablePublish: enablePublish,
- workspaceId: workspaceId,
- viewId: view.id,
- ),
- );
- });
- },
+ updatePathName: (pathName) async => _updatePathName(
+ pathName,
+ emit,
+ ),
);
});
}
@@ -181,6 +80,174 @@ class ShareBloc extends Bloc<ShareEvent, ShareState> {
return super.close();
}
+ Future<void> _share(
+ ShareType type,
+ String? path,
+ Emitter<ShareState> emit,
+ ) async {
+ if (ShareType.unimplemented.contains(type)) {
+ Log.error('DocumentShareType $type is not implemented');
+ return;
+ }
+
+ emit(state.copyWith(isLoading: true));
+
+ final result = await _export(type, path);
+
+ emit(
+ state.copyWith(
+ isLoading: false,
+ exportResult: result,
+ ),
+ );
+ }
+
+ Future<void> _publish(
+ String nameSpace,
+ String publishName,
+ List<String> selectedViewIds,
+ Emitter<ShareState> emit,
+ ) async {
+ // set space name
+ try {
+ final result =
+ await ViewBackendService.getPublishNameSpace().getOrThrow();
+
+ await ViewBackendService.publish(
+ view,
+ name: publishName,
+ selectedViewIds: selectedViewIds,
+ ).getOrThrow();
+
+ emit(
+ state.copyWith(
+ isPublished: true,
+ publishResult: FlowySuccess(null),
+ unpublishResult: null,
+ namespace: result.namespace,
+ pathName: publishName,
+ url: ShareConstants.buildPublishUrl(
+ nameSpace: result.namespace,
+ publishName: publishName,
+ ),
+ ),
+ );
+
+ Log.info('publish success: ${result.namespace}/$publishName');
+ } catch (e) {
+ Log.error('publish error: $e');
+
+ emit(
+ state.copyWith(
+ isPublished: false,
+ publishResult: FlowyResult.failure(
+ FlowyError(msg: 'publish error: $e'),
+ ),
+ unpublishResult: null,
+ url: '',
+ ),
+ );
+ }
+ }
+
+ Future<void> _unpublish(Emitter<ShareState> emit) async {
+ emit(
+ state.copyWith(
+ publishResult: null,
+ unpublishResult: null,
+ ),
+ );
+
+ final result = await ViewBackendService.unpublish(view);
+ final isPublished = !result.isSuccess;
+ result.onFailure((f) {
+ Log.error('unpublish error: $f');
+ });
+
+ emit(
+ state.copyWith(
+ isPublished: isPublished,
+ publishResult: null,
+ unpublishResult: result,
+ url: result.fold((_) => '', (_) => state.url),
+ ),
+ );
+ }
+
+ Future<void> _updatePublishStatus(Emitter<ShareState> emit) async {
+ final publishInfo = await ViewBackendService.getPublishInfo(view);
+ final enablePublish = await UserBackendService.getCurrentUserProfile().fold(
+ (v) => v.authenticator == AuthenticatorPB.AppFlowyCloud,
+ (p) => false,
+ );
+ String workspaceId = state.workspaceId;
+ if (workspaceId.isEmpty) {
+ workspaceId = await UserBackendService.getCurrentWorkspace()
+ .fold((s) => s.id, (f) => '');
+ }
+ publishInfo.fold((s) {
+ emit(
+ state.copyWith(
+ isPublished: true,
+ namespace: s.namespace,
+ pathName: s.publishName,
+ url: ShareConstants.buildPublishUrl(
+ nameSpace: s.namespace,
+ publishName: s.publishName,
+ ),
+ viewName: view.name,
+ enablePublish: enablePublish,
+ workspaceId: workspaceId,
+ viewId: view.id,
+ ),
+ );
+ }, (f) {
+ emit(
+ state.copyWith(
+ isPublished: false,
+ url: '',
+ viewName: view.name,
+ enablePublish: enablePublish,
+ workspaceId: workspaceId,
+ viewId: view.id,
+ ),
+ );
+ });
+ }
+
+ Future<void> _updatePathName(
+ String pathName,
+ Emitter<ShareState> emit,
+ ) async {
+ emit(
+ state.copyWith(
+ updatePathNameResult: null,
+ ),
+ );
+ final request = SetPublishNamePB()
+ ..viewId = view.id
+ ..newName = pathName;
+ final result = await FolderEventSetPublishName(request).send();
+ emit(
+ state.copyWith(
+ updatePathNameResult: result,
+ publishResult: null,
+ unpublishResult: null,
+ pathName: result.fold(
+ (_) => pathName,
+ (f) => state.pathName,
+ ),
+ url: result.fold(
+ (s) => ShareConstants.buildPublishUrl(
+ nameSpace: state.namespace,
+ publishName: pathName,
+ ),
+ (f) => state.url,
+ ),
+ ),
+ );
+ }
+
Future<FlowyResult<ShareType, FlowyError>> _export(
ShareType type,
String? path,
@@ -281,6 +348,7 @@ class ShareEvent with _$ShareEvent {
const factory ShareEvent.updatePublishStatus() = _UpdatePublishStatus;
const factory ShareEvent.setPublishStatus(bool isPublished) =
_SetPublishStatus;
+ const factory ShareEvent.updatePathName(String pathName) = _UpdatePathName;
}
@freezed
@@ -294,8 +362,11 @@ class ShareState with _$ShareState {
FlowyResult<ShareType, FlowyError>? exportResult,
FlowyResult<void, FlowyError>? publishResult,
FlowyResult<void, FlowyError>? unpublishResult,
+ FlowyResult<void, FlowyError>? updatePathNameResult,
required String viewId,
required String workspaceId,
+ required String namespace,
+ required String pathName,
}) = _ShareState;
factory ShareState.initial() => const ShareState(
@@ -306,5 +377,7 @@ class ShareState with _$ShareState {
viewName: '',
viewId: '',
workspaceId: '',
+ namespace: '',
+ pathName: '',
);
}
diff --git a/frontend/appflowy_flutter/lib/shared/colors.dart b/frontend/appflowy_flutter/lib/shared/colors.dart
new file mode 100644
index 0000000000..4f6e1ecfeb
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/shared/colors.dart
@@ -0,0 +1,16 @@
+import 'package:appflowy/util/theme_extension.dart';
+import 'package:flutter/material.dart';
+
+extension SharedColors on BuildContext {
+ Color get proPrimaryColor {
+ return Theme.of(this).isLightMode
+ ? const Color(0xFF653E8C)
+ : const Color(0xFFE8E2EE);
+ }
+
+ Color get proSecondaryColor {
+ return Theme.of(this).isLightMode
+ ? const Color(0xFFE8E2EE)
+ : const Color(0xFF653E8C);
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/shared/error_code/error_code_map.dart b/frontend/appflowy_flutter/lib/shared/error_code/error_code_map.dart
new file mode 100644
index 0000000000..a9dc55e391
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/shared/error_code/error_code_map.dart
@@ -0,0 +1,43 @@
+import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy_backend/protobuf/flowy-error/code.pb.dart';
+import 'package:easy_localization/easy_localization.dart';
+
+extension PublishNameErrorCodeMap on ErrorCode {
+ String? get publishErrorMessage {
+ return switch (this) {
+ ErrorCode.PublishNameAlreadyExists =>
+ LocaleKeys.settings_sites_error_publishNameAlreadyInUse.tr(),
+ ErrorCode.PublishNameInvalidCharacter => LocaleKeys
+ .settings_sites_error_publishNameContainsInvalidCharacters
+ .tr(),
+ ErrorCode.PublishNameTooLong =>
+ LocaleKeys.settings_sites_error_publishNameTooLong.tr(),
+ ErrorCode.UserUnauthorized =>
+ LocaleKeys.settings_sites_error_publishPermissionDenied.tr(),
+ _ => null,
+ };
+ }
+}
+
+extension DomainErrorCodeMap on ErrorCode {
+ String? get namespaceErrorMessage {
+ return switch (this) {
+ ErrorCode.CustomNamespaceRequirePlanUpgrade =>
+ LocaleKeys.settings_sites_error_proPlanLimitation.tr(),
+ ErrorCode.CustomNamespaceAlreadyTaken =>
+ LocaleKeys.settings_sites_error_namespaceAlreadyInUse.tr(),
+ ErrorCode.InvalidNamespace ||
+ ErrorCode.InvalidRequest =>
+ LocaleKeys.settings_sites_error_invalidNamespace.tr(),
+ ErrorCode.CustomNamespaceTooLong =>
+ LocaleKeys.settings_sites_error_namespaceTooLong.tr(),
+ ErrorCode.CustomNamespaceTooShort =>
+ LocaleKeys.settings_sites_error_namespaceTooShort.tr(),
+ ErrorCode.CustomNamespaceReserved =>
+ LocaleKeys.settings_sites_error_namespaceIsReserved.tr(),
+ ErrorCode.CustomNamespaceInvalidCharacter =>
+ LocaleKeys.settings_sites_error_namespaceContainsInvalidCharacters.tr(),
+ _ => null,
+ };
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/emoji_skin_tone.dart b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/emoji_skin_tone.dart
index e802e0dba0..aa97980182 100644
--- a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/emoji_skin_tone.dart
+++ b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/emoji_skin_tone.dart
@@ -1,5 +1,4 @@
import 'package:appflowy/generated/locale_keys.g.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_picker.dart b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_picker.dart
index 93f194a8f5..4ae7e8e76c 100644
--- a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_picker.dart
+++ b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_picker.dart
@@ -10,7 +10,6 @@ import 'package:appflowy/shared/icon_emoji_picker/icon_search_bar.dart';
import 'package:appflowy/util/debounce.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart';
import 'package:appflowy_backend/log.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/user/presentation/screens/skip_log_in_screen.dart b/frontend/appflowy_flutter/lib/user/presentation/screens/skip_log_in_screen.dart
index 12c66961c6..ee089dfce0 100644
--- a/frontend/appflowy_flutter/lib/user/presentation/screens/skip_log_in_screen.dart
+++ b/frontend/appflowy_flutter/lib/user/presentation/screens/skip_log_in_screen.dart
@@ -9,7 +9,6 @@ import 'package:appflowy/user/presentation/router.dart';
import 'package:appflowy/user/presentation/widgets/widgets.dart';
import 'package:appflowy/workspace/application/settings/appearance/appearance_cubit.dart';
import 'package:appflowy_backend/log.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/language.dart';
import 'package:flowy_infra/size.dart';
diff --git a/frontend/appflowy_flutter/lib/util/string_extension.dart b/frontend/appflowy_flutter/lib/util/string_extension.dart
index cadd27fe80..0c6f0210a1 100644
--- a/frontend/appflowy_flutter/lib/util/string_extension.dart
+++ b/frontend/appflowy_flutter/lib/util/string_extension.dart
@@ -45,4 +45,14 @@ extension StringExtension on String {
// if it fails, try to parse the color as a hex string
return FlowyTint.fromId(this)?.color(context) ?? tryToColor();
}
+
+ String orDefault(String defaultValue) {
+ return isEmpty ? defaultValue : this;
+ }
+}
+
+extension NullableStringExtension on String? {
+ String orDefault(String defaultValue) {
+ return this?.isEmpty ?? true ? defaultValue : this ?? '';
+ }
}
diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/settings_dialog_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/settings_dialog_bloc.dart
index f28900d18a..7edb1483d4 100644
--- a/frontend/appflowy_flutter/lib/workspace/application/settings/settings_dialog_bloc.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/settings/settings_dialog_bloc.dart
@@ -1,5 +1,3 @@
-import 'package:flutter/foundation.dart';
-
import 'package:appflowy/user/application/user_listener.dart';
import 'package:appflowy_backend/dispatch/dispatch.dart';
import 'package:appflowy_backend/log.dart';
@@ -8,6 +6,7 @@ import 'package:appflowy_backend/protobuf/flowy-user/auth.pbenum.dart';
import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';
import 'package:appflowy_backend/protobuf/flowy-user/workspace.pb.dart';
import 'package:appflowy_result/appflowy_result.dart';
+import 'package:flutter/foundation.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
@@ -22,6 +21,7 @@ enum SettingsPage {
ai,
plan,
billing,
+ sites,
// OLD
notifications,
cloud,
diff --git a/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart b/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart
index ebaca4e607..dc7e5e97a9 100644
--- a/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart
@@ -13,7 +13,7 @@ import 'package:appflowy/plugins/document/document.dart';
import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';
import 'package:appflowy/startup/plugin/plugin.dart';
import 'package:appflowy/workspace/application/sidebar/space/space_bloc.dart';
-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
@@ -52,6 +52,20 @@ class ViewExtKeys {
static String spacePermissionKey = 'space_permission';
}
+extension MinimalViewExtension on FolderViewMinimalPB {
+ Widget defaultIcon({Size? size}) => FlowySvg(
+ switch (layout) {
+ ViewLayoutPB.Board => FlowySvgs.icon_board_s,
+ ViewLayoutPB.Calendar => FlowySvgs.icon_calendar_s,
+ ViewLayoutPB.Grid => FlowySvgs.icon_grid_s,
+ ViewLayoutPB.Document => FlowySvgs.icon_document_s,
+ ViewLayoutPB.Chat => FlowySvgs.chat_ai_page_s,
+ _ => FlowySvgs.document_s,
+ },
+ size: size,
+ );
+}
+
extension ViewExtension on ViewPB {
String get nameOrDefault =>
name.isEmpty ? LocaleKeys.menuAppHeader_defaultNewPageName.tr() : name;
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/favorites/favorite_menu.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/favorites/favorite_menu.dart
index 2255e544ed..1bf6635037 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/favorites/favorite_menu.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/favorites/favorite_menu.dart
@@ -9,7 +9,6 @@ import 'package:appflowy/workspace/presentation/home/menu/sidebar/favorites/favo
import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/shared_widget.dart';
import 'package:appflowy/workspace/presentation/home/menu/view/view_item.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/footer/sidebar_toast.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/footer/sidebar_toast.dart
index 5d581a9136..aec8ceeb2f 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/footer/sidebar_toast.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/footer/sidebar_toast.dart
@@ -11,7 +11,6 @@ import 'package:appflowy/workspace/presentation/home/menu/sidebar/shared/sidebar
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-user/workspace.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/shared/sidebar_setting.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/shared/sidebar_setting.dart
index 95c60b15a3..84a76cfe83 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/shared/sidebar_setting.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/shared/sidebar_setting.dart
@@ -101,7 +101,7 @@ void showSettingsDialog(
UserWorkspaceBloc? bloc,
SettingsPage? initPage,
]) {
- AFFocusManager.of(context).notifyLoseFocus();
+ AFFocusManager.maybeOf(context)?.notifyLoseFocus();
showDialog(
context: context,
builder: (dialogContext) => MultiBlocProvider(
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart
index 11b9f1f18a..7afb4a6298 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart
@@ -13,7 +13,6 @@ import 'package:appflowy/workspace/presentation/home/menu/view/view_item.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/style_widget/hover.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space_menu.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space_menu.dart
index 11ca090789..f4d910700d 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space_menu.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space_menu.dart
@@ -6,7 +6,6 @@ import 'package:appflowy/workspace/presentation/home/home_sizes.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/create_space_popup.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_icon.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart
index 419e191857..de2c601e2c 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart
@@ -7,7 +7,6 @@ import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';
import 'package:appflowy/shared/icon_emoji_picker/tab.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_icon.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart' hide Icon;
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_more_popup.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_more_popup.dart
index 5bed313bae..d7eb5330aa 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_more_popup.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_more_popup.dart
@@ -7,7 +7,6 @@ import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_ac
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_actions.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_actions.dart
index 32a65bc803..a74da7de46 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_actions.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_actions.dart
@@ -6,7 +6,6 @@ import 'package:appflowy/workspace/presentation/settings/widgets/members/workspa
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_icon.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_icon.dart
index fd044e0aa6..9669ac217d 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_icon.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_icon.dart
@@ -3,7 +3,6 @@ import 'package:appflowy/plugins/base/emoji/emoji_picker_screen.dart';
import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy/util/color_generator/color_generator.dart';
import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_menu.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_menu.dart
index bb9b89b04d..bdb73876be 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_menu.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_menu.dart
@@ -10,7 +10,6 @@ import 'package:appflowy/workspace/presentation/settings/widgets/members/workspa
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/file_picker/file_picker_service.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/sidebar_workspace.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/sidebar_workspace.dart
index 2792987a06..8012fcc9e4 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/sidebar_workspace.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/sidebar_workspace.dart
@@ -10,7 +10,6 @@ import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-error/code.pbenum.dart';
import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_add_button.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_add_button.dart
index 6563a8055d..d0b99e2a5d 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_add_button.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_add_button.dart
@@ -5,7 +5,6 @@ import 'package:appflowy/startup/plugin/plugin.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/import/import_panel.dart';
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
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
index 2da4702b71..d3a2fc3c4f 100644
--- 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
@@ -25,7 +25,6 @@ import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/style_widget/hover.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_more_action_button.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_more_action_button.dart
index cc760e5087..ba9a946cc2 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_more_action_button.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_more_action_button.dart
@@ -7,7 +7,6 @@ import 'package:appflowy/workspace/presentation/home/menu/view/view_action_type.
import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_button.dart b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_button.dart
index f9398014df..c6c216e409 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_button.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_button.dart
@@ -6,7 +6,6 @@ import 'package:appflowy/user/application/reminder/reminder_bloc.dart';
import 'package:appflowy/workspace/application/menu/sidebar_sections_bloc.dart';
import 'package:appflowy/workspace/application/settings/notifications/notification_settings_cubit.dart';
import 'package:appflowy/workspace/presentation/notifications/notification_dialog.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_item.dart
index 112ffab402..f85df0e6d1 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_item.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_item.dart
@@ -6,7 +6,6 @@ import 'package:appflowy/workspace/application/settings/date_time/date_format_ex
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:fixnum/fixnum.dart';
import 'package:flowy_infra/size.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_comparison_dialog.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_comparison_dialog.dart
index 3ce6c6aca2..2cda9a1e03 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_comparison_dialog.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_comparison_dialog.dart
@@ -1,5 +1,3 @@
-import 'package:flutter/material.dart';
-
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/util/theme_extension.dart';
import 'package:appflowy/workspace/application/settings/plan/settings_plan_bloc.dart';
@@ -11,6 +9,7 @@ import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../../generated/locale_keys.g.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_view.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_view.dart
index 24e35ce454..61cb83d1ae 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_view.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_view.dart
@@ -2,6 +2,7 @@ import 'dart:io';
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/shared/colors.dart';
import 'package:appflowy/shared/flowy_error_page.dart';
import 'package:appflowy/util/int64_extension.dart';
import 'package:appflowy/util/theme_extension.dart';
@@ -540,12 +541,6 @@ class _ToggleMoreState extends State<_ToggleMore> {
@override
Widget build(BuildContext context) {
- final isLM = Theme.of(context).isLightMode;
- final primaryColor =
- isLM ? const Color(0xFF653E8C) : const Color(0xFFE8E2EE);
- final secondaryColor =
- isLM ? const Color(0xFFE8E2EE) : const Color(0xFF653E8C);
-
return Row(
children: [
Toggle(
@@ -576,11 +571,11 @@ class _ToggleMoreState extends State<_ToggleMore> {
height: 26,
child: Badge(
padding: const EdgeInsets.symmetric(horizontal: 10),
- backgroundColor: secondaryColor,
+ backgroundColor: context.proSecondaryColor,
label: FlowyText.semibold(
widget.badgeLabel!,
fontSize: 12,
- color: primaryColor,
+ color: context.proPrimaryColor,
),
),
),
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_workspace_view.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_workspace_view.dart
index db99fca2e7..159171e55e 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_workspace_view.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_workspace_view.dart
@@ -35,7 +35,6 @@ import 'package:appflowy/workspace/presentation/settings/widgets/theme_upload/th
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy/workspace/presentation/widgets/toggle/toggle.dart';
import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/language.dart';
import 'package:flowy_infra/plugins/bloc/dynamic_plugin_bloc.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/constants.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/constants.dart
new file mode 100644
index 0000000000..7c9c24cd5d
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/constants.dart
@@ -0,0 +1,59 @@
+import 'package:appflowy/core/helpers/url_launcher.dart';
+import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/copy_and_paste/clipboard_service.dart';
+import 'package:appflowy/plugins/shared/share/constants.dart';
+import 'package:appflowy/startup/startup.dart';
+import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+
+class SettingsPageSitesConstants {
+ static const threeDotsButtonWidth = 26.0;
+
+ static final dateFormat = DateFormat('MMM d, yyyy');
+
+ static final publishedViewHeaderTitles = [
+ LocaleKeys.settings_sites_publishedPage_page.tr(),
+ LocaleKeys.settings_sites_publishedPage_pathName.tr(),
+ LocaleKeys.settings_sites_publishedPage_date.tr(),
+ ];
+
+ static final namespaceHeaderTitles = [
+ LocaleKeys.settings_sites_namespaceHeader.tr(),
+ LocaleKeys.settings_sites_homepageHeader.tr(),
+ ];
+
+ // the published view name is longer than the other two, so we give it more flex
+ static final publishedViewItemFlexes = [1, 1, 1];
+}
+
+class SettingsPageSitesEvent {
+ static void visitSite(
+ PublishInfoViewPB publishInfoView, {
+ String? nameSpace,
+ }) {
+ // visit the site
+ final url = ShareConstants.buildPublishUrl(
+ nameSpace: nameSpace ?? publishInfoView.info.namespace,
+ publishName: publishInfoView.info.publishName,
+ );
+ afLaunchUrlString(url);
+ }
+
+ static void copySiteLink(
+ BuildContext context,
+ PublishInfoViewPB publishInfoView, {
+ String? nameSpace,
+ }) {
+ final url = ShareConstants.buildPublishUrl(
+ nameSpace: nameSpace ?? publishInfoView.info.namespace,
+ publishName: publishInfoView.info.publishName,
+ );
+ getIt<ClipboardService>().setData(ClipboardServiceData(plainText: url));
+ showToastNotification(
+ context,
+ message: LocaleKeys.grid_url_copy.tr(),
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/domain_header.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/domain_header.dart
new file mode 100644
index 0000000000..23a1bb2d7f
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/domain_header.dart
@@ -0,0 +1,28 @@
+import 'package:appflowy/workspace/presentation/settings/pages/sites/constants.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/material.dart';
+
+class DomainHeader extends StatelessWidget {
+ const DomainHeader({
+ super.key,
+ });
+
+ @override
+ Widget build(BuildContext context) {
+ return Row(
+ children: [
+ ...SettingsPageSitesConstants.namespaceHeaderTitles.map(
+ (title) => Expanded(
+ child: FlowyText.medium(
+ title,
+ fontSize: 14.0,
+ textAlign: TextAlign.left,
+ ),
+ ),
+ ),
+ // it used to align the three dots button in the published page item
+ const HSpace(SettingsPageSitesConstants.threeDotsButtonWidth),
+ ],
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/domain_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/domain_item.dart
new file mode 100644
index 0000000000..001f34bddc
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/domain_item.dart
@@ -0,0 +1,204 @@
+import 'package:appflowy/core/helpers/url_launcher.dart';
+import 'package:appflowy/generated/flowy_svgs.g.dart';
+import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/plugins/shared/share/constants.dart';
+import 'package:appflowy/shared/af_role_pb_extension.dart';
+import 'package:appflowy/shared/colors.dart';
+import 'package:appflowy/workspace/application/user/user_workspace_bloc.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/domain/domain_more_action.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/domain/home_page_menu.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/publish_info_view_item.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/settings_sites_bloc.dart';
+import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
+import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class DomainItem extends StatelessWidget {
+ const DomainItem({
+ super.key,
+ required this.namespace,
+ required this.homepage,
+ });
+
+ final String namespace;
+ final String homepage;
+
+ @override
+ Widget build(BuildContext context) {
+ final namespaceUrl = ShareConstants.buildNamespaceUrl(
+ nameSpace: namespace,
+ );
+ return Row(
+ mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+ children: [
+ // Namespace
+ Expanded(
+ child: _buildNamespace(context, namespaceUrl),
+ ),
+ // Homepage
+ Expanded(
+ child: _buildHomepage(context),
+ ),
+ // ... button
+ DomainMoreAction(namespace: namespace),
+ ],
+ );
+ }
+
+ Widget _buildNamespace(BuildContext context, String namespaceUrl) {
+ return Container(
+ alignment: Alignment.centerLeft,
+ padding: const EdgeInsets.only(right: 12.0),
+ child: FlowyButton(
+ useIntrinsicWidth: true,
+ text: FlowyText(
+ namespaceUrl,
+ fontSize: 14.0,
+ overflow: TextOverflow.ellipsis,
+ ),
+ onTap: () {
+ final namespaceUrl = ShareConstants.buildNamespaceUrl(
+ nameSpace: namespace,
+ withHttps: true,
+ );
+ afLaunchUrlString(namespaceUrl);
+ },
+ ),
+ );
+ }
+
+ Widget _buildHomepage(BuildContext context) {
+ final plan = context.read<SettingsSitesBloc>().state.subscriptionInfo?.plan;
+
+ if (plan == null) {
+ return const SizedBox.shrink();
+ }
+
+ final isFreePlan = plan == WorkspacePlanPB.FreePlan;
+ if (isFreePlan) {
+ return const _FreePlanUpgradeButton();
+ }
+
+ return const _HomePageButton();
+ }
+}
+
+class _HomePageButton extends StatelessWidget {
+ const _HomePageButton();
+
+ @override
+ Widget build(BuildContext context) {
+ final isOwner = context
+ .watch<UserWorkspaceBloc>()
+ .state
+ .currentWorkspaceMember
+ ?.role
+ .isOwner ??
+ false;
+ final homePageView = context.watch<SettingsSitesBloc>().state.homePageView;
+
+ Widget child = homePageView == null
+ ? _defaultHomePageButton(context)
+ : PublishInfoViewItem(
+ publishInfoView: homePageView,
+ margin: isOwner ? null : EdgeInsets.zero,
+ );
+
+ if (isOwner) {
+ child = AppFlowyPopover(
+ direction: PopoverDirection.bottomWithCenterAligned,
+ constraints: const BoxConstraints(
+ maxWidth: 260,
+ maxHeight: 345,
+ ),
+ margin: const EdgeInsets.symmetric(
+ horizontal: 14.0,
+ vertical: 12.0,
+ ),
+ popupBuilder: (_) {
+ final bloc = context.read<SettingsSitesBloc>();
+ return BlocProvider.value(
+ value: bloc,
+ child: SelectHomePageMenu(
+ userProfile: bloc.user,
+ workspaceId: bloc.workspaceId,
+ onSelected: (view) {},
+ ),
+ );
+ },
+ child: child,
+ );
+ } else {
+ child = FlowyTooltip(
+ message: LocaleKeys
+ .settings_sites_namespace_onlyWorkspaceOwnerCanSetHomePage
+ .tr(),
+ child: IgnorePointer(
+ child: child,
+ ),
+ );
+ }
+
+ return Container(
+ alignment: Alignment.centerLeft,
+ child: child,
+ );
+ }
+
+ Widget _defaultHomePageButton(BuildContext context) {
+ return FlowyButton(
+ useIntrinsicWidth: true,
+ leftIcon: const FlowySvg(
+ FlowySvgs.search_s,
+ ),
+ leftIconSize: const Size.square(14.0),
+ text: FlowyText(
+ LocaleKeys.settings_sites_selectHomePage.tr(),
+ figmaLineHeight: 18.0,
+ ),
+ );
+ }
+}
+
+class _FreePlanUpgradeButton extends StatelessWidget {
+ const _FreePlanUpgradeButton();
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ alignment: Alignment.centerLeft,
+ child: FlowyTooltip(
+ message: LocaleKeys.settings_sites_namespace_upgradeToPro.tr(),
+ child: PrimaryRoundedButton(
+ text: 'Pro ↗',
+ fontSize: 12.0,
+ figmaLineHeight: 16.0,
+ fontWeight: FontWeight.w600,
+ radius: 8.0,
+ textColor: context.proPrimaryColor,
+ backgroundColor: context.proSecondaryColor,
+ margin: const EdgeInsets.symmetric(
+ horizontal: 8.0,
+ vertical: 6.0,
+ ),
+ hoverColor: context.proSecondaryColor.withOpacity(0.9),
+ onTap: () {
+ showToastNotification(
+ context,
+ message:
+ LocaleKeys.settings_sites_namespace_redirectToPayment.tr(),
+ type: ToastificationType.info,
+ );
+
+ context.read<SettingsSitesBloc>().add(
+ const SettingsSitesEvent.upgradeSubscription(),
+ );
+ },
+ ),
+ ),
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/domain_more_action.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/domain_more_action.dart
new file mode 100644
index 0000000000..25e02ff06b
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/domain_more_action.dart
@@ -0,0 +1,238 @@
+import 'package:appflowy/generated/flowy_svgs.g.dart';
+import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/shared/af_role_pb_extension.dart';
+import 'package:appflowy/workspace/application/user/user_workspace_bloc.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/constants.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/domain/domain_settings_dialog.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/settings_sites_bloc.dart';
+import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
+import 'package:appflowy_backend/protobuf/flowy-user/workspace.pb.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class DomainMoreAction extends StatefulWidget {
+ const DomainMoreAction({
+ super.key,
+ required this.namespace,
+ });
+
+ final String namespace;
+
+ @override
+ State<DomainMoreAction> createState() => _DomainMoreActionState();
+}
+
+class _DomainMoreActionState extends State<DomainMoreAction> {
+ @override
+ void initState() {
+ super.initState();
+
+ // update the current workspace to ensure the owner check is correct
+ context.read<UserWorkspaceBloc>().add(const UserWorkspaceEvent.initial());
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return AppFlowyPopover(
+ constraints: const BoxConstraints(maxWidth: 188),
+ offset: const Offset(6, 0),
+ animationDuration: Durations.short3,
+ beginScaleFactor: 1.0,
+ beginOpacity: 0.8,
+ child: const SizedBox(
+ width: SettingsPageSitesConstants.threeDotsButtonWidth,
+ child: FlowyButton(
+ useIntrinsicWidth: true,
+ text: FlowySvg(FlowySvgs.three_dots_s),
+ ),
+ ),
+ popupBuilder: (builderContext) {
+ return BlocProvider.value(
+ value: context.read<SettingsSitesBloc>(),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ _buildUpdateNamespaceButton(
+ context,
+ builderContext,
+ ),
+ _buildRemoveHomePageButton(
+ context,
+ builderContext,
+ ),
+ ],
+ ),
+ );
+ },
+ );
+ }
+
+ Widget _buildUpdateNamespaceButton(
+ BuildContext context,
+ BuildContext builderContext,
+ ) {
+ final child = _buildActionButton(
+ context,
+ builderContext,
+ type: _ActionType.updateNamespace,
+ );
+
+ return _onlyOwnerCanDoWidget(
+ context,
+ tooltipMessage: LocaleKeys
+ .settings_sites_error_onlyWorkspaceOwnerCanUpdateNamespace
+ .tr(),
+ child: child,
+ );
+ }
+
+ Widget _buildRemoveHomePageButton(
+ BuildContext context,
+ BuildContext builderContext,
+ ) {
+ final plan = context.read<SettingsSitesBloc>().state.subscriptionInfo?.plan;
+ final homePageView = context.read<SettingsSitesBloc>().state.homePageView;
+
+ if (plan == null ||
+ plan == WorkspacePlanPB.FreePlan ||
+ homePageView == null) {
+ return const SizedBox.shrink();
+ }
+
+ final child = _buildActionButton(
+ context,
+ builderContext,
+ type: _ActionType.removeHomePage,
+ );
+
+ return _onlyOwnerCanDoWidget(
+ context,
+ tooltipMessage: LocaleKeys
+ .settings_sites_error_onlyWorkspaceOwnerCanRemoveHomepage
+ .tr(),
+ child: child,
+ );
+ }
+
+ Widget _onlyOwnerCanDoWidget(
+ BuildContext context, {
+ required String tooltipMessage,
+ required Widget child,
+ }) {
+ final isOwner = context
+ .watch<UserWorkspaceBloc>()
+ .state
+ .currentWorkspaceMember
+ ?.role
+ .isOwner ??
+ false;
+
+ if (!isOwner) {
+ return Opacity(
+ opacity: 0.5,
+ child: FlowyTooltip(
+ message: tooltipMessage,
+ child: MouseRegion(
+ cursor: SystemMouseCursors.forbidden,
+ child: IgnorePointer(child: child),
+ ),
+ ),
+ );
+ }
+
+ return child;
+ }
+
+ Widget _buildActionButton(
+ BuildContext context,
+ BuildContext builderContext, {
+ required _ActionType type,
+ }) {
+ return Container(
+ height: 34,
+ padding: const EdgeInsets.symmetric(vertical: 2.0),
+ child: FlowyIconTextButton(
+ margin: const EdgeInsets.symmetric(horizontal: 6),
+ iconPadding: 10.0,
+ onTap: () => _onTap(context, builderContext, type),
+ leftIconBuilder: (onHover) => FlowySvg(
+ type.leftIconSvg,
+ ),
+ textBuilder: (onHover) => FlowyText.regular(
+ type.name,
+ fontSize: 14.0,
+ figmaLineHeight: 18.0,
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+ );
+ }
+
+ void _onTap(
+ BuildContext context,
+ BuildContext builderContext,
+ _ActionType type,
+ ) {
+ switch (type) {
+ case _ActionType.updateNamespace:
+ _showSettingsDialog(
+ context,
+ builderContext,
+ );
+ break;
+ case _ActionType.removeHomePage:
+ context.read<SettingsSitesBloc>().add(
+ const SettingsSitesEvent.removeHomePage(),
+ );
+ break;
+ }
+
+ PopoverContainer.of(builderContext).closeAll();
+ }
+
+ void _showSettingsDialog(
+ BuildContext context,
+ BuildContext builderContext,
+ ) {
+ showDialog(
+ context: context,
+ builder: (_) {
+ return BlocProvider.value(
+ value: context.read<SettingsSitesBloc>(),
+ child: Dialog(
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(12.0),
+ ),
+ child: SizedBox(
+ width: 460,
+ child: DomainSettingsDialog(
+ namespace: widget.namespace,
+ ),
+ ),
+ ),
+ );
+ },
+ );
+ }
+}
+
+enum _ActionType {
+ updateNamespace,
+ removeHomePage,
+}
+
+extension _ActionTypeExtension on _ActionType {
+ String get name => switch (this) {
+ _ActionType.updateNamespace =>
+ LocaleKeys.settings_sites_updateNamespace.tr(),
+ _ActionType.removeHomePage =>
+ LocaleKeys.settings_sites_removeHomepage.tr(),
+ };
+
+ FlowySvgData get leftIconSvg => switch (this) {
+ _ActionType.updateNamespace => FlowySvgs.view_item_rename_s,
+ _ActionType.removeHomePage => FlowySvgs.trash_s,
+ };
+}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/domain_settings_dialog.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/domain_settings_dialog.dart
new file mode 100644
index 0000000000..d3b987ab4a
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/domain_settings_dialog.dart
@@ -0,0 +1,245 @@
+import 'package:appflowy/generated/flowy_svgs.g.dart';
+import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/plugins/shared/share/constants.dart';
+import 'package:appflowy/plugins/shared/share/publish_color_extension.dart';
+import 'package:appflowy/shared/error_code/error_code_map.dart';
+import 'package:appflowy/util/string_extension.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/settings_sites_bloc.dart';
+import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
+import 'package:appflowy_backend/log.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class DomainSettingsDialog extends StatefulWidget {
+ const DomainSettingsDialog({
+ super.key,
+ required this.namespace,
+ });
+
+ final String namespace;
+
+ @override
+ State<DomainSettingsDialog> createState() => _DomainSettingsDialogState();
+}
+
+class _DomainSettingsDialogState extends State<DomainSettingsDialog> {
+ final focusNode = FocusNode();
+ final controller = TextEditingController();
+ late final controllerText = ValueNotifier<String>(widget.namespace);
+ String errorHintText = '';
+
+ @override
+ void initState() {
+ super.initState();
+
+ controller.text = widget.namespace;
+ controller.addListener(() {
+ controllerText.value = controller.text;
+ });
+ }
+
+ @override
+ void dispose() {
+ focusNode.dispose();
+ controller.dispose();
+ controllerText.dispose();
+
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocListener<SettingsSitesBloc, SettingsSitesState>(
+ listener: _onListener,
+ child: KeyboardListener(
+ focusNode: focusNode,
+ autofocus: true,
+ onKeyEvent: (event) {
+ if (event is KeyDownEvent &&
+ event.logicalKey == LogicalKeyboardKey.escape) {
+ Navigator.of(context).pop();
+ }
+ },
+ child: Container(
+ padding: const EdgeInsets.all(20),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ _buildTitle(),
+ const VSpace(12),
+ _buildNamespaceDescription(),
+ const VSpace(20),
+ _buildNamespaceTextField(),
+ _buildPreviewNamespace(),
+ _buildErrorHintText(),
+ const VSpace(20),
+ _buildButtons(),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+
+ Widget _buildTitle() {
+ return Row(
+ children: [
+ FlowyText(
+ LocaleKeys.settings_sites_namespace_updateExistingNamespace.tr(),
+ fontSize: 16.0,
+ figmaLineHeight: 22.0,
+ fontWeight: FontWeight.w500,
+ overflow: TextOverflow.ellipsis,
+ ),
+ const HSpace(6.0),
+ FlowyTooltip(
+ message: LocaleKeys.settings_sites_namespace_tooltip.tr(),
+ child: const FlowySvg(FlowySvgs.information_s),
+ ),
+ const HSpace(6.0),
+ const Spacer(),
+ FlowyButton(
+ margin: const EdgeInsets.all(3),
+ useIntrinsicWidth: true,
+ text: const FlowySvg(
+ FlowySvgs.upgrade_close_s,
+ size: Size.square(18.0),
+ ),
+ onTap: () => Navigator.of(context).pop(),
+ ),
+ ],
+ );
+ }
+
+ Widget _buildNamespaceDescription() {
+ return FlowyText(
+ LocaleKeys.settings_sites_namespace_description.tr(),
+ fontSize: 14.0,
+ color: Theme.of(context).hintColor,
+ figmaLineHeight: 16.0,
+ maxLines: 3,
+ );
+ }
+
+ Widget _buildNamespaceTextField() {
+ return SizedBox(
+ height: 36,
+ child: FlowyTextField(
+ autoFocus: false,
+ controller: controller,
+ enableBorderColor: ShareMenuColors.borderColor(context),
+ ),
+ );
+ }
+
+ Widget _buildButtons() {
+ return Row(
+ mainAxisAlignment: MainAxisAlignment.end,
+ children: [
+ OutlinedRoundedButton(
+ text: LocaleKeys.button_cancel.tr(),
+ onTap: () => Navigator.of(context).pop(),
+ ),
+ const HSpace(12.0),
+ PrimaryRoundedButton(
+ text: LocaleKeys.button_save.tr(),
+ radius: 8.0,
+ margin: const EdgeInsets.symmetric(
+ horizontal: 16.0,
+ vertical: 9.0,
+ ),
+ onTap: _onSave,
+ ),
+ ],
+ );
+ }
+
+ Widget _buildErrorHintText() {
+ if (errorHintText.isEmpty) {
+ return const SizedBox.shrink();
+ }
+
+ return Padding(
+ padding: const EdgeInsets.only(top: 4.0, left: 2.0),
+ child: FlowyText(
+ errorHintText,
+ fontSize: 12.0,
+ figmaLineHeight: 18.0,
+ color: Theme.of(context).colorScheme.error,
+ ),
+ );
+ }
+
+ Widget _buildPreviewNamespace() {
+ return ValueListenableBuilder<String>(
+ valueListenable: controllerText,
+ builder: (context, value, child) {
+ final url = ShareConstants.buildNamespaceUrl(
+ nameSpace: value,
+ );
+ return Padding(
+ padding: const EdgeInsets.only(top: 4.0, left: 2.0),
+ child: Opacity(
+ opacity: 0.8,
+ child: FlowyText(
+ url,
+ fontSize: 14.0,
+ figmaLineHeight: 18.0,
+ withTooltip: true,
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+ );
+ },
+ );
+ }
+
+ void _onSave() {
+ // listen on the result
+ context.read<SettingsSitesBloc>().add(
+ SettingsSitesEvent.updateNamespace(controller.text),
+ );
+ }
+
+ void _onListener(BuildContext context, SettingsSitesState state) {
+ final actionResult = state.actionResult;
+ final type = actionResult?.actionType;
+ final result = actionResult?.result;
+ if (type != SettingsSitesActionType.updateNamespace || result == null) {
+ return;
+ }
+
+ result.fold(
+ (s) {
+ showToastNotification(
+ context,
+ message: LocaleKeys.settings_sites_success_namespaceUpdated.tr(),
+ );
+
+ Navigator.of(context).pop();
+ },
+ (f) {
+ final basicErrorMessage =
+ LocaleKeys.settings_sites_error_failedToUpdateNamespace.tr();
+ final errorMessage = f.code.namespaceErrorMessage;
+
+ setState(() {
+ errorHintText = errorMessage.orDefault(basicErrorMessage);
+ });
+
+ Log.error('Failed to update namespace: $f');
+
+ showToastNotification(
+ context,
+ message: basicErrorMessage,
+ type: ToastificationType.error,
+ description: errorMessage,
+ );
+ },
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/home_page_menu.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/home_page_menu.dart
new file mode 100644
index 0000000000..90d6b4d4b4
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/home_page_menu.dart
@@ -0,0 +1,102 @@
+import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/shared_widget.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/publish_info_view_item.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/settings_sites_bloc.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
+import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+typedef OnSelectedHomePage = void Function(ViewPB view);
+
+class SelectHomePageMenu extends StatefulWidget {
+ const SelectHomePageMenu({
+ super.key,
+ required this.onSelected,
+ required this.userProfile,
+ required this.workspaceId,
+ });
+
+ final OnSelectedHomePage onSelected;
+ final UserProfilePB userProfile;
+ final String workspaceId;
+
+ @override
+ State<SelectHomePageMenu> createState() => _SelectHomePageMenuState();
+}
+
+class _SelectHomePageMenuState extends State<SelectHomePageMenu> {
+ List<PublishInfoViewPB> source = [];
+ List<PublishInfoViewPB> views = [];
+
+ @override
+ void initState() {
+ super.initState();
+
+ source = context.read<SettingsSitesBloc>().state.publishedViews;
+ views = [...source];
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ if (views.isEmpty) {
+ return _buildNoPublishedViews();
+ }
+
+ return _buildMenu(context);
+ }
+
+ Widget _buildNoPublishedViews() {
+ return FlowyText.regular(
+ LocaleKeys.settings_sites_publishedPage_noPublishedPages.tr(),
+ color: Theme.of(context).hintColor,
+ overflow: TextOverflow.ellipsis,
+ );
+ }
+
+ Widget _buildMenu(BuildContext context) {
+ return Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ SpaceSearchField(
+ width: 240,
+ onSearch: (context, value) => _onSearch(value),
+ ),
+ const VSpace(10),
+ ...views.map(
+ (view) => Padding(
+ padding: const EdgeInsets.symmetric(vertical: 4.0),
+ child: PublishInfoViewItem(
+ publishInfoView: view,
+ useIntrinsicWidth: false,
+ onTap: () {
+ context.read<SettingsSitesBloc>().add(
+ SettingsSitesEvent.setHomePage(view.info.viewId),
+ );
+
+ PopoverContainer.of(context).close();
+ },
+ ),
+ ),
+ ),
+ ],
+ );
+ }
+
+ void _onSearch(String value) {
+ setState(() {
+ if (value.isEmpty) {
+ views = source;
+ } else {
+ views = source
+ .where(
+ (view) =>
+ view.view.name.toLowerCase().contains(value.toLowerCase()),
+ )
+ .toList();
+ }
+ });
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/publish_info_view_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/publish_info_view_item.dart
new file mode 100644
index 0000000000..d7ddf81874
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/publish_info_view_item.dart
@@ -0,0 +1,56 @@
+import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/util/string_extension.dart';
+import 'package:appflowy/workspace/application/view/view_ext.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/material.dart';
+
+class PublishInfoViewItem extends StatelessWidget {
+ const PublishInfoViewItem({
+ super.key,
+ required this.publishInfoView,
+ this.onTap,
+ this.useIntrinsicWidth = true,
+ this.margin,
+ });
+
+ final PublishInfoViewPB publishInfoView;
+ final VoidCallback? onTap;
+ final bool useIntrinsicWidth;
+ final EdgeInsets? margin;
+
+ @override
+ Widget build(BuildContext context) {
+ final name = publishInfoView.view.name;
+ return Container(
+ alignment: Alignment.centerLeft,
+ child: FlowyButton(
+ margin: margin,
+ useIntrinsicWidth: useIntrinsicWidth,
+ mainAxisAlignment: MainAxisAlignment.start,
+ leftIcon: _buildIcon(),
+ text: FlowyText.regular(
+ name.orDefault(
+ LocaleKeys.menuAppHeader_defaultNewPageName.tr(),
+ ),
+ fontSize: 14.0,
+ figmaLineHeight: 18.0,
+ overflow: TextOverflow.ellipsis,
+ ),
+ onTap: onTap,
+ ),
+ );
+ }
+
+ Widget _buildIcon() {
+ final icon = publishInfoView.view.icon.value;
+ return icon.isNotEmpty
+ ? FlowyText.emoji(
+ icon,
+ fontSize: 16.0,
+ figmaLineHeight: 18.0,
+ )
+ : publishInfoView.view.defaultIcon();
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_item.dart
new file mode 100644
index 0000000000..e909cf356d
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_item.dart
@@ -0,0 +1,83 @@
+import 'package:appflowy/startup/startup.dart';
+import 'package:appflowy/util/navigator_context_exntesion.dart';
+import 'package:appflowy/workspace/application/action_navigation/action_navigation_bloc.dart';
+import 'package:appflowy/workspace/application/action_navigation/navigation_action.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/constants.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/publish_info_view_item.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/published_page/published_view_more_action.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/material.dart';
+
+class PublishedViewItem extends StatelessWidget {
+ const PublishedViewItem({
+ super.key,
+ required this.publishInfoView,
+ });
+
+ final PublishInfoViewPB publishInfoView;
+
+ @override
+ Widget build(BuildContext context) {
+ final formattedDate = SettingsPageSitesConstants.dateFormat.format(
+ DateTime.fromMillisecondsSinceEpoch(
+ publishInfoView.info.publishTimestampSec.toInt() * 1000,
+ ),
+ );
+ final flexes = SettingsPageSitesConstants.publishedViewItemFlexes;
+
+ return Row(
+ mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+ children: [
+ // Published page name
+ Expanded(
+ flex: flexes[0],
+ child: PublishInfoViewItem(
+ publishInfoView: publishInfoView,
+ onTap: () {
+ context.popToHome();
+
+ getIt<ActionNavigationBloc>().add(
+ ActionNavigationEvent.performAction(
+ action: NavigationAction(
+ objectId: publishInfoView.view.viewId,
+ ),
+ ),
+ );
+ },
+ ),
+ ),
+
+ // Published Name
+ Expanded(
+ flex: flexes[1],
+ child: Padding(
+ padding: const EdgeInsets.only(right: 48.0),
+ child: FlowyText(
+ publishInfoView.info.publishName,
+ withTooltip: true,
+ fontSize: 14.0,
+ figmaLineHeight: 18.0,
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+ ),
+
+ // Published at
+ Expanded(
+ flex: flexes[2],
+ child: FlowyText(
+ formattedDate,
+ fontSize: 14.0,
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+
+ // More actions
+ PublishedViewMoreAction(
+ publishInfoView: publishInfoView,
+ ),
+ ],
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_item_header.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_item_header.dart
new file mode 100644
index 0000000000..34fefb4cd8
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_item_header.dart
@@ -0,0 +1,37 @@
+import 'package:appflowy/workspace/presentation/settings/pages/sites/constants.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/material.dart';
+
+class PublishViewItemHeader extends StatelessWidget {
+ const PublishViewItemHeader({
+ super.key,
+ });
+
+ @override
+ Widget build(BuildContext context) {
+ final items = List.generate(
+ SettingsPageSitesConstants.publishedViewHeaderTitles.length,
+ (index) => (
+ title: SettingsPageSitesConstants.publishedViewHeaderTitles[index],
+ flex: SettingsPageSitesConstants.publishedViewItemFlexes[index],
+ ),
+ );
+
+ return Row(
+ children: [
+ ...items.map(
+ (item) => Expanded(
+ flex: item.flex,
+ child: FlowyText.medium(
+ item.title,
+ fontSize: 14.0,
+ textAlign: TextAlign.left,
+ ),
+ ),
+ ),
+ // it used to align the three dots button in the published page item
+ const HSpace(SettingsPageSitesConstants.threeDotsButtonWidth),
+ ],
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_more_action.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_more_action.dart
new file mode 100644
index 0000000000..0188fc86d8
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_more_action.dart
@@ -0,0 +1,159 @@
+import 'package:appflowy/generated/flowy_svgs.g.dart';
+import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/constants.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/published_page/published_view_settings_dialog.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/settings_sites_bloc.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class PublishedViewMoreAction extends StatelessWidget {
+ const PublishedViewMoreAction({
+ super.key,
+ required this.publishInfoView,
+ });
+
+ final PublishInfoViewPB publishInfoView;
+
+ @override
+ Widget build(BuildContext context) {
+ return AppFlowyPopover(
+ constraints: const BoxConstraints(maxWidth: 168),
+ offset: const Offset(6, 0),
+ animationDuration: Durations.short3,
+ beginScaleFactor: 1.0,
+ beginOpacity: 0.8,
+ child: const SizedBox(
+ width: SettingsPageSitesConstants.threeDotsButtonWidth,
+ child: FlowyButton(
+ useIntrinsicWidth: true,
+ text: FlowySvg(FlowySvgs.three_dots_s),
+ ),
+ ),
+ popupBuilder: (builderContext) {
+ return BlocProvider.value(
+ value: context.read<SettingsSitesBloc>(),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ _buildActionButton(
+ context,
+ builderContext,
+ type: _ActionType.viewSite,
+ ),
+ _buildActionButton(
+ context,
+ builderContext,
+ type: _ActionType.copySiteLink,
+ ),
+ _buildActionButton(
+ context,
+ builderContext,
+ type: _ActionType.settings,
+ ),
+ ],
+ ),
+ );
+ },
+ );
+ }
+
+ Widget _buildActionButton(
+ BuildContext context,
+ BuildContext builderContext, {
+ required _ActionType type,
+ }) {
+ return Container(
+ height: 34,
+ padding: const EdgeInsets.symmetric(vertical: 2.0),
+ child: FlowyIconTextButton(
+ margin: const EdgeInsets.symmetric(horizontal: 6),
+ iconPadding: 10.0,
+ onTap: () => _onTap(context, builderContext, type),
+ leftIconBuilder: (onHover) => FlowySvg(
+ type.leftIconSvg,
+ ),
+ textBuilder: (onHover) => FlowyText.regular(
+ type.name,
+ fontSize: 14.0,
+ figmaLineHeight: 18.0,
+ ),
+ ),
+ );
+ }
+
+ void _onTap(
+ BuildContext context,
+ BuildContext builderContext,
+ _ActionType type,
+ ) {
+ switch (type) {
+ case _ActionType.viewSite:
+ SettingsPageSitesEvent.visitSite(
+ publishInfoView,
+ nameSpace: context.read<SettingsSitesBloc>().state.namespace,
+ );
+ break;
+ case _ActionType.copySiteLink:
+ SettingsPageSitesEvent.copySiteLink(
+ context,
+ publishInfoView,
+ nameSpace: context.read<SettingsSitesBloc>().state.namespace,
+ );
+ break;
+ case _ActionType.settings:
+ _showSettingsDialog(
+ context,
+ builderContext,
+ );
+ break;
+ }
+
+ PopoverContainer.of(builderContext).closeAll();
+ }
+
+ void _showSettingsDialog(
+ BuildContext context,
+ BuildContext builderContext,
+ ) {
+ showDialog(
+ context: context,
+ builder: (_) {
+ return BlocProvider.value(
+ value: context.read<SettingsSitesBloc>(),
+ child: Dialog(
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(12.0),
+ ),
+ child: SizedBox(
+ width: 440,
+ child: PublishedViewSettingsDialog(
+ publishInfoView: publishInfoView,
+ ),
+ ),
+ ),
+ );
+ },
+ );
+ }
+}
+
+enum _ActionType {
+ viewSite,
+ copySiteLink,
+ settings;
+
+ String get name => switch (this) {
+ _ActionType.viewSite => LocaleKeys.shareAction_visitSite.tr(),
+ _ActionType.copySiteLink => LocaleKeys.shareAction_copyLink.tr(),
+ _ActionType.settings => LocaleKeys.settings_popupMenuItem_settings.tr(),
+ };
+
+ FlowySvgData get leftIconSvg => switch (this) {
+ _ActionType.viewSite => FlowySvgs.share_publish_s,
+ _ActionType.copySiteLink => FlowySvgs.copy_s,
+ _ActionType.settings => FlowySvgs.settings_s,
+ };
+}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_settings_dialog.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_settings_dialog.dart
new file mode 100644
index 0000000000..554029b924
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_settings_dialog.dart
@@ -0,0 +1,224 @@
+import 'package:appflowy/generated/flowy_svgs.g.dart';
+import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/plugins/shared/share/publish_color_extension.dart';
+import 'package:appflowy/shared/error_code/error_code_map.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/constants.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/settings_sites_bloc.dart';
+import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
+import 'package:appflowy_backend/log.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class PublishedViewSettingsDialog extends StatefulWidget {
+ const PublishedViewSettingsDialog({
+ super.key,
+ required this.publishInfoView,
+ });
+
+ final PublishInfoViewPB publishInfoView;
+
+ @override
+ State<PublishedViewSettingsDialog> createState() =>
+ _PublishedViewSettingsDialogState();
+}
+
+class _PublishedViewSettingsDialogState
+ extends State<PublishedViewSettingsDialog> {
+ final focusNode = FocusNode();
+ final controller = TextEditingController();
+
+ @override
+ void initState() {
+ super.initState();
+
+ controller.text = widget.publishInfoView.info.publishName;
+ }
+
+ @override
+ void dispose() {
+ focusNode.dispose();
+ controller.dispose();
+
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocListener<SettingsSitesBloc, SettingsSitesState>(
+ listener: _onListener,
+ child: KeyboardListener(
+ focusNode: focusNode,
+ autofocus: true,
+ onKeyEvent: (event) {
+ if (event is KeyDownEvent &&
+ event.logicalKey == LogicalKeyboardKey.escape) {
+ Navigator.of(context).pop();
+ }
+ },
+ child: Container(
+ padding: const EdgeInsets.all(20),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ _buildTitle(),
+ const VSpace(20),
+ _buildPublishNameLabel(),
+ const VSpace(8),
+ _buildPublishNameTextField(),
+ const VSpace(20),
+ _buildButtons(),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+
+ Widget _buildTitle() {
+ return Row(
+ children: [
+ Expanded(
+ child: FlowyText(
+ LocaleKeys.settings_sites_publishedPage_settings.tr(),
+ fontSize: 16.0,
+ figmaLineHeight: 22.0,
+ fontWeight: FontWeight.w500,
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+ const HSpace(6.0),
+ FlowyButton(
+ margin: const EdgeInsets.all(3),
+ useIntrinsicWidth: true,
+ text: const FlowySvg(
+ FlowySvgs.upgrade_close_s,
+ size: Size.square(18.0),
+ ),
+ onTap: () => Navigator.of(context).pop(),
+ ),
+ ],
+ );
+ }
+
+ Widget _buildPublishNameLabel() {
+ return FlowyText(
+ LocaleKeys.settings_sites_publishedPage_pathName.tr(),
+ fontSize: 14.0,
+ color: Theme.of(context).hintColor,
+ );
+ }
+
+ Widget _buildPublishNameTextField() {
+ return Row(
+ children: [
+ Expanded(
+ child: SizedBox(
+ height: 36,
+ child: FlowyTextField(
+ autoFocus: false,
+ controller: controller,
+ enableBorderColor: ShareMenuColors.borderColor(context),
+ textStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
+ height: 1.4,
+ ),
+ ),
+ ),
+ ),
+ const HSpace(12.0),
+ OutlinedRoundedButton(
+ text: LocaleKeys.button_save.tr(),
+ radius: 8.0,
+ margin: const EdgeInsets.symmetric(
+ horizontal: 16.0,
+ vertical: 11.0,
+ ),
+ onTap: _savePublishName,
+ ),
+ ],
+ );
+ }
+
+ Widget _buildButtons() {
+ return Row(
+ mainAxisAlignment: MainAxisAlignment.end,
+ children: [
+ OutlinedRoundedButton(
+ text: LocaleKeys.shareAction_unPublish.tr(),
+ onTap: _unpublishView,
+ ),
+ const HSpace(12.0),
+ PrimaryRoundedButton(
+ text: LocaleKeys.shareAction_visitSite.tr(),
+ radius: 8.0,
+ margin: const EdgeInsets.symmetric(
+ horizontal: 16.0,
+ vertical: 9.0,
+ ),
+ onTap: _visitSite,
+ ),
+ ],
+ );
+ }
+
+ void _savePublishName() {
+ context.read<SettingsSitesBloc>().add(
+ SettingsSitesEvent.updatePublishName(
+ widget.publishInfoView.info.viewId,
+ controller.text,
+ ),
+ );
+ }
+
+ void _unpublishView() {
+ context.read<SettingsSitesBloc>().add(
+ SettingsSitesEvent.unpublishView(
+ widget.publishInfoView.info.viewId,
+ ),
+ );
+
+ Navigator.of(context).pop();
+ }
+
+ void _visitSite() {
+ SettingsPageSitesEvent.visitSite(
+ widget.publishInfoView,
+ nameSpace: context.read<SettingsSitesBloc>().state.namespace,
+ );
+ }
+
+ void _onListener(BuildContext context, SettingsSitesState state) {
+ final actionResult = state.actionResult;
+ final result = actionResult?.result;
+ if (actionResult == null ||
+ result == null ||
+ actionResult.actionType != SettingsSitesActionType.updatePublishName) {
+ return;
+ }
+
+ result.fold(
+ (s) {
+ showToastNotification(
+ context,
+ message: LocaleKeys.settings_sites_success_updatePathNameSuccess.tr(),
+ );
+ Navigator.of(context).pop();
+ },
+ (f) {
+ Log.error('update path name failed: $f');
+
+ showToastNotification(
+ context,
+ message: LocaleKeys.settings_sites_error_updatePathNameFailed.tr(),
+ type: ToastificationType.error,
+ description: f.code.publishErrorMessage,
+ );
+ },
+ );
+ }
+
+}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/settings_sites_bloc.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/settings_sites_bloc.dart
new file mode 100644
index 0000000000..30109581b2
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/settings_sites_bloc.dart
@@ -0,0 +1,368 @@
+import 'dart:async';
+
+import 'package:appflowy/core/helpers/url_launcher.dart';
+import 'package:appflowy/user/application/user_service.dart';
+import 'package:appflowy_backend/dispatch/dispatch.dart';
+import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
+import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
+import 'package:appflowy_result/appflowy_result.dart';
+import 'package:collection/collection.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:protobuf/protobuf.dart' hide FieldInfo;
+
+part 'settings_sites_bloc.freezed.dart';
+
+// workspaceId -> namespace
+Map<String, String?> _namespaceCache = {};
+
+class SettingsSitesBloc extends Bloc<SettingsSitesEvent, SettingsSitesState> {
+ SettingsSitesBloc({
+ required this.workspaceId,
+ required this.user,
+ }) : super(const SettingsSitesState()) {
+ on<SettingsSitesEvent>((event, emit) async {
+ await event.when(
+ initial: () async => _initial(emit),
+ upgradeSubscription: () async => _upgradeSubscription(emit),
+ unpublishView: (viewId) async => _unpublishView(
+ viewId,
+ emit,
+ ),
+ updateNamespace: (namespace) async => _updateNamespace(
+ namespace,
+ emit,
+ ),
+ updatePublishName: (viewId, name) async => _updatePublishName(
+ viewId,
+ name,
+ emit,
+ ),
+ setHomePage: (viewId) async => _setHomePage(
+ viewId,
+ emit,
+ ),
+ removeHomePage: () async => _removeHomePage(emit),
+ );
+ });
+ }
+
+ final String workspaceId;
+ final UserProfilePB user;
+
+ Future<void> _initial(Emitter<SettingsSitesState> emit) async {
+ final lastNamespace = _namespaceCache[workspaceId] ?? '';
+ emit(
+ state.copyWith(
+ isLoading: true,
+ namespace: lastNamespace,
+ ),
+ );
+
+ // Combine fetching subscription info and namespace
+ final (subscriptionInfo, namespace) = await (
+ _fetchUserSubscription(),
+ _fetchPublishNamespace(),
+ ).wait;
+
+ emit(
+ state.copyWith(
+ subscriptionInfo: subscriptionInfo,
+ namespace: namespace,
+ ),
+ );
+
+ // This request is not blocking, render the namespace and subscription info first.
+ final (publishViews, homePageId) = await (
+ _fetchPublishedViews(),
+ _fetchHomePageView(),
+ ).wait;
+
+ final homePageView = publishViews.firstWhereOrNull(
+ (view) => view.info.viewId == homePageId,
+ );
+
+ emit(
+ state.copyWith(
+ publishedViews: publishViews,
+ homePageView: homePageView,
+ isLoading: false,
+ ),
+ );
+ }
+
+ Future<WorkspaceSubscriptionInfoPB?> _fetchUserSubscription() async {
+ final result = await UserBackendService.getWorkspaceSubscriptionInfo(
+ workspaceId,
+ );
+ return result.fold((s) => s, (_) => null);
+ }
+
+ Future<String> _fetchPublishNamespace() async {
+ final result = await FolderEventGetPublishNamespace().send();
+ _namespaceCache[workspaceId] = result.fold((s) => s.namespace, (_) => null);
+ return _namespaceCache[workspaceId] ?? '';
+ }
+
+ Future<List<PublishInfoViewPB>> _fetchPublishedViews() async {
+ final result = await FolderEventListPublishedViews().send();
+ return result.fold(
+ // new -> old
+ (s) => s.items.sorted(
+ (a, b) =>
+ b.info.publishTimestampSec.toInt() -
+ a.info.publishTimestampSec.toInt(),
+ ),
+ (_) => [],
+ );
+ }
+
+ Future<void> _unpublishView(
+ String viewId,
+ Emitter<SettingsSitesState> emit,
+ ) async {
+ emit(
+ state.copyWith(
+ actionResult: const SettingsSitesActionResult(
+ actionType: SettingsSitesActionType.unpublishView,
+ isLoading: true,
+ result: null,
+ ),
+ ),
+ );
+
+ final request = UnpublishViewsPayloadPB(viewIds: [viewId]);
+ final result = await FolderEventUnpublishViews(request).send();
+ final publishedViews = result.fold(
+ (_) => state.publishedViews
+ .where((view) => view.info.viewId != viewId)
+ .toList(),
+ (_) => state.publishedViews,
+ );
+
+ final isHomepage = result.fold(
+ (_) => state.homePageView?.info.viewId == viewId,
+ (_) => false,
+ );
+
+ emit(
+ state.copyWith(
+ publishedViews: publishedViews,
+ actionResult: SettingsSitesActionResult(
+ actionType: SettingsSitesActionType.unpublishView,
+ isLoading: false,
+ result: result,
+ ),
+ homePageView: isHomepage ? null : state.homePageView,
+ ),
+ );
+ }
+
+ Future<void> _updateNamespace(
+ String namespace,
+ Emitter<SettingsSitesState> emit,
+ ) async {
+ emit(
+ state.copyWith(
+ actionResult: const SettingsSitesActionResult(
+ actionType: SettingsSitesActionType.updateNamespace,
+ isLoading: true,
+ result: null,
+ ),
+ ),
+ );
+
+ final request = SetPublishNamespacePayloadPB()..newNamespace = namespace;
+ final result = await FolderEventSetPublishNamespace(request).send();
+
+ emit(
+ state.copyWith(
+ namespace: result.fold((_) => namespace, (_) => state.namespace),
+ actionResult: SettingsSitesActionResult(
+ actionType: SettingsSitesActionType.updateNamespace,
+ isLoading: false,
+ result: result,
+ ),
+ ),
+ );
+ }
+
+ Future<void> _updatePublishName(
+ String viewId,
+ String name,
+ Emitter<SettingsSitesState> emit,
+ ) async {
+ emit(
+ state.copyWith(
+ actionResult: const SettingsSitesActionResult(
+ actionType: SettingsSitesActionType.updatePublishName,
+ isLoading: true,
+ result: null,
+ ),
+ ),
+ );
+
+ final request = SetPublishNamePB()
+ ..viewId = viewId
+ ..newName = name;
+ final result = await FolderEventSetPublishName(request).send();
+ final publishedViews = result.fold(
+ (_) => state.publishedViews.map((view) {
+ view.freeze();
+ if (view.info.viewId == viewId) {
+ view = view.rebuild((b) {
+ final info = b.info;
+ info.freeze();
+ b.info = info.rebuild((b) => b.publishName = name);
+ });
+ }
+ return view;
+ }).toList(),
+ (_) => state.publishedViews,
+ );
+
+ emit(
+ state.copyWith(
+ publishedViews: publishedViews,
+ actionResult: SettingsSitesActionResult(
+ actionType: SettingsSitesActionType.updatePublishName,
+ isLoading: false,
+ result: result,
+ ),
+ ),
+ );
+ }
+
+ Future<void> _upgradeSubscription(Emitter<SettingsSitesState> emit) async {
+ final userService = UserBackendService(userId: user.id);
+ final result = await userService.createSubscription(
+ workspaceId,
+ SubscriptionPlanPB.Pro,
+ );
+
+ result.onSuccess((s) {
+ afLaunchUrlString(s.paymentLink);
+ });
+
+ emit(
+ state.copyWith(
+ actionResult: SettingsSitesActionResult(
+ actionType: SettingsSitesActionType.upgradeSubscription,
+ isLoading: false,
+ result: result,
+ ),
+ ),
+ );
+ }
+
+ Future<void> _setHomePage(
+ String? viewId,
+ Emitter<SettingsSitesState> emit,
+ ) async {
+ if (viewId == null) {
+ return;
+ }
+ final viewIdPB = ViewIdPB()..value = viewId;
+ final result = await FolderEventSetDefaultPublishView(viewIdPB).send();
+ final homePageView = state.publishedViews.firstWhereOrNull(
+ (view) => view.info.viewId == viewId,
+ );
+
+ emit(
+ state.copyWith(
+ homePageView: homePageView,
+ actionResult: SettingsSitesActionResult(
+ actionType: SettingsSitesActionType.setHomePage,
+ isLoading: false,
+ result: result,
+ ),
+ ),
+ );
+ }
+
+ Future<void> _removeHomePage(Emitter<SettingsSitesState> emit) async {
+ final result = await FolderEventRemoveDefaultPublishView().send();
+
+ emit(
+ state.copyWith(
+ homePageView: result.fold((_) => null, (_) => state.homePageView),
+ actionResult: SettingsSitesActionResult(
+ actionType: SettingsSitesActionType.removeHomePage,
+ isLoading: false,
+ result: result,
+ ),
+ ),
+ );
+ }
+
+ Future<String?> _fetchHomePageView() async {
+ final result = await FolderEventGetDefaultPublishInfo().send();
+ return result.fold((s) => s.viewId, (_) => null);
+ }
+}
+
+@freezed
+class SettingsSitesState with _$SettingsSitesState {
+ const factory SettingsSitesState({
+ @Default([]) List<PublishInfoViewPB> publishedViews,
+ SettingsSitesActionResult? actionResult,
+ @Default('') String namespace,
+ @Default(null) WorkspaceSubscriptionInfoPB? subscriptionInfo,
+ @Default(true) bool isLoading,
+ @Default(null) PublishInfoViewPB? homePageView,
+ }) = _SettingsSitesState;
+
+ factory SettingsSitesState.initial() => const SettingsSitesState();
+}
+
+@freezed
+class SettingsSitesEvent with _$SettingsSitesEvent {
+ const factory SettingsSitesEvent.initial() = _Initial;
+ const factory SettingsSitesEvent.unpublishView(String viewId) =
+ _UnpublishView;
+ const factory SettingsSitesEvent.updateNamespace(String namespace) =
+ _UpdateNamespace;
+ const factory SettingsSitesEvent.updatePublishName(
+ String viewId,
+ String name,
+ ) = _UpdatePublishName;
+ const factory SettingsSitesEvent.upgradeSubscription() = _UpgradeSubscription;
+ const factory SettingsSitesEvent.setHomePage(String? viewId) = _SetHomePage;
+ const factory SettingsSitesEvent.removeHomePage() = _RemoveHomePage;
+}
+
+enum SettingsSitesActionType {
+ none,
+ unpublishView,
+ updateNamespace,
+ fetchPublishedViews,
+ updatePublishName,
+ fetchUserSubscription,
+ upgradeSubscription,
+ setHomePage,
+ removeHomePage,
+}
+
+class SettingsSitesActionResult {
+ const SettingsSitesActionResult({
+ required this.actionType,
+ required this.isLoading,
+ required this.result,
+ });
+
+ factory SettingsSitesActionResult.none() => const SettingsSitesActionResult(
+ actionType: SettingsSitesActionType.none,
+ isLoading: false,
+ result: null,
+ );
+
+ final SettingsSitesActionType actionType;
+ final FlowyResult<void, FlowyError>? result;
+ final bool isLoading;
+
+ @override
+ String toString() {
+ return 'SettingsSitesActionResult(actionType: $actionType, isLoading: $isLoading, result: $result)';
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/settings_sites_view.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/settings_sites_view.dart
new file mode 100644
index 0000000000..8998f92226
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/settings_sites_view.dart
@@ -0,0 +1,221 @@
+import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/workspace/application/user/user_workspace_bloc.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/domain/domain_header.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/domain/domain_item.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/published_page/published_view_item.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/published_page/published_view_item_header.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/settings_sites_bloc.dart';
+import 'package:appflowy/workspace/presentation/settings/shared/settings_body.dart';
+import 'package:appflowy/workspace/presentation/settings/shared/settings_category.dart';
+import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
+import 'package:appflowy_backend/log.dart';
+import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class SettingsSitesPage extends StatelessWidget {
+ const SettingsSitesPage({
+ super.key,
+ required this.workspaceId,
+ required this.user,
+ });
+
+ final String workspaceId;
+ final UserProfilePB user;
+
+ @override
+ Widget build(BuildContext context) {
+ return MultiBlocProvider(
+ providers: [
+ BlocProvider<SettingsSitesBloc>(
+ create: (context) => SettingsSitesBloc(
+ workspaceId: workspaceId,
+ user: user,
+ )..add(const SettingsSitesEvent.initial()),
+ ),
+ BlocProvider<UserWorkspaceBloc>(
+ create: (context) => UserWorkspaceBloc(userProfile: user)
+ ..add(const UserWorkspaceEvent.initial()),
+ ),
+ ],
+ child: const _SettingsSitesPageView(),
+ );
+ }
+}
+
+class _SettingsSitesPageView extends StatelessWidget {
+ const _SettingsSitesPageView();
+
+ @override
+ Widget build(BuildContext context) {
+ return SettingsBody(
+ title: LocaleKeys.settings_sites_title.tr(),
+ autoSeparate: false,
+ children: [
+ // Domain / Namespace
+ _buildNamespaceCategory(context),
+ const VSpace(36),
+ // All published pages
+ _buildPublishedViewsCategory(context),
+ ],
+ );
+ }
+
+ Widget _buildNamespaceCategory(BuildContext context) {
+ return SettingsCategory(
+ title: LocaleKeys.settings_sites_namespaceHeader.tr(),
+ description: LocaleKeys.settings_sites_namespaceDescription.tr(),
+ descriptionColor: Theme.of(context).hintColor,
+ children: [
+ const FlowyDivider(),
+ BlocConsumer<SettingsSitesBloc, SettingsSitesState>(
+ listener: _onListener,
+ builder: (context, state) {
+ return SeparatedColumn(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ separatorBuilder: () => const FlowyDivider(
+ padding: EdgeInsets.symmetric(vertical: 12.0),
+ ),
+ children: [
+ const DomainHeader(),
+ DomainItem(
+ namespace: state.namespace,
+ homepage: '',
+ ),
+ ],
+ );
+ },
+ ),
+ ],
+ );
+ }
+
+ Widget _buildPublishedViewsCategory(BuildContext context) {
+ return SettingsCategory(
+ title: LocaleKeys.settings_sites_publishedPage_title.tr(),
+ description: LocaleKeys.settings_sites_publishedPage_description.tr(),
+ descriptionColor: Theme.of(context).hintColor,
+ children: [
+ const FlowyDivider(),
+ BlocBuilder<SettingsSitesBloc, SettingsSitesState>(
+ builder: (context, state) {
+ return SeparatedColumn(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ separatorBuilder: () => const FlowyDivider(
+ padding: EdgeInsets.symmetric(vertical: 12.0),
+ ),
+ children: _buildPublishedViewsResult(context, state),
+ );
+ },
+ ),
+ ],
+ );
+ }
+
+ List<Widget> _buildPublishedViewsResult(
+ BuildContext context,
+ SettingsSitesState state,
+ ) {
+ final publishedViews = state.publishedViews;
+ final List<Widget> children = [
+ const PublishViewItemHeader(),
+ ];
+
+ if (!state.isLoading) {
+ if (publishedViews.isEmpty) {
+ children.add(
+ FlowyText.regular(
+ LocaleKeys.settings_sites_publishedPage_emptyHinText.tr(),
+ color: Theme.of(context).hintColor,
+ ),
+ );
+ } else {
+ children.addAll(
+ publishedViews.map(
+ (view) => PublishedViewItem(publishInfoView: view),
+ ),
+ );
+ }
+ } else {
+ children.add(
+ const Center(
+ child: SizedBox(
+ height: 24,
+ width: 24,
+ child: CircularProgressIndicator.adaptive(strokeWidth: 3),
+ ),
+ ),
+ );
+ }
+
+ return children;
+ }
+
+ void _onListener(BuildContext context, SettingsSitesState state) {
+ final actionResult = state.actionResult;
+ final type = actionResult?.actionType;
+ final result = actionResult?.result;
+ if (type == SettingsSitesActionType.upgradeSubscription && result != null) {
+ result.onFailure((f) {
+ Log.error('Failed to generate payment link for Pro Plan: ${f.msg}');
+
+ showToastNotification(
+ context,
+ message:
+ LocaleKeys.settings_sites_error_failedToGeneratePaymentLink.tr(),
+ type: ToastificationType.error,
+ );
+ });
+ } else if (type == SettingsSitesActionType.unpublishView &&
+ result != null) {
+ result.fold((_) {
+ showToastNotification(
+ context,
+ message: LocaleKeys.publish_unpublishSuccessfully.tr(),
+ );
+ }, (f) {
+ Log.error('Failed to unpublish view: ${f.msg}');
+
+ showToastNotification(
+ context,
+ message: LocaleKeys.publish_unpublishFailed.tr(),
+ type: ToastificationType.error,
+ description: f.msg,
+ );
+ });
+ } else if (type == SettingsSitesActionType.setHomePage && result != null) {
+ result.fold((s) {
+ showToastNotification(
+ context,
+ message: LocaleKeys.settings_sites_success_setHomepageSuccess.tr(),
+ );
+ }, (f) {
+ Log.error('Failed to set homepage: ${f.msg}');
+
+ showToastNotification(
+ context,
+ message: LocaleKeys.settings_sites_error_setHomepageFailed.tr(),
+ type: ToastificationType.error,
+ );
+ });
+ } else if (type == SettingsSitesActionType.removeHomePage &&
+ result != null) {
+ result.fold((s) {
+ showToastNotification(
+ context,
+ message: LocaleKeys.settings_sites_success_removeHomePageSuccess.tr(),
+ );
+ }, (f) {
+ Log.error('Failed to remove homepage: ${f.msg}');
+
+ showToastNotification(
+ context,
+ message: LocaleKeys.settings_sites_error_removeHomePageFailed.tr(),
+ type: ToastificationType.error,
+ );
+ });
+ }
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart
index aea039f933..d09704093b 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart
@@ -14,6 +14,7 @@ import 'package:appflowy/workspace/presentation/settings/pages/settings_manage_d
import 'package:appflowy/workspace/presentation/settings/pages/settings_plan_view.dart';
import 'package:appflowy/workspace/presentation/settings/pages/settings_shortcuts_view.dart';
import 'package:appflowy/workspace/presentation/settings/pages/settings_workspace_view.dart';
+import 'package:appflowy/workspace/presentation/settings/pages/sites/settings_sites_view.dart';
import 'package:appflowy/workspace/presentation/settings/shared/af_dropdown_menu_entry.dart';
import 'package:appflowy/workspace/presentation/settings/shared/settings_category.dart';
import 'package:appflowy/workspace/presentation/settings/shared/settings_dropdown.dart';
@@ -52,6 +53,7 @@ class SettingsDialog extends StatelessWidget {
@override
Widget build(BuildContext context) {
+ final width = MediaQuery.of(context).size.width * 0.6;
return BlocProvider<SettingsDialogBloc>(
create: (context) => SettingsDialogBloc(
user,
@@ -60,8 +62,8 @@ class SettingsDialog extends StatelessWidget {
)..add(const SettingsDialogEvent.initial()),
child: BlocBuilder<SettingsDialogBloc, SettingsDialogState>(
builder: (context, state) => FlowyDialog(
- width: MediaQuery.of(context).size.width * 0.7,
- constraints: const BoxConstraints(maxWidth: 784, minWidth: 564),
+ width: width,
+ constraints: const BoxConstraints(minWidth: 564),
child: ScaffoldMessenger(
child: Scaffold(
backgroundColor: Colors.transparent,
@@ -150,9 +152,20 @@ class SettingsDialog extends StatelessWidget {
workspaceId: workspaceId,
);
case SettingsPage.plan:
- return SettingsPlanView(workspaceId: workspaceId, user: user);
+ return SettingsPlanView(
+ workspaceId: workspaceId,
+ user: user,
+ );
case SettingsPage.billing:
- return SettingsBillingView(workspaceId: workspaceId, user: user);
+ return SettingsBillingView(
+ workspaceId: workspaceId,
+ user: user,
+ );
+ case SettingsPage.sites:
+ return SettingsSitesPage(
+ workspaceId: workspaceId,
+ user: user,
+ );
case SettingsPage.featureFlags:
return const FeatureFlagsPage();
default:
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/setting_value_dropdown.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/setting_value_dropdown.dart
index ba6ae1416f..5d1c858d29 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/setting_value_dropdown.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/setting_value_dropdown.dart
@@ -1,4 +1,3 @@
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/settings_category.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/settings_category.dart
index 8ec9c72510..a111fa2626 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/settings_category.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/settings_category.dart
@@ -1,7 +1,6 @@
-import 'package:flutter/material.dart';
-
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/material.dart';
/// Renders a simple category taking a title and the list
/// of children (settings) to be rendered.
@@ -11,6 +10,7 @@ class SettingsCategory extends StatelessWidget {
super.key,
required this.title,
this.description,
+ this.descriptionColor,
this.tooltip,
this.actions,
required this.children,
@@ -18,6 +18,7 @@ class SettingsCategory extends StatelessWidget {
final String title;
final String? description;
+ final Color? descriptionColor;
final String? tooltip;
final List<Widget>? actions;
final List<Widget> children;
@@ -53,6 +54,7 @@ class SettingsCategory extends StatelessWidget {
maxLines: 4,
fontSize: 12,
overflow: TextOverflow.ellipsis,
+ color: descriptionColor,
),
const VSpace(8),
],
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/members/workspace_member_page.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/members/workspace_member_page.dart
index 8d61254008..bf33ab9d72 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/members/workspace_member_page.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/members/workspace_member_page.dart
@@ -11,7 +11,6 @@ import 'package:appflowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-error/code.pbenum.dart';
import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_cloud.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_cloud.dart
index 44308790d9..d937b47736 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_cloud.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_cloud.dart
@@ -13,7 +13,6 @@ import 'package:appflowy/workspace/presentation/settings/shared/settings_body.da
import 'package:appflowy/workspace/presentation/settings/shared/settings_dropdown.dart';
import 'package:appflowy/workspace/presentation/settings/widgets/setting_local_cloud.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dart
index a97cbd31eb..58f60919a6 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dart
@@ -112,6 +112,15 @@ class SettingsMenu extends StatelessWidget {
),
changeSelectedPage: changeSelectedPage,
),
+ if (userProfile.authenticator ==
+ AuthenticatorPB.AppFlowyCloud)
+ SettingsMenuElement(
+ page: SettingsPage.sites,
+ selectedPage: currentPage,
+ label: LocaleKeys.settings_sites_title.tr(),
+ icon: const Icon(Icons.web),
+ changeSelectedPage: changeSelectedPage,
+ ),
if (FeatureFlag.planBilling.isOn && isBillingEnabled) ...[
SettingsMenuElement(
page: SettingsPage.plan,
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/appflowy_date_picker.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/appflowy_date_picker.dart
index bdfc2ef3e8..58993dfe69 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/appflowy_date_picker.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/appflowy_date_picker.dart
@@ -2,7 +2,6 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/plugins/database/grid/presentation/widgets/common/type_option_separator.dart';
import 'package:appflowy/plugins/database/widgets/field/type_option_editor/date/date_time_format.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/date_entities.pbenum.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/date_time_settings.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/date_time_settings.dart
index e1e6641953..7447700fef 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/date_time_settings.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/date_time_settings.dart
@@ -4,7 +4,6 @@ import 'package:flutter/widgets.dart';
import 'package:appflowy/plugins/database/widgets/field/type_option_editor/date/date_time_format.dart';
import 'package:appflowy/workspace/presentation/widgets/date_picker/utils/layout.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/date_entities.pbenum.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
class DateTimeSetting extends StatefulWidget {
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/date_type_option_button.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/date_type_option_button.dart
index 659194440b..9bb819a243 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/date_type_option_button.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/date_type_option_button.dart
@@ -5,7 +5,6 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy/workspace/presentation/widgets/date_picker/widgets/date_time_settings.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/date_entities.pbenum.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/reminder_selector.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/reminder_selector.dart
index 528100dc9f..fc513d4a02 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/reminder_selector.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/reminder_selector.dart
@@ -4,7 +4,6 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/workspace/presentation/widgets/date_picker/utils/layout.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/date_entities.pbenum.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:calendar_view/calendar_view.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/image_viewer/interactive_image_toolbar.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/image_viewer/interactive_image_toolbar.dart
index 5aafbb86db..223910ceac 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/image_viewer/interactive_image_toolbar.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/image_viewer/interactive_image_toolbar.dart
@@ -6,7 +6,6 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/image/common.dart';
import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/file_picker/file_picker_impl.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/more_view_actions/more_view_actions.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/more_view_actions/more_view_actions.dart
index c35bfab143..09885dc796 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/more_view_actions/more_view_actions.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/more_view_actions/more_view_actions.dart
@@ -11,7 +11,6 @@ import 'package:appflowy/workspace/presentation/widgets/more_view_actions/widget
import 'package:appflowy/workspace/presentation/widgets/more_view_actions/widgets/view_meta_info.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/style_widget/hover.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/more_view_actions/widgets/font_size_action.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/more_view_actions/widgets/font_size_action.dart
index f39ceab802..8e0fa8c43c 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/more_view_actions/widgets/font_size_action.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/more_view_actions/widgets/font_size_action.dart
@@ -1,7 +1,6 @@
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/document/application/document_appearance_cubit.dart';
import 'package:appflowy/workspace/presentation/widgets/more_view_actions/widgets/font_size_stepper.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/pop_up_action.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/pop_up_action.dart
index 23d5880697..fb39d73965 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/pop_up_action.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/pop_up_action.dart
@@ -1,4 +1,3 @@
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/style_widget/hover.dart';
import 'package:flutter/material.dart';
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/view_title_bar.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/view_title_bar.dart
index f0e7cc0c58..b7691f4239 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/view_title_bar.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/view_title_bar.dart
@@ -12,7 +12,6 @@ import 'package:appflowy/workspace/presentation/home/menu/menu_shared_state.dart
import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_icon.dart';
import 'package:appflowy/workspace/presentation/widgets/rename_view_popover.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/frontend/appflowy_flutter/macos/Runner.xcodeproj/project.pbxproj b/frontend/appflowy_flutter/macos/Runner.xcodeproj/project.pbxproj
index d49e658d4e..1c3367e430 100644
--- a/frontend/appflowy_flutter/macos/Runner.xcodeproj/project.pbxproj
+++ b/frontend/appflowy_flutter/macos/Runner.xcodeproj/project.pbxproj
@@ -28,7 +28,7 @@
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
706E045829F286F600B789F4 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 706E045729F286EC00B789F4 /* libc++.tbd */; };
D7360C6D6177708F7B2D3C9D /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CD81A6C7244B2318E0BA2E8 /* Pods_Runner.framework */; };
- FBADCAF92CD0717200BB6FB1 /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = FBADCAF82CD0716900BB6FB1 /* libbz2.tbd */; };
+ FB4E0E4F2CC9F3F900C57E87 /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = FB4E0E4E2CC9F3E900C57E87 /* libbz2.tbd */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -76,7 +76,7 @@
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
7D41C30A3910C3A40B6085E3 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
- FBADCAF82CD0716900BB6FB1 /* libbz2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libbz2.tbd; path = usr/lib/libbz2.tbd; sourceTree = SDKROOT; };
+ FB4E0E4E2CC9F3E900C57E87 /* libbz2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libbz2.tbd; path = usr/lib/libbz2.tbd; sourceTree = SDKROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -84,7 +84,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- FBADCAF92CD0717200BB6FB1 /* libbz2.tbd in Frameworks */,
+ FB4E0E4F2CC9F3F900C57E87 /* libbz2.tbd in Frameworks */,
706E045829F286F600B789F4 /* libc++.tbd in Frameworks */,
D7360C6D6177708F7B2D3C9D /* Pods_Runner.framework in Frameworks */,
);
@@ -171,7 +171,7 @@
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
isa = PBXGroup;
children = (
- FBADCAF82CD0716900BB6FB1 /* libbz2.tbd */,
+ FB4E0E4E2CC9F3E900C57E87 /* libbz2.tbd */,
706E045729F286EC00B789F4 /* libc++.tbd */,
1CD81A6C7244B2318E0BA2E8 /* Pods_Runner.framework */,
);
diff --git a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/appflowy_popover.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/appflowy_popover.dart
index 18a83f0557..190d840a41 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/appflowy_popover.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/appflowy_popover.dart
@@ -2,6 +2,8 @@ import 'package:appflowy_popover/appflowy_popover.dart';
import 'package:flowy_infra/colorscheme/default_colorscheme.dart';
import 'package:flutter/material.dart';
+export 'package:appflowy_popover/appflowy_popover.dart';
+
class AppFlowyPopover extends StatelessWidget {
const AppFlowyPopover({
super.key,
diff --git a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/flowy_dialog.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/flowy_dialog.dart
index 78d89f0297..a5a51a16e6 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/flowy_dialog.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/src/flowy_overlay/flowy_dialog.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
import 'package:flutter/material.dart';
const _overlayContainerPadding = EdgeInsets.symmetric(vertical: 12);
@@ -58,9 +56,7 @@ class FlowyDialog extends StatelessWidget {
type: MaterialType.transparency,
child: Container(
height: expandHeight ? size.height : null,
- width: width ??
- max(min(size.width, overlayContainerMaxWidth),
- overlayContainerMinWidth),
+ width: width ?? size.width,
constraints: constraints,
child: child,
),
diff --git a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dart
index 1a29a9379e..13357c31e5 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/button.dart
@@ -1,12 +1,11 @@
import 'dart:io';
-import 'package:flutter/material.dart';
-
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra_ui/style_widget/hover.dart';
import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';
import 'package:flowy_infra_ui/widget/ignore_parent_gesture.dart';
import 'package:flowy_infra_ui/widget/spacing.dart';
+import 'package:flutter/material.dart';
class FlowyIconTextButton extends StatelessWidget {
final Widget Function(bool onHover) textBuilder;
diff --git a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/primary_rounded_button.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/primary_rounded_button.dart
index d615f0f2ae..c227d8b8ef 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/primary_rounded_button.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/primary_rounded_button.dart
@@ -18,6 +18,7 @@ class PrimaryRoundedButton extends StatelessWidget {
this.lineHeight,
this.figmaLineHeight,
this.leftIcon,
+ this.textColor,
});
final String text;
@@ -33,6 +34,7 @@ class PrimaryRoundedButton extends StatelessWidget {
final double? lineHeight;
final double? figmaLineHeight;
final Widget? leftIcon;
+ final Color? textColor;
@override
Widget build(BuildContext context) {
@@ -45,7 +47,7 @@ class PrimaryRoundedButton extends StatelessWidget {
fontWeight: fontWeight ?? FontWeight.w500,
lineHeight: lineHeight ?? 1.0,
figmaLineHeight: figmaLineHeight,
- color: Theme.of(context).colorScheme.onPrimary,
+ color: textColor ?? Theme.of(context).colorScheme.onPrimary,
textAlign: TextAlign.center,
),
margin: margin ?? const EdgeInsets.symmetric(horizontal: 14.0),
diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.json
index 06a394cc1f..e1f3f5fb62 100644
--- a/frontend/resources/translations/en.json
+++ b/frontend/resources/translations/en.json
@@ -130,7 +130,8 @@
"copyShareLink": "Copy share link",
"copyLinkFailed": "Failed to copy link to clipboard",
"copyLinkToBlockSuccess": "Copied block link to clipboard",
- "copyLinkToBlockFailed": "Failed to copy block link to clipboard"
+ "copyLinkToBlockFailed": "Failed to copy block link to clipboard",
+ "manageAllSites": "Manage all sites"
},
"moreAction": {
"small": "small",
@@ -434,6 +435,62 @@
"trash": "Trash",
"helpAndSupport": "Help & Support"
},
+ "sites": {
+ "title": "Sites",
+ "namespaceTitle": "Namespace",
+ "namespaceDescription": "Manage your namespace and homepage",
+ "namespaceHeader": "Namespace",
+ "homepageHeader": "Homepage",
+ "updateNamespace": "Update namespace",
+ "removeHomepage": "Remove homepage",
+ "selectHomePage": "Select a page",
+ "namespace": {
+ "description": "This change will apply to all the published pages live on this namespace",
+ "tooltip": "We reserve the rights to remove any inappropriate namespaces",
+ "updateExistingNamespace": "Update existing namespace",
+ "upgradeToPro": "Upgrade to Pro Plan to set a homepage",
+ "redirectToPayment": "Redirecting to payment page...",
+ "onlyWorkspaceOwnerCanSetHomePage": "Only the workspace owner can set a homepage"
+ },
+ "publishedPage": {
+ "title": "All published pages",
+ "description": "Manage your published pages",
+ "page": "page",
+ "pathName": "Path name",
+ "date": "Published date",
+ "emptyHinText": "You have no published pages in this workspace",
+ "noPublishedPages": "No published pages",
+ "settings": "Publish settings"
+ },
+ "error": {
+ "failedToGeneratePaymentLink": "Failed to generate payment link for pro plan",
+ "failedToUpdateNamespace": "Failed to update namespace",
+ "proPlanLimitation": "You need to upgrade to Pro Plan to update the namespace",
+ "namespaceAlreadyInUse": "The namespace is already taken, please try another one",
+ "invalidNamespace": "Invalid namespace, please try another one",
+ "namespaceLengthAtLeast2Characters": "The namespace must be at least 2 characters long",
+ "onlyWorkspaceOwnerCanUpdateNamespace": "Only workspace owner can update the namespace",
+ "onlyWorkspaceOwnerCanRemoveHomepage": "Only workspace owner can remove the homepage",
+ "setHomepageFailed": "Failed to set homepage",
+ "namespaceTooLong": "The namespace is too long, please try another one",
+ "namespaceTooShort": "The namespace is too short, please try another one",
+ "namespaceIsReserved": "The namespace is reserved, please try another one",
+ "updatePathNameFailed": "Failed to update path name",
+ "removeHomePageFailed": "Failed to remove homepage",
+ "publishNameContainsInvalidCharacters": "The path name contains invalid character(s), please try another one",
+ "publishNameTooShort": "The path name is too short, please try another one",
+ "publishNameTooLong": "The path name is too long, please try another one",
+ "publishNameAlreadyInUse": "The path name is already in use, please try another one",
+ "namespaceContainsInvalidCharacters": "The namespace contains invalid character(s), please try another one",
+ "publishPermissionDenied": "Only the workspace owner or page publisher can manage the publish settings"
+ },
+ "success": {
+ "namespaceUpdated": "Updated namespace successfully",
+ "setHomepageSuccess": "Set homepage successfully",
+ "updatePathNameSuccess": "Updated path name successfully",
+ "removeHomePageSuccess": "Remove homepage successfully"
+ }
+ },
"accountPage": {
"menuLabel": "My account",
"title": "My account",
diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock
index bf6f1e47d3..0bba172d22 100644
--- a/frontend/rust-lib/Cargo.lock
+++ b/frontend/rust-lib/Cargo.lock
@@ -163,7 +163,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
[[package]]
name = "app-error"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=648c977c0752609a00ccdfdc5cc8141789e63c4a#648c977c0752609a00ccdfdc5cc8141789e63c4a"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4643e568d2d9b725b0d06dfbbf351317cf9a2c9f#4643e568d2d9b725b0d06dfbbf351317cf9a2c9f"
dependencies = [
"anyhow",
"bincode",
@@ -183,7 +183,7 @@ dependencies = [
[[package]]
name = "appflowy-ai-client"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=648c977c0752609a00ccdfdc5cc8141789e63c4a#648c977c0752609a00ccdfdc5cc8141789e63c4a"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4643e568d2d9b725b0d06dfbbf351317cf9a2c9f#4643e568d2d9b725b0d06dfbbf351317cf9a2c9f"
dependencies = [
"anyhow",
"bytes",
@@ -780,7 +780,7 @@ dependencies = [
[[package]]
name = "client-api"
version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=648c977c0752609a00ccdfdc5cc8141789e63c4a#648c977c0752609a00ccdfdc5cc8141789e63c4a"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4643e568d2d9b725b0d06dfbbf351317cf9a2c9f#4643e568d2d9b725b0d06dfbbf351317cf9a2c9f"
dependencies = [
"again",
"anyhow",
@@ -835,7 +835,7 @@ dependencies = [
[[package]]
name = "client-api-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=648c977c0752609a00ccdfdc5cc8141789e63c4a#648c977c0752609a00ccdfdc5cc8141789e63c4a"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4643e568d2d9b725b0d06dfbbf351317cf9a2c9f#4643e568d2d9b725b0d06dfbbf351317cf9a2c9f"
dependencies = [
"collab-entity",
"collab-rt-entity",
@@ -848,7 +848,7 @@ dependencies = [
[[package]]
name = "client-websocket"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=648c977c0752609a00ccdfdc5cc8141789e63c4a#648c977c0752609a00ccdfdc5cc8141789e63c4a"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4643e568d2d9b725b0d06dfbbf351317cf9a2c9f#4643e568d2d9b725b0d06dfbbf351317cf9a2c9f"
dependencies = [
"futures-channel",
"futures-util",
@@ -1117,7 +1117,7 @@ dependencies = [
[[package]]
name = "collab-rt-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=648c977c0752609a00ccdfdc5cc8141789e63c4a#648c977c0752609a00ccdfdc5cc8141789e63c4a"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4643e568d2d9b725b0d06dfbbf351317cf9a2c9f#4643e568d2d9b725b0d06dfbbf351317cf9a2c9f"
dependencies = [
"anyhow",
"bincode",
@@ -1142,7 +1142,7 @@ dependencies = [
[[package]]
name = "collab-rt-protocol"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=648c977c0752609a00ccdfdc5cc8141789e63c4a#648c977c0752609a00ccdfdc5cc8141789e63c4a"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4643e568d2d9b725b0d06dfbbf351317cf9a2c9f#4643e568d2d9b725b0d06dfbbf351317cf9a2c9f"
dependencies = [
"anyhow",
"async-trait",
@@ -1537,7 +1537,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
[[package]]
name = "database-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=648c977c0752609a00ccdfdc5cc8141789e63c4a#648c977c0752609a00ccdfdc5cc8141789e63c4a"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4643e568d2d9b725b0d06dfbbf351317cf9a2c9f#4643e568d2d9b725b0d06dfbbf351317cf9a2c9f"
dependencies = [
"anyhow",
"app-error",
@@ -2341,6 +2341,7 @@ dependencies = [
"async-trait",
"bytes",
"chrono",
+ "client-api",
"collab",
"collab-document",
"collab-entity",
@@ -2377,6 +2378,7 @@ name = "flowy-folder-pub"
version = "0.1.0"
dependencies = [
"anyhow",
+ "client-api",
"collab",
"collab-entity",
"collab-folder",
@@ -2977,7 +2979,7 @@ dependencies = [
[[package]]
name = "gotrue"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=648c977c0752609a00ccdfdc5cc8141789e63c4a#648c977c0752609a00ccdfdc5cc8141789e63c4a"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4643e568d2d9b725b0d06dfbbf351317cf9a2c9f#4643e568d2d9b725b0d06dfbbf351317cf9a2c9f"
dependencies = [
"anyhow",
"futures-util",
@@ -2994,7 +2996,7 @@ dependencies = [
[[package]]
name = "gotrue-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=648c977c0752609a00ccdfdc5cc8141789e63c4a#648c977c0752609a00ccdfdc5cc8141789e63c4a"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4643e568d2d9b725b0d06dfbbf351317cf9a2c9f#4643e568d2d9b725b0d06dfbbf351317cf9a2c9f"
dependencies = [
"anyhow",
"app-error",
@@ -3356,7 +3358,7 @@ dependencies = [
[[package]]
name = "infra"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=648c977c0752609a00ccdfdc5cc8141789e63c4a#648c977c0752609a00ccdfdc5cc8141789e63c4a"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4643e568d2d9b725b0d06dfbbf351317cf9a2c9f#4643e568d2d9b725b0d06dfbbf351317cf9a2c9f"
dependencies = [
"anyhow",
"bytes",
@@ -5661,7 +5663,7 @@ dependencies = [
[[package]]
name = "shared-entity"
version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=648c977c0752609a00ccdfdc5cc8141789e63c4a#648c977c0752609a00ccdfdc5cc8141789e63c4a"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=4643e568d2d9b725b0d06dfbbf351317cf9a2c9f#4643e568d2d9b725b0d06dfbbf351317cf9a2c9f"
dependencies = [
"anyhow",
"app-error",
diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml
index 706a7dc746..1dfe771f2e 100644
--- a/frontend/rust-lib/Cargo.toml
+++ b/frontend/rust-lib/Cargo.toml
@@ -106,8 +106,8 @@ dashmap = "6.0.1"
# Run the script.add_workspace_members:
# scripts/tool/update_client_api_rev.sh new_rev_id
# ⚠️⚠️⚠️️
-client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "648c977c0752609a00ccdfdc5cc8141789e63c4a" }
-client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "648c977c0752609a00ccdfdc5cc8141789e63c4a" }
+client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "4643e568d2d9b725b0d06dfbbf351317cf9a2c9f" }
+client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "4643e568d2d9b725b0d06dfbbf351317cf9a2c9f" }
[profile.dev]
opt-level = 0
diff --git a/frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs b/frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs
index 62a1fc506e..c3f6a4423d 100644
--- a/frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs
+++ b/frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs
@@ -1,7 +1,8 @@
use client_api::collab_sync::{SinkConfig, SyncObject, SyncPlugin};
use client_api::entity::ai_dto::{CompletionType, RepeatedRelatedQuestion};
use client_api::entity::search_dto::SearchDocumentResponseItem;
-use client_api::entity::ChatMessageType;
+use client_api::entity::workspace_dto::PublishInfoView;
+use client_api::entity::{ChatMessageType, PublishInfo};
use collab::core::origin::{CollabClient, CollabOrigin};
use collab::entity::EncodedCollab;
use collab::preclude::CollabPlugin;
@@ -33,7 +34,7 @@ use flowy_error::{FlowyError, FlowyResult};
use flowy_folder_pub::cloud::{
FolderCloudService, FolderCollabParams, FolderData, FolderSnapshot, Workspace, WorkspaceRecord,
};
-use flowy_folder_pub::entities::{PublishInfoResponse, PublishPayload};
+use flowy_folder_pub::entities::PublishPayload;
use flowy_server_pub::af_cloud_config::AFCloudConfiguration;
use flowy_storage_pub::cloud::{ObjectIdentity, ObjectValue, StorageCloudService};
use flowy_storage_pub::storage::{CompletedPartRequest, CreateUploadResponse, UploadPartResponse};
@@ -326,11 +327,24 @@ impl FolderCloudService for ServerProvider {
.await
}
- async fn get_publish_info(&self, view_id: &str) -> Result<PublishInfoResponse, FlowyError> {
+ async fn get_publish_info(&self, view_id: &str) -> Result<PublishInfo, FlowyError> {
let server = self.get_server()?;
server.folder_service().get_publish_info(view_id).await
}
+ async fn set_publish_name(
+ &self,
+ workspace_id: &str,
+ view_id: String,
+ new_name: String,
+ ) -> Result<(), FlowyError> {
+ let server = self.get_server()?;
+ server
+ .folder_service()
+ .set_publish_name(workspace_id, view_id, new_name)
+ .await
+ }
+
async fn set_publish_namespace(
&self,
workspace_id: &str,
@@ -351,6 +365,49 @@ impl FolderCloudService for ServerProvider {
.await
}
+ /// List all published views of the current workspace.
+ async fn list_published_views(
+ &self,
+ workspace_id: &str,
+ ) -> Result<Vec<PublishInfoView>, FlowyError> {
+ let server = self.get_server()?;
+ server
+ .folder_service()
+ .list_published_views(workspace_id)
+ .await
+ }
+
+ async fn get_default_published_view_info(
+ &self,
+ workspace_id: &str,
+ ) -> Result<PublishInfo, FlowyError> {
+ let server = self.get_server()?;
+ server
+ .folder_service()
+ .get_default_published_view_info(workspace_id)
+ .await
+ }
+
+ async fn set_default_published_view(
+ &self,
+ workspace_id: &str,
+ view_id: uuid::Uuid,
+ ) -> Result<(), FlowyError> {
+ let server = self.get_server()?;
+ server
+ .folder_service()
+ .set_default_published_view(workspace_id, view_id)
+ .await
+ }
+
+ async fn remove_default_published_view(&self, workspace_id: &str) -> Result<(), FlowyError> {
+ let server = self.get_server()?;
+ server
+ .folder_service()
+ .remove_default_published_view(workspace_id)
+ .await
+ }
+
async fn import_zip(&self, file_path: &str) -> Result<(), FlowyError> {
self
.get_server()?
diff --git a/frontend/rust-lib/flowy-error/src/code.rs b/frontend/rust-lib/flowy-error/src/code.rs
index dbeb62cf11..9b13f235fa 100644
--- a/frontend/rust-lib/flowy-error/src/code.rs
+++ b/frontend/rust-lib/flowy-error/src/code.rs
@@ -317,6 +317,45 @@ pub enum ErrorCode {
#[error("Group name is empty")]
GroupNameIsEmpty = 109,
+
+ #[error("Not available for current workspace plan")]
+ LimitedByWorkspacePlan = 110,
+
+ #[error("Invalid namespace")]
+ InvalidNamespace = 111,
+
+ #[error("Invalid publish name")]
+ InvalidPublishName = 112,
+
+ #[error("Custom namespace requires Pro Plan upgrade")]
+ CustomNamespaceRequirePlanUpgrade = 113,
+
+ #[error("Requested namespace is not allowed")]
+ CustomNamespaceNotAllowed = 114,
+
+ #[error("Requested namespace is already taken")]
+ CustomNamespaceAlreadyTaken = 115,
+
+ #[error("Requested namespace is too short")]
+ CustomNamespaceTooShort = 116,
+
+ #[error("Requested namespace is too long")]
+ CustomNamespaceTooLong = 117,
+
+ #[error("Requested namespace is reserved")]
+ CustomNamespaceReserved = 118,
+
+ #[error("Publish name is already used for another published view")]
+ PublishNameAlreadyExists = 119,
+
+ #[error("Publish name contains one or more invalid characters")]
+ PublishNameInvalidCharacter = 120,
+
+ #[error("Publish name has exceeded the maximum length allowable")]
+ PublishNameTooLong = 121,
+
+ #[error("Requested namespace has one or more invalid characters")]
+ CustomNamespaceInvalidCharacter = 122,
}
impl ErrorCode {
diff --git a/frontend/rust-lib/flowy-error/src/impl_from/cloud.rs b/frontend/rust-lib/flowy-error/src/impl_from/cloud.rs
index f60cc3bb19..2eb1e5f348 100644
--- a/frontend/rust-lib/flowy-error/src/impl_from/cloud.rs
+++ b/frontend/rust-lib/flowy-error/src/impl_from/cloud.rs
@@ -27,6 +27,16 @@ impl From<AppResponseError> for FlowyError {
AppErrorCode::AIResponseLimitExceeded => ErrorCode::AIResponseLimitExceeded,
AppErrorCode::FileStorageLimitExceeded => ErrorCode::FileStorageLimitExceeded,
AppErrorCode::SingleUploadLimitExceeded => ErrorCode::SingleUploadLimitExceeded,
+ AppErrorCode::CustomNamespaceDisabled => ErrorCode::CustomNamespaceRequirePlanUpgrade,
+ AppErrorCode::CustomNamespaceDisallowed => ErrorCode::CustomNamespaceNotAllowed,
+ AppErrorCode::PublishNamespaceAlreadyTaken => ErrorCode::CustomNamespaceAlreadyTaken,
+ AppErrorCode::CustomNamespaceTooShort => ErrorCode::CustomNamespaceTooShort,
+ AppErrorCode::CustomNamespaceTooLong => ErrorCode::CustomNamespaceTooLong,
+ AppErrorCode::CustomNamespaceReserved => ErrorCode::CustomNamespaceReserved,
+ AppErrorCode::PublishNameAlreadyExists => ErrorCode::PublishNameAlreadyExists,
+ AppErrorCode::PublishNameInvalidCharacter => ErrorCode::PublishNameInvalidCharacter,
+ AppErrorCode::PublishNameTooLong => ErrorCode::PublishNameTooLong,
+ AppErrorCode::CustomNamespaceInvalidCharacter => ErrorCode::CustomNamespaceInvalidCharacter,
_ => ErrorCode::Internal,
};
diff --git a/frontend/rust-lib/flowy-folder-pub/Cargo.toml b/frontend/rust-lib/flowy-folder-pub/Cargo.toml
index 398787cff7..9f33bfe1c4 100644
--- a/frontend/rust-lib/flowy-folder-pub/Cargo.toml
+++ b/frontend/rust-lib/flowy-folder-pub/Cargo.toml
@@ -14,6 +14,7 @@ uuid.workspace = true
anyhow.workspace = true
serde = { version = "1.0.202", features = ["derive"] }
serde_json.workspace = true
+client-api = { workspace = true }
flowy-error.workspace = true
[dev-dependencies]
diff --git a/frontend/rust-lib/flowy-folder-pub/src/cloud.rs b/frontend/rust-lib/flowy-folder-pub/src/cloud.rs
index 046c7fea90..a73f4637ed 100644
--- a/frontend/rust-lib/flowy-folder-pub/src/cloud.rs
+++ b/frontend/rust-lib/flowy-folder-pub/src/cloud.rs
@@ -1,5 +1,6 @@
-use crate::entities::{PublishInfoResponse, PublishPayload};
+use crate::entities::PublishPayload;
pub use anyhow::Error;
+use client_api::entity::{workspace_dto::PublishInfoView, PublishInfo};
use collab_entity::CollabType;
pub use collab_folder::{Folder, FolderData, Workspace};
use flowy_error::FlowyError;
@@ -59,7 +60,14 @@ pub trait FolderCloudService: Send + Sync + 'static {
view_ids: Vec<String>,
) -> Result<(), FlowyError>;
- async fn get_publish_info(&self, view_id: &str) -> Result<PublishInfoResponse, FlowyError>;
+ async fn get_publish_info(&self, view_id: &str) -> Result<PublishInfo, FlowyError>;
+
+ async fn set_publish_name(
+ &self,
+ workspace_id: &str,
+ view_id: String,
+ new_name: String,
+ ) -> Result<(), FlowyError>;
async fn set_publish_namespace(
&self,
@@ -67,6 +75,24 @@ pub trait FolderCloudService: Send + Sync + 'static {
new_namespace: &str,
) -> Result<(), FlowyError>;
+ async fn list_published_views(
+ &self,
+ workspace_id: &str,
+ ) -> Result<Vec<PublishInfoView>, FlowyError>;
+
+ async fn get_default_published_view_info(
+ &self,
+ workspace_id: &str,
+ ) -> Result<PublishInfo, FlowyError>;
+
+ async fn set_default_published_view(
+ &self,
+ workspace_id: &str,
+ view_id: uuid::Uuid,
+ ) -> Result<(), FlowyError>;
+
+ async fn remove_default_published_view(&self, workspace_id: &str) -> Result<(), FlowyError>;
+
async fn get_publish_namespace(&self, workspace_id: &str) -> Result<String, FlowyError>;
async fn import_zip(&self, file_path: &str) -> Result<(), FlowyError>;
diff --git a/frontend/rust-lib/flowy-folder-pub/src/entities.rs b/frontend/rust-lib/flowy-folder-pub/src/entities.rs
index dc1676f09d..d06eb50e25 100644
--- a/frontend/rust-lib/flowy-folder-pub/src/entities.rs
+++ b/frontend/rust-lib/flowy-folder-pub/src/entities.rs
@@ -116,11 +116,3 @@ pub enum PublishPayload {
Database(PublishDatabasePayload),
Unknown,
}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct PublishInfoResponse {
- pub view_id: String,
- /// One part of publish url: /{namespace}/{publish_name}
- pub namespace: Option<String>,
- pub publish_name: String,
-}
diff --git a/frontend/rust-lib/flowy-folder/Cargo.toml b/frontend/rust-lib/flowy-folder/Cargo.toml
index 20a131cf6c..b6878ee9a1 100644
--- a/frontend/rust-lib/flowy-folder/Cargo.toml
+++ b/frontend/rust-lib/flowy-folder/Cargo.toml
@@ -39,6 +39,7 @@ serde = { workspace = true, features = ["derive"] }
serde_json.workspace = true
validator.workspace = true
async-trait.workspace = true
+client-api = { workspace = true }
regex = "1.9.5"
futures = "0.3.30"
diff --git a/frontend/rust-lib/flowy-folder/src/entities/icon.rs b/frontend/rust-lib/flowy-folder/src/entities/icon.rs
index 1169c320ea..62e1760293 100644
--- a/frontend/rust-lib/flowy-folder/src/entities/icon.rs
+++ b/frontend/rust-lib/flowy-folder/src/entities/icon.rs
@@ -31,6 +31,16 @@ impl From<IconType> for ViewIconTypePB {
}
}
+impl From<client_api::entity::workspace_dto::IconType> for ViewIconTypePB {
+ fn from(val: client_api::entity::workspace_dto::IconType) -> Self {
+ match val {
+ client_api::entity::workspace_dto::IconType::Emoji => ViewIconTypePB::Emoji,
+ client_api::entity::workspace_dto::IconType::Url => ViewIconTypePB::Url,
+ client_api::entity::workspace_dto::IconType::Icon => ViewIconTypePB::Icon,
+ }
+ }
+}
+
#[derive(Default, ProtoBuf, Debug, Clone, PartialEq, Eq)]
pub struct ViewIconPB {
#[pb(index = 1)]
@@ -57,6 +67,15 @@ impl From<ViewIcon> for ViewIconPB {
}
}
+impl From<client_api::entity::workspace_dto::ViewIcon> for ViewIconPB {
+ fn from(val: client_api::entity::workspace_dto::ViewIcon) -> Self {
+ ViewIconPB {
+ ty: val.ty.into(),
+ value: val.value,
+ }
+ }
+}
+
#[derive(Default, ProtoBuf)]
pub struct UpdateViewIconPayloadPB {
#[pb(index = 1)]
diff --git a/frontend/rust-lib/flowy-folder/src/entities/publish.rs b/frontend/rust-lib/flowy-folder/src/entities/publish.rs
index 4915fc745b..9eb14e2ea6 100644
--- a/frontend/rust-lib/flowy-folder/src/entities/publish.rs
+++ b/frontend/rust-lib/flowy-folder/src/entities/publish.rs
@@ -1,7 +1,8 @@
+use client_api::entity::workspace_dto::{FolderViewMinimal, PublishInfoView};
+use client_api::entity::PublishInfo;
use flowy_derive::ProtoBuf;
-use flowy_folder_pub::entities::PublishInfoResponse;
-use super::RepeatedViewIdPB;
+use super::{RepeatedViewIdPB, ViewIconPB, ViewLayoutPB};
#[derive(Default, ProtoBuf)]
pub struct PublishViewParamsPB {
@@ -21,6 +22,46 @@ pub struct UnpublishViewsPayloadPB {
pub view_ids: Vec<String>,
}
+#[derive(Default, ProtoBuf)]
+pub struct PublishInfoViewPB {
+ #[pb(index = 1)]
+ pub view: FolderViewMinimalPB,
+ #[pb(index = 2)]
+ pub info: PublishInfoResponsePB,
+}
+
+impl From<PublishInfoView> for PublishInfoViewPB {
+ fn from(info_view: PublishInfoView) -> Self {
+ Self {
+ view: info_view.view.into(),
+ info: info_view.info.into(),
+ }
+ }
+}
+
+#[derive(Default, ProtoBuf)]
+pub struct FolderViewMinimalPB {
+ #[pb(index = 1)]
+ pub view_id: String,
+ #[pb(index = 2)]
+ pub name: String,
+ #[pb(index = 3, one_of)]
+ pub icon: Option<ViewIconPB>,
+ #[pb(index = 4)]
+ pub layout: ViewLayoutPB,
+}
+
+impl From<FolderViewMinimal> for FolderViewMinimalPB {
+ fn from(view: FolderViewMinimal) -> Self {
+ Self {
+ view_id: view.view_id,
+ name: view.name,
+ icon: view.icon.map(Into::into),
+ layout: view.layout.into(),
+ }
+ }
+}
+
#[derive(Default, ProtoBuf)]
pub struct PublishInfoResponsePB {
#[pb(index = 1)]
@@ -29,18 +70,30 @@ pub struct PublishInfoResponsePB {
pub publish_name: String,
#[pb(index = 3, one_of)]
pub namespace: Option<String>,
+ #[pb(index = 4)]
+ pub publisher_email: String,
+ #[pb(index = 5)]
+ pub publish_timestamp_sec: i64,
}
-impl From<PublishInfoResponse> for PublishInfoResponsePB {
- fn from(info: PublishInfoResponse) -> Self {
+impl From<PublishInfo> for PublishInfoResponsePB {
+ fn from(info: PublishInfo) -> Self {
Self {
- view_id: info.view_id,
+ view_id: info.view_id.to_string(),
publish_name: info.publish_name,
namespace: info.namespace,
+ publisher_email: info.publisher_email,
+ publish_timestamp_sec: info.publish_timestamp.timestamp(),
}
}
}
+#[derive(Default, ProtoBuf)]
+pub struct RepeatedPublishInfoViewPB {
+ #[pb(index = 1)]
+ pub items: Vec<PublishInfoViewPB>,
+}
+
#[derive(Default, ProtoBuf)]
pub struct SetPublishNamespacePayloadPB {
#[pb(index = 1)]
diff --git a/frontend/rust-lib/flowy-folder/src/entities/view.rs b/frontend/rust-lib/flowy-folder/src/entities/view.rs
index a87dfbea72..fe77f10883 100644
--- a/frontend/rust-lib/flowy-folder/src/entities/view.rs
+++ b/frontend/rust-lib/flowy-folder/src/entities/view.rs
@@ -160,6 +160,18 @@ impl std::convert::From<ViewLayout> for ViewLayoutPB {
}
}
+impl From<client_api::entity::workspace_dto::ViewLayout> for ViewLayoutPB {
+ fn from(val: client_api::entity::workspace_dto::ViewLayout) -> Self {
+ match val {
+ client_api::entity::workspace_dto::ViewLayout::Document => ViewLayoutPB::Document,
+ client_api::entity::workspace_dto::ViewLayout::Grid => ViewLayoutPB::Grid,
+ client_api::entity::workspace_dto::ViewLayout::Board => ViewLayoutPB::Board,
+ client_api::entity::workspace_dto::ViewLayout::Calendar => ViewLayoutPB::Calendar,
+ client_api::entity::workspace_dto::ViewLayout::Chat => ViewLayoutPB::Chat,
+ }
+ }
+}
+
#[derive(Eq, PartialEq, Debug, Default, ProtoBuf, Clone)]
pub struct SectionViewsPB {
#[pb(index = 1)]
@@ -392,6 +404,15 @@ impl std::convert::From<&str> for ViewIdPB {
}
}
+#[derive(Default, ProtoBuf, Clone, Debug)]
+pub struct SetPublishNamePB {
+ #[pb(index = 1)]
+ pub view_id: String,
+
+ #[pb(index = 2)]
+ pub new_name: String,
+}
+
#[derive(Default, ProtoBuf, Clone, Debug)]
pub struct DeletedViewPB {
#[pb(index = 1)]
diff --git a/frontend/rust-lib/flowy-folder/src/event_handler.rs b/frontend/rust-lib/flowy-folder/src/event_handler.rs
index eb7573f224..7e13274ca3 100644
--- a/frontend/rust-lib/flowy-folder/src/event_handler.rs
+++ b/frontend/rust-lib/flowy-folder/src/event_handler.rs
@@ -458,6 +458,17 @@ pub(crate) async fn get_publish_info_handler(
data_result_ok(PublishInfoResponsePB::from(info))
}
+#[tracing::instrument(level = "debug", skip(data, folder))]
+pub(crate) async fn set_publish_name_handler(
+ data: AFPluginData<SetPublishNamePB>,
+ folder: AFPluginState<Weak<FolderManager>>,
+) -> Result<(), FlowyError> {
+ let folder = upgrade_folder(folder)?;
+ let SetPublishNamePB { view_id, new_name } = data.into_inner();
+ folder.set_publish_name(view_id, new_name).await?;
+ Ok(())
+}
+
#[tracing::instrument(level = "debug", skip(data, folder), err)]
pub(crate) async fn set_publish_namespace_handler(
data: AFPluginData<SetPublishNamespacePayloadPB>,
@@ -477,3 +488,48 @@ pub(crate) async fn get_publish_namespace_handler(
let namespace = folder.get_publish_namespace().await?;
data_result_ok(PublishNamespacePB { namespace })
}
+
+#[tracing::instrument(level = "debug", skip(folder), err)]
+pub(crate) async fn list_published_views_handler(
+ folder: AFPluginState<Weak<FolderManager>>,
+) -> DataResult<RepeatedPublishInfoViewPB, FlowyError> {
+ let folder = upgrade_folder(folder)?;
+ let published_views = folder.list_published_views().await?;
+ let items: Vec<PublishInfoViewPB> = published_views
+ .into_iter()
+ .map(|view| view.into())
+ .collect();
+ data_result_ok(RepeatedPublishInfoViewPB { items })
+}
+
+#[tracing::instrument(level = "debug", skip(folder))]
+pub(crate) async fn get_default_publish_info_handler(
+ folder: AFPluginState<Weak<FolderManager>>,
+) -> DataResult<PublishInfoResponsePB, FlowyError> {
+ let folder = upgrade_folder(folder)?;
+ let default_published_view = folder.get_default_published_view_info().await?;
+ data_result_ok(default_published_view.into())
+}
+
+#[tracing::instrument(level = "debug", skip(folder))]
+pub(crate) async fn set_default_publish_view_handler(
+ data: AFPluginData<ViewIdPB>,
+ folder: AFPluginState<Weak<FolderManager>>,
+) -> Result<(), FlowyError> {
+ let folder = upgrade_folder(folder)?;
+ let view_id: uuid::Uuid = data.into_inner().value.parse().map_err(|err| {
+ tracing::error!("Failed to parse view id: {}", err);
+ FlowyError::invalid_data()
+ })?;
+ folder.set_default_published_view(view_id).await?;
+ Ok(())
+}
+
+#[tracing::instrument(level = "debug", skip(folder))]
+pub(crate) async fn remove_default_publish_view_handler(
+ folder: AFPluginState<Weak<FolderManager>>,
+) -> Result<(), FlowyError> {
+ let folder = upgrade_folder(folder)?;
+ folder.remove_default_published_view().await?;
+ Ok(())
+}
diff --git a/frontend/rust-lib/flowy-folder/src/event_map.rs b/frontend/rust-lib/flowy-folder/src/event_map.rs
index e458576692..8078cdf896 100644
--- a/frontend/rust-lib/flowy-folder/src/event_map.rs
+++ b/frontend/rust-lib/flowy-folder/src/event_map.rs
@@ -45,9 +45,14 @@ pub fn init(folder: Weak<FolderManager>) -> AFPlugin {
.event(FolderEvent::GetViewAncestors, get_view_ancestors_handler)
.event(FolderEvent::PublishView, publish_view_handler)
.event(FolderEvent::GetPublishInfo, get_publish_info_handler)
+ .event(FolderEvent::SetPublishName, set_publish_name_handler)
.event(FolderEvent::UnpublishViews, unpublish_views_handler)
.event(FolderEvent::SetPublishNamespace, set_publish_namespace_handler)
.event(FolderEvent::GetPublishNamespace, get_publish_namespace_handler)
+ .event(FolderEvent::ListPublishedViews, list_published_views_handler)
+ .event(FolderEvent::GetDefaultPublishInfo, get_default_publish_info_handler)
+ .event(FolderEvent::SetDefaultPublishView, set_default_publish_view_handler)
+ .event(FolderEvent::RemoveDefaultPublishView, remove_default_publish_view_handler)
}
#[derive(Clone, Copy, PartialEq, Eq, Debug, Display, Hash, ProtoBuf_Enum, Flowy_Event)]
@@ -200,4 +205,19 @@ pub enum FolderEvent {
#[event(input = "ImportZipPB")]
ImportZipFile = 48,
+
+ #[event(output = "RepeatedPublishInfoViewPB")]
+ ListPublishedViews = 49,
+
+ #[event(output = "PublishInfoResponsePB")]
+ GetDefaultPublishInfo = 50,
+
+ #[event(input = "ViewIdPB")]
+ SetDefaultPublishView = 51,
+
+ #[event(input = "SetPublishNamePB")]
+ SetPublishName = 52,
+
+ #[event()]
+ RemoveDefaultPublishView = 53,
}
diff --git a/frontend/rust-lib/flowy-folder/src/manager.rs b/frontend/rust-lib/flowy-folder/src/manager.rs
index ef943879a1..c0ddd77998 100644
--- a/frontend/rust-lib/flowy-folder/src/manager.rs
+++ b/frontend/rust-lib/flowy-folder/src/manager.rs
@@ -19,6 +19,8 @@ use crate::view_operation::{
create_view, EncodedCollabWrapper, FolderOperationHandler, FolderOperationHandlers, ViewData,
};
use arc_swap::ArcSwapOption;
+use client_api::entity::workspace_dto::PublishInfoView;
+use client_api::entity::PublishInfo;
use collab::core::collab::DataSource;
use collab::lock::RwLock;
use collab_entity::{CollabType, EncodedCollab};
@@ -34,8 +36,8 @@ use collab_integrate::CollabKVDB;
use flowy_error::{internal_error, ErrorCode, FlowyError, FlowyResult};
use flowy_folder_pub::cloud::{gen_view_id, FolderCloudService, FolderCollabParams};
use flowy_folder_pub::entities::{
- PublishDatabaseData, PublishDatabasePayload, PublishDocumentPayload, PublishInfoResponse,
- PublishPayload, PublishViewInfo, PublishViewMeta, PublishViewMetaData,
+ PublishDatabaseData, PublishDatabasePayload, PublishDocumentPayload, PublishPayload,
+ PublishViewInfo, PublishViewMeta, PublishViewMetaData,
};
use flowy_search_pub::entities::FolderIndexManager;
use flowy_sqlite::kv::KVStorePreferences;
@@ -1272,11 +1274,22 @@ impl FolderManager {
/// Get the publish info of the view with the given view id.
/// The publish info contains the namespace and publish_name of the view.
#[tracing::instrument(level = "debug", skip(self))]
- pub async fn get_publish_info(&self, view_id: &str) -> FlowyResult<PublishInfoResponse> {
+ pub async fn get_publish_info(&self, view_id: &str) -> FlowyResult<PublishInfo> {
let publish_info = self.cloud_service.get_publish_info(view_id).await?;
Ok(publish_info)
}
+ /// Sets the publish name of the view with the given view id.
+ #[tracing::instrument(level = "debug", skip(self))]
+ pub async fn set_publish_name(&self, view_id: String, new_name: String) -> FlowyResult<()> {
+ let workspace_id = self.user.workspace_id()?;
+ self
+ .cloud_service
+ .set_publish_name(&workspace_id, view_id, new_name)
+ .await?;
+ Ok(())
+ }
+
/// Get the namespace of the current workspace.
/// The namespace is used to generate the URL of the published view.
#[tracing::instrument(level = "debug", skip(self), err)]
@@ -1300,6 +1313,47 @@ impl FolderManager {
Ok(namespace)
}
+ /// List all published views of the current workspace.
+ #[tracing::instrument(level = "debug", skip(self), err)]
+ pub async fn list_published_views(&self) -> FlowyResult<Vec<PublishInfoView>> {
+ let workspace_id = self.user.workspace_id()?;
+ let published_views = self
+ .cloud_service
+ .list_published_views(&workspace_id)
+ .await?;
+ Ok(published_views)
+ }
+
+ #[tracing::instrument(level = "debug", skip(self), err)]
+ pub async fn get_default_published_view_info(&self) -> FlowyResult<PublishInfo> {
+ let workspace_id = self.user.workspace_id()?;
+ let default_published_view_info = self
+ .cloud_service
+ .get_default_published_view_info(&workspace_id)
+ .await?;
+ Ok(default_published_view_info)
+ }
+
+ #[tracing::instrument(level = "debug", skip(self), err)]
+ pub async fn set_default_published_view(&self, view_id: uuid::Uuid) -> FlowyResult<()> {
+ let workspace_id = self.user.workspace_id()?;
+ self
+ .cloud_service
+ .set_default_published_view(&workspace_id, view_id)
+ .await?;
+ Ok(())
+ }
+
+ #[tracing::instrument(level = "debug", skip(self), err)]
+ pub async fn remove_default_published_view(&self) -> FlowyResult<()> {
+ let workspace_id = self.user.workspace_id()?;
+ self
+ .cloud_service
+ .remove_default_published_view(&workspace_id)
+ .await?;
+ Ok(())
+ }
+
/// Retrieves the publishing payload for a specified view and optionally its child views.
///
/// # Arguments
diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/chat.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/chat.rs
index 3345ec2137..b7fa9a3b77 100644
--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/chat.rs
+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/chat.rs
@@ -159,6 +159,7 @@ where
text: &str,
completion_type: CompletionType,
) -> Result<StreamComplete, FlowyError> {
+ // TODO(Nathan): Check if this is correct after updating to latest client-api
let params = CompleteTextParams {
text: text.to_string(),
completion_type: Some(completion_type),
diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/folder.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/folder.rs
index da2b2731f2..785e02b693 100644
--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/folder.rs
+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/folder.rs
@@ -1,7 +1,9 @@
+use client_api::entity::workspace_dto::PublishInfoView;
use client_api::entity::{
workspace_dto::CreateWorkspaceParam, CollabParams, PublishCollabItem, PublishCollabMetadata,
QueryCollab, QueryCollabParams,
};
+use client_api::entity::{PatchPublishedCollab, PublishInfo};
use collab::core::collab::DataSource;
use collab::core::origin::CollabOrigin;
use collab_entity::CollabType;
@@ -17,7 +19,7 @@ use flowy_folder_pub::cloud::{
Folder, FolderCloudService, FolderCollabParams, FolderData, FolderSnapshot, Workspace,
WorkspaceRecord,
};
-use flowy_folder_pub::entities::{PublishInfoResponse, PublishPayload};
+use flowy_folder_pub::entities::PublishPayload;
use lib_infra::async_trait::async_trait;
use crate::af_cloud::define::ServerUser;
@@ -227,18 +229,40 @@ where
Ok(())
}
- async fn get_publish_info(&self, view_id: &str) -> Result<PublishInfoResponse, FlowyError> {
+ async fn get_publish_info(&self, view_id: &str) -> Result<PublishInfo, FlowyError> {
let try_get_client = self.inner.try_get_client();
let view_id = Uuid::parse_str(view_id)
.map_err(|_| FlowyError::new(ErrorCode::InvalidParams, "Invalid view id"));
let view_id = view_id?;
- let info = try_get_client?.get_published_collab_info(&view_id).await?;
- Ok(PublishInfoResponse {
- view_id: info.view_id.to_string(),
- publish_name: info.publish_name,
- namespace: info.namespace,
- })
+ let info = try_get_client?
+ .get_published_collab_info(&view_id)
+ .await
+ .map_err(FlowyError::from)?;
+ Ok(info)
+ }
+
+ async fn set_publish_name(
+ &self,
+ workspace_id: &str,
+ view_id: String,
+ new_name: String,
+ ) -> Result<(), FlowyError> {
+ let try_get_client = self.inner.try_get_client()?;
+ let view_id = Uuid::parse_str(&view_id)
+ .map_err(|_| FlowyError::new(ErrorCode::InvalidParams, "Invalid view id"))?;
+
+ try_get_client
+ .patch_published_collabs(
+ workspace_id,
+ &[PatchPublishedCollab {
+ view_id,
+ publish_name: Some(new_name),
+ }],
+ )
+ .await
+ .map_err(FlowyError::from)?;
+ Ok(())
}
async fn set_publish_namespace(
@@ -265,6 +289,57 @@ where
Ok(namespace)
}
+ async fn list_published_views(
+ &self,
+ workspace_id: &str,
+ ) -> Result<Vec<PublishInfoView>, FlowyError> {
+ let workspace_id = workspace_id.to_string();
+ let published_views = self
+ .inner
+ .try_get_client()?
+ .list_published_views(&workspace_id)
+ .await
+ .map_err(FlowyError::from)?;
+ Ok(published_views)
+ }
+
+ async fn get_default_published_view_info(
+ &self,
+ workspace_id: &str,
+ ) -> Result<PublishInfo, FlowyError> {
+ let default_published_view_info = self
+ .inner
+ .try_get_client()?
+ .get_default_publish_view_info(workspace_id)
+ .await
+ .map_err(FlowyError::from)?;
+ Ok(default_published_view_info)
+ }
+
+ async fn set_default_published_view(
+ &self,
+ workspace_id: &str,
+ view_id: uuid::Uuid,
+ ) -> Result<(), FlowyError> {
+ self
+ .inner
+ .try_get_client()?
+ .set_default_publish_view(workspace_id, view_id)
+ .await
+ .map_err(FlowyError::from)?;
+ Ok(())
+ }
+
+ async fn remove_default_published_view(&self, workspace_id: &str) -> Result<(), FlowyError> {
+ self
+ .inner
+ .try_get_client()?
+ .delete_default_publish_view(workspace_id)
+ .await
+ .map_err(FlowyError::from)?;
+ Ok(())
+ }
+
async fn import_zip(&self, file_path: &str) -> Result<(), FlowyError> {
let file_path = PathBuf::from(file_path);
let client = self.inner.try_get_client()?;
diff --git a/frontend/rust-lib/flowy-server/src/local_server/impls/folder.rs b/frontend/rust-lib/flowy-server/src/local_server/impls/folder.rs
index e44d7b001f..7d771fd6ec 100644
--- a/frontend/rust-lib/flowy-server/src/local_server/impls/folder.rs
+++ b/frontend/rust-lib/flowy-server/src/local_server/impls/folder.rs
@@ -1,13 +1,16 @@
use std::sync::Arc;
-use crate::local_server::LocalServerDB;
+use client_api::entity::workspace_dto::PublishInfoView;
+use client_api::entity::PublishInfo;
use collab_entity::CollabType;
+
+use crate::local_server::LocalServerDB;
use flowy_error::FlowyError;
use flowy_folder_pub::cloud::{
gen_workspace_id, FolderCloudService, FolderCollabParams, FolderData, FolderSnapshot, Workspace,
WorkspaceRecord,
};
-use flowy_folder_pub::entities::{PublishInfoResponse, PublishPayload};
+use flowy_folder_pub::entities::PublishPayload;
use lib_infra::async_trait::async_trait;
pub(crate) struct LocalServerFolderCloudServiceImpl {
@@ -88,7 +91,7 @@ impl FolderCloudService for LocalServerFolderCloudServiceImpl {
Err(FlowyError::local_version_not_support())
}
- async fn get_publish_info(&self, _view_id: &str) -> Result<PublishInfoResponse, FlowyError> {
+ async fn get_publish_info(&self, _view_id: &str) -> Result<PublishInfo, FlowyError> {
Err(FlowyError::local_version_not_support())
}
@@ -104,6 +107,41 @@ impl FolderCloudService for LocalServerFolderCloudServiceImpl {
Err(FlowyError::local_version_not_support())
}
+ async fn set_publish_name(
+ &self,
+ _workspace_id: &str,
+ _view_id: String,
+ _new_name: String,
+ ) -> Result<(), FlowyError> {
+ Err(FlowyError::local_version_not_support())
+ }
+
+ async fn list_published_views(
+ &self,
+ _workspace_id: &str,
+ ) -> Result<Vec<PublishInfoView>, FlowyError> {
+ Err(FlowyError::local_version_not_support())
+ }
+
+ async fn get_default_published_view_info(
+ &self,
+ _workspace_id: &str,
+ ) -> Result<PublishInfo, FlowyError> {
+ Err(FlowyError::local_version_not_support())
+ }
+
+ async fn set_default_published_view(
+ &self,
+ _workspace_id: &str,
+ _view_id: uuid::Uuid,
+ ) -> Result<(), FlowyError> {
+ Err(FlowyError::local_version_not_support())
+ }
+
+ async fn remove_default_published_view(&self, _workspace_id: &str) -> Result<(), FlowyError> {
+ Err(FlowyError::local_version_not_support())
+ }
+
async fn import_zip(&self, _file_path: &str) -> Result<(), FlowyError> {
Err(FlowyError::local_version_not_support())
}
diff --git a/frontend/rust-lib/flowy-server/src/supabase/api/folder.rs b/frontend/rust-lib/flowy-server/src/supabase/api/folder.rs
index 647fb7a5e7..43c12ae5f1 100644
--- a/frontend/rust-lib/flowy-server/src/supabase/api/folder.rs
+++ b/frontend/rust-lib/flowy-server/src/supabase/api/folder.rs
@@ -13,7 +13,7 @@ use flowy_folder_pub::cloud::{
gen_workspace_id, Folder, FolderCloudService, FolderCollabParams, FolderData, FolderSnapshot,
Workspace, WorkspaceRecord,
};
-use flowy_folder_pub::entities::{PublishInfoResponse, PublishPayload};
+use flowy_folder_pub::entities::PublishPayload;
use lib_dispatch::prelude::af_spawn;
use lib_infra::future::FutureResult;
use lib_infra::util::timestamp;
@@ -189,7 +189,7 @@ where
FutureResult::new(async { Err(anyhow!("supabase server doesn't support unpublish views")) })
}
- fn get_publish_info(&self, _view_id: &str) -> FutureResult<PublishInfoResponse, Error> {
+ fn get_publish_info(&self, _view_id: &str) -> FutureResult<PublishInfo, Error> {
FutureResult::new(async { Err(anyhow!("supabase server doesn't support publish info")) })
}
@@ -197,7 +197,7 @@ where
&self,
_workspace_id: &str,
_new_namespace: &str,
- ) -> FutureResult<(), Error> {
+ ) -> FutureResult<(), FlowyError> {
FutureResult::new(async {
Err(anyhow!(
"supabase server doesn't support set publish namespace"