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: shared folder refactor (#7948)

Lucas105f244a4b8c
diff --git a/frontend/appflowy_flutter/lib/features/share_tab/data/repositories/mock_share_repository.dart b/frontend/appflowy_flutter/lib/features/share_tab/data/repositories/local_share_with_user_repository.dart
similarity index 96%
rename from frontend/appflowy_flutter/lib/features/share_tab/data/repositories/mock_share_repository.dart
rename to frontend/appflowy_flutter/lib/features/share_tab/data/repositories/local_share_with_user_repository.dart
index 450523efb8..b08b2f524c 100644
--- a/frontend/appflowy_flutter/lib/features/share_tab/data/repositories/mock_share_repository.dart
+++ b/frontend/appflowy_flutter/lib/features/share_tab/data/repositories/local_share_with_user_repository.dart
@@ -4,10 +4,10 @@ import 'package:appflowy/features/share_tab/data/models/models.dart';
import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
import 'package:appflowy_result/appflowy_result.dart';
-import 'share_repository.dart';
+import 'share_with_user_repository.dart';
-class MockShareRepository extends ShareRepository {
- MockShareRepository();
+class LocalShareWithUserRepository extends ShareWithUserRepository {
+ LocalShareWithUserRepository();
final List<SharedUser> _sharedUsers = [
SharedUser(
diff --git a/frontend/appflowy_flutter/lib/features/share_tab/data/repositories/rust_share_repository.dart b/frontend/appflowy_flutter/lib/features/share_tab/data/repositories/rust_share_with_user_repository.dart
similarity index 54%
rename from frontend/appflowy_flutter/lib/features/share_tab/data/repositories/rust_share_repository.dart
rename to frontend/appflowy_flutter/lib/features/share_tab/data/repositories/rust_share_with_user_repository.dart
index 9c400d6360..b02cfb6b63 100644
--- a/frontend/appflowy_flutter/lib/features/share_tab/data/repositories/rust_share_repository.dart
+++ b/frontend/appflowy_flutter/lib/features/share_tab/data/repositories/rust_share_with_user_repository.dart
@@ -1,14 +1,15 @@
import 'package:appflowy/features/share_tab/data/models/models.dart';
+import 'package:appflowy/features/shared_section/util/extensions.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/protobuf.dart';
import 'package:appflowy_result/appflowy_result.dart';
-import 'share_repository.dart';
+import 'share_with_user_repository.dart';
-class RustShareRepository extends ShareRepository {
- RustShareRepository();
+class RustShareWithUserRepository extends ShareWithUserRepository {
+ RustShareWithUserRepository();
@override
Future<FlowyResult<List<SharedUser>, FlowyError>> getSharedUsersInPage({
@@ -95,81 +96,3 @@ class RustShareRepository extends ShareRepository {
return FlowySuccess([]);
}
}
-
-extension on RepeatedSharedUserPB {
- List<SharedUser> get sharedUsers {
- return items.map((e) => e.sharedUser).toList();
- }
-}
-
-extension on SharedUserPB {
- SharedUser get sharedUser {
- return SharedUser(
- email: email,
- name: name,
- accessLevel: accessLevel.shareRole,
- role: role.shareRole,
- avatarUrl: avatarUrl,
- );
- }
-}
-
-extension on AFAccessLevelPB {
- ShareAccessLevel get shareRole {
- switch (this) {
- case AFAccessLevelPB.ReadOnly:
- return ShareAccessLevel.readOnly;
- case AFAccessLevelPB.ReadAndComment:
- return ShareAccessLevel.readAndComment;
- case AFAccessLevelPB.ReadAndWrite:
- return ShareAccessLevel.readAndWrite;
- case AFAccessLevelPB.FullAccess:
- return ShareAccessLevel.fullAccess;
- default:
- throw Exception('Unknown share role: $this');
- }
- }
-}
-
-extension on ShareAccessLevel {
- AFAccessLevelPB get accessLevel {
- switch (this) {
- case ShareAccessLevel.readOnly:
- return AFAccessLevelPB.ReadOnly;
- case ShareAccessLevel.readAndComment:
- return AFAccessLevelPB.ReadAndComment;
- case ShareAccessLevel.readAndWrite:
- return AFAccessLevelPB.ReadAndWrite;
- case ShareAccessLevel.fullAccess:
- return AFAccessLevelPB.FullAccess;
- }
- }
-}
-
-extension on AFRolePB {
- ShareRole get shareRole {
- switch (this) {
- case AFRolePB.Guest:
- return ShareRole.guest;
- case AFRolePB.Member:
- return ShareRole.member;
- case AFRolePB.Owner:
- return ShareRole.owner;
- default:
- throw Exception('Unknown share role: $this');
- }
- }
-}
-
-// extension on ShareRole {
-// AFRolePB get role {
-// switch (this) {
-// case ShareRole.guest:
-// return AFRolePB.Guest;
-// case ShareRole.member:
-// return AFRolePB.Member;
-// case ShareRole.owner:
-// return AFRolePB.Owner;
-// }
-// }
-// }
diff --git a/frontend/appflowy_flutter/lib/features/share_tab/data/repositories/share_repository.dart b/frontend/appflowy_flutter/lib/features/share_tab/data/repositories/share_with_user_repository.dart
similarity index 93%
rename from frontend/appflowy_flutter/lib/features/share_tab/data/repositories/share_repository.dart
rename to frontend/appflowy_flutter/lib/features/share_tab/data/repositories/share_with_user_repository.dart
index dd5eb80fb9..d9bcce07af 100644
--- a/frontend/appflowy_flutter/lib/features/share_tab/data/repositories/share_repository.dart
+++ b/frontend/appflowy_flutter/lib/features/share_tab/data/repositories/share_with_user_repository.dart
@@ -3,11 +3,11 @@ import 'package:appflowy/features/share_tab/data/models/shared_user.dart';
import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
import 'package:appflowy_result/appflowy_result.dart';
-/// Abstract repository for sharing pages with users.
+/// Abstract repository for sharing with users.
///
/// For example, we're using rust events now, but we can still use the http api
/// for the future.
-abstract class ShareRepository {
+abstract class ShareWithUserRepository {
/// Gets the list of users and their roles for a shared page.
Future<FlowyResult<List<SharedUser>, FlowyError>> getSharedUsersInPage({
required String pageId,
diff --git a/frontend/appflowy_flutter/lib/features/share_tab/logic/share_with_user_bloc.dart b/frontend/appflowy_flutter/lib/features/share_tab/logic/share_with_user_bloc.dart
index 6c451da245..96f364b4fe 100644
--- a/frontend/appflowy_flutter/lib/features/share_tab/logic/share_with_user_bloc.dart
+++ b/frontend/appflowy_flutter/lib/features/share_tab/logic/share_with_user_bloc.dart
@@ -1,6 +1,6 @@
import 'package:appflowy/features/share_tab/data/models/share_access_level.dart';
import 'package:appflowy/features/share_tab/data/models/shared_user.dart';
-import 'package:appflowy/features/share_tab/data/repositories/share_repository.dart';
+import 'package:appflowy/features/share_tab/data/repositories/share_with_user_repository.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';
@@ -29,7 +29,7 @@ class ShareWithUserBloc extends Bloc<ShareWithUserEvent, ShareWithUserState> {
on<SearchAvailableUsers>(_onSearchAvailableUsers);
}
- final ShareRepository repository;
+ final ShareWithUserRepository repository;
final String workspaceId;
final String pageId;
diff --git a/frontend/appflowy_flutter/lib/features/shared_section/data/local_share_pages_repository.dart b/frontend/appflowy_flutter/lib/features/shared_section/data/local_share_pages_repository.dart
new file mode 100644
index 0000000000..31341bc6f0
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/features/shared_section/data/local_share_pages_repository.dart
@@ -0,0 +1,33 @@
+import 'package:appflowy/features/share_tab/data/models/share_access_level.dart';
+import 'package:appflowy/features/shared_section/data/share_pages_repository.dart';
+import 'package:appflowy/features/shared_section/models/shared_page.dart';
+import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
+import 'package:appflowy_result/appflowy_result.dart';
+
+class LocalSharePagesRepository implements SharePagesRepository {
+ @override
+ Future<FlowyResult<SharedPages, FlowyError>> getSharedPages() async {
+ final pages = [
+ SharedPage(
+ view: ViewPB()
+ ..id = '1'
+ ..name = 'Welcome Page',
+ accessLevel: ShareAccessLevel.fullAccess,
+ ),
+ SharedPage(
+ view: ViewPB()
+ ..id = '2'
+ ..name = 'Project Plan',
+ accessLevel: ShareAccessLevel.readAndWrite,
+ ),
+ SharedPage(
+ view: ViewPB()
+ ..id = '3'
+ ..name = 'Readme',
+ accessLevel: ShareAccessLevel.readOnly,
+ ),
+ ];
+ return FlowyResult.success(pages);
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/features/shared_section/data/rust_share_pagers_repository.dart b/frontend/appflowy_flutter/lib/features/shared_section/data/rust_share_pagers_repository.dart
new file mode 100644
index 0000000000..efdd204443
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/features/shared_section/data/rust_share_pagers_repository.dart
@@ -0,0 +1,28 @@
+import 'package:appflowy/features/shared_section/data/share_pages_repository.dart';
+import 'package:appflowy/features/shared_section/models/shared_page.dart';
+import 'package:appflowy/features/shared_section/util/extensions.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_result/appflowy_result.dart';
+
+class RustSharePagesRepository implements SharePagesRepository {
+ @override
+ Future<FlowyResult<SharedPages, FlowyError>> getSharedPages() async {
+ final result = await FolderEventGetSharedViews().send();
+ return result.fold(
+ (success) {
+ final sharedPages = success.sharedPages;
+
+ Log.info('get shared pages success, len: ${sharedPages.length}');
+
+ return FlowyResult.success(sharedPages);
+ },
+ (error) {
+ Log.error('failed to get shared pages, error: $error');
+
+ return FlowyResult.failure(error);
+ },
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/features/shared_section/data/share_pages_repository.dart b/frontend/appflowy_flutter/lib/features/shared_section/data/share_pages_repository.dart
new file mode 100644
index 0000000000..d7e87832f2
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/features/shared_section/data/share_pages_repository.dart
@@ -0,0 +1,12 @@
+import 'package:appflowy/features/shared_section/models/shared_page.dart';
+import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
+import 'package:appflowy_result/appflowy_result.dart';
+
+/// Abstract repository for sharing pages with users.
+///
+/// For example, we're using rust events now, but we can still use the http api
+/// for the future.
+abstract class SharePagesRepository {
+ /// Gets the list of users and their roles for a shared page.
+ Future<FlowyResult<SharedPages, FlowyError>> getSharedPages();
+}
diff --git a/frontend/appflowy_flutter/lib/features/shared_section/logic/shared_section_bloc.dart b/frontend/appflowy_flutter/lib/features/shared_section/logic/shared_section_bloc.dart
new file mode 100644
index 0000000000..95bfb00f9d
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/features/shared_section/logic/shared_section_bloc.dart
@@ -0,0 +1,186 @@
+import 'dart:async';
+
+import 'package:appflowy/core/notification/folder_notification.dart';
+import 'package:appflowy/features/shared_section/data/share_pages_repository.dart';
+import 'package:appflowy/features/shared_section/models/shared_page.dart';
+import 'package:appflowy/features/shared_section/util/extensions.dart';
+import 'package:appflowy_backend/log.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
+import 'package:bloc/bloc.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'shared_section_bloc.freezed.dart';
+
+class SharedSectionBloc extends Bloc<SharedSectionEvent, SharedSectionState> {
+ SharedSectionBloc({
+ required this.repository,
+ required this.workspaceId,
+ this.enablePolling = false,
+ this.pollingIntervalSeconds = 30,
+ }) : super(SharedSectionState.initial()) {
+ on<_Init>(_onInit);
+ on<_Refresh>(_onRefresh);
+ on<_UpdateSharedPages>(_onUpdateSharedPages);
+ }
+
+ final String workspaceId;
+
+ // The repository to fetch the shared views.
+ // If you need to test this bloc, you can add your own repository implementation.
+ final SharePagesRepository repository;
+
+ // Used to listen for shared view updates.
+ late final FolderNotificationListener _folderNotificationListener;
+
+ // Since the backend doesn't provide a way to listen for shared view updates (websocket with shared view updates is not implemented yet),
+ // we need to poll the shared views periodically.
+ final bool enablePolling;
+
+ // The interval of polling the shared views.
+ final int pollingIntervalSeconds;
+
+ Timer? _pollingTimer;
+
+ @override
+ Future<void> close() async {
+ await _folderNotificationListener.stop();
+ _pollingTimer?.cancel();
+ await super.close();
+ }
+
+ Future<void> _onInit(
+ _Init event,
+ Emitter<SharedSectionState> emit,
+ ) async {
+ _initFolderNotificationListener();
+ _startPollingIfNeeded();
+
+ emit(
+ state.copyWith(
+ isLoading: true,
+ errorMessage: '',
+ ),
+ );
+ final result = await repository.getSharedPages();
+ result.fold(
+ (pages) {
+ emit(
+ state.copyWith(
+ sharedPages: pages,
+ isLoading: false,
+ ),
+ );
+ },
+ (error) {
+ emit(
+ state.copyWith(
+ errorMessage: error.msg,
+ isLoading: false,
+ ),
+ );
+ },
+ );
+ }
+
+ Future<void> _onRefresh(
+ _Refresh event,
+ Emitter<SharedSectionState> emit,
+ ) async {
+ final result = await repository.getSharedPages();
+
+ result.fold(
+ (pages) {
+ emit(
+ state.copyWith(
+ sharedPages: pages,
+ ),
+ );
+ },
+ (error) {
+ emit(
+ state.copyWith(
+ errorMessage: error.msg,
+ ),
+ );
+ },
+ );
+ }
+
+ void _onUpdateSharedPages(
+ _UpdateSharedPages event,
+ Emitter<SharedSectionState> emit,
+ ) {
+ emit(
+ state.copyWith(
+ sharedPages: event.sharedPages,
+ ),
+ );
+ }
+
+ void _initFolderNotificationListener() {
+ _folderNotificationListener = FolderNotificationListener(
+ objectId: workspaceId,
+ handler: (notification, result) {
+ if (notification == FolderNotification.DidUpdateSharedViews) {
+ final response = result.fold(
+ (payload) {
+ final repeatedSharedViews =
+ RepeatedSharedViewResponsePB.fromBuffer(payload);
+ return repeatedSharedViews;
+ },
+ (error) => null,
+ );
+ if (response != null) {
+ add(
+ SharedSectionEvent.updateSharedPages(
+ sharedPages: response.sharedPages,
+ ),
+ );
+ }
+ }
+ },
+ );
+ }
+
+ void _startPollingIfNeeded() {
+ _pollingTimer?.cancel();
+ if (enablePolling && pollingIntervalSeconds > 0) {
+ _pollingTimer = Timer.periodic(
+ Duration(seconds: pollingIntervalSeconds),
+ (_) {
+ add(const SharedSectionEvent.refresh());
+
+ Log.debug('Polling shared views');
+ },
+ );
+ }
+ }
+}
+
+@freezed
+class SharedSectionEvent with _$SharedSectionEvent {
+ /// Initialize, it will create a folder notification listener to listen for shared view updates.
+ /// Also, it will fetch the shared pages from the repository.
+ const factory SharedSectionEvent.init() = _Init;
+
+ /// Refresh, it will re-fetch the shared pages from the repository.
+ const factory SharedSectionEvent.refresh() = _Refresh;
+
+ /// Update the shared pages in the state.
+ const factory SharedSectionEvent.updateSharedPages({
+ required SharedPages sharedPages,
+ }) = _UpdateSharedPages;
+}
+
+@freezed
+class SharedSectionState with _$SharedSectionState {
+ const factory SharedSectionState({
+ @Default([]) SharedPages sharedPages,
+ @Default(false) bool isLoading,
+ @Default('') String errorMessage,
+ }) = _SharedSectionState;
+
+ const SharedSectionState._();
+
+ factory SharedSectionState.initial() => const SharedSectionState();
+}
diff --git a/frontend/appflowy_flutter/lib/features/shared_section/models/shared_page.dart b/frontend/appflowy_flutter/lib/features/shared_section/models/shared_page.dart
new file mode 100644
index 0000000000..12126fec57
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/features/shared_section/models/shared_page.dart
@@ -0,0 +1,14 @@
+import 'package:appflowy/features/share_tab/data/models/share_access_level.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
+
+typedef SharedPages = List<SharedPage>;
+
+class SharedPage {
+ SharedPage({
+ required this.view,
+ required this.accessLevel,
+ });
+
+ final ViewPB view;
+ final ShareAccessLevel accessLevel;
+}
diff --git a/frontend/appflowy_flutter/lib/features/shared_section/presentation/shared_section.dart b/frontend/appflowy_flutter/lib/features/shared_section/presentation/shared_section.dart
new file mode 100644
index 0000000000..fad0c5a748
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/features/shared_section/presentation/shared_section.dart
@@ -0,0 +1,61 @@
+import 'package:appflowy/features/shared_section/data/rust_share_pagers_repository.dart';
+import 'package:appflowy/features/shared_section/logic/shared_section_bloc.dart';
+import 'package:appflowy/features/shared_section/presentation/widgets/refresh_button.dart';
+import 'package:appflowy/features/shared_section/presentation/widgets/shared_pages_list.dart';
+import 'package:appflowy/features/shared_section/presentation/widgets/shared_section_error.dart';
+import 'package:appflowy/features/shared_section/presentation/widgets/shared_section_header.dart';
+import 'package:appflowy/features/shared_section/presentation/widgets/shared_section_loading.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class SharedSection extends StatelessWidget {
+ const SharedSection({
+ super.key,
+ required this.workspaceId,
+ });
+
+ final String workspaceId;
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocProvider(
+ create: (_) => SharedSectionBloc(
+ workspaceId: workspaceId,
+ repository: RustSharePagesRepository(),
+ )..add(const SharedSectionEvent.init()),
+ child: BlocBuilder<SharedSectionBloc, SharedSectionState>(
+ builder: (context, state) {
+ if (state.isLoading) {
+ return const SharedSectionLoading();
+ }
+
+ if (state.errorMessage.isNotEmpty) {
+ return SharedSectionError(errorMessage: state.errorMessage);
+ }
+
+ return Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ // Shared header
+ const SharedSectionHeader(),
+
+ // Shared pages list
+ SharedPagesList(sharedPages: state.sharedPages),
+
+ // Refresh button, for debugging only
+ if (kDebugMode)
+ RefreshSharedSectionButton(
+ onTap: () {
+ context.read<SharedSectionBloc>().add(
+ const SharedSectionEvent.refresh(),
+ );
+ },
+ ),
+ ],
+ );
+ },
+ ),
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/refresh_button.dart b/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/refresh_button.dart
new file mode 100644
index 0000000000..efd087e25a
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/refresh_button.dart
@@ -0,0 +1,25 @@
+import 'package:appflowy_ui/appflowy_ui.dart';
+import 'package:flutter/material.dart';
+
+class RefreshSharedSectionButton extends StatelessWidget {
+ const RefreshSharedSectionButton({
+ super.key,
+ required this.onTap,
+ });
+
+ final VoidCallback onTap;
+
+ @override
+ Widget build(BuildContext context) {
+ final theme = AppFlowyTheme.of(context);
+ return AFTextMenuItem(
+ leading: Icon(
+ Icons.refresh,
+ size: 20,
+ color: theme.iconColorScheme.secondary,
+ ),
+ title: 'Refresh',
+ onTap: onTap,
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/shared_pages_list.dart b/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/shared_pages_list.dart
new file mode 100644
index 0000000000..bf1beded18
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/shared_pages_list.dart
@@ -0,0 +1,44 @@
+import 'package:appflowy/features/shared_section/models/shared_page.dart';
+import 'package:appflowy/workspace/application/sidebar/folder/folder_bloc.dart';
+import 'package:appflowy/workspace/application/tabs/tabs_bloc.dart';
+import 'package:appflowy/workspace/presentation/home/home_sizes.dart';
+import 'package:appflowy/workspace/presentation/home/menu/view/view_item.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class SharedPagesList extends StatelessWidget {
+ const SharedPagesList({
+ super.key,
+ required this.sharedPages,
+ });
+
+ final SharedPages sharedPages;
+
+ @override
+ Widget build(BuildContext context) {
+ return Column(
+ mainAxisSize: MainAxisSize.min,
+ children: sharedPages.map((sharedPage) {
+ final view = sharedPage.view;
+ return ViewItem(
+ key: ValueKey(view.id),
+ spaceType: FolderSpaceType.public,
+ isFirstChild: view.id == sharedPages.first.view.id,
+ view: view,
+ level: 0,
+ leftPadding: HomeSpaceViewSizes.leftPadding,
+ isFeedback: false,
+ onSelected: (context, view) {
+ if (HardwareKeyboard.instance.isControlPressed) {
+ context.read<TabsBloc>().openTab(view);
+ }
+ context.read<TabsBloc>().openPlugin(view);
+ },
+ onTertiarySelected: (context, view) =>
+ context.read<TabsBloc>().openTab(view),
+ );
+ }).toList(),
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/shared_section_error.dart b/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/shared_section_error.dart
new file mode 100644
index 0000000000..d7d634225e
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/shared_section_error.dart
@@ -0,0 +1,25 @@
+import 'package:appflowy_ui/appflowy_ui.dart';
+import 'package:flutter/material.dart';
+
+class SharedSectionError extends StatelessWidget {
+ const SharedSectionError({
+ super.key,
+ required this.errorMessage,
+ });
+
+ final String errorMessage;
+
+ @override
+ Widget build(BuildContext context) {
+ final theme = AppFlowyTheme.of(context);
+ return Padding(
+ padding: const EdgeInsets.all(16.0),
+ child: Text(
+ errorMessage,
+ style: theme.textStyle.body.enhanced(
+ color: theme.textColorScheme.warning,
+ ),
+ ),
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/shared_section_header.dart b/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/shared_section_header.dart
new file mode 100644
index 0000000000..a93a74d8f1
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/shared_section_header.dart
@@ -0,0 +1,23 @@
+import 'package:appflowy_ui/appflowy_ui.dart';
+import 'package:flutter/material.dart';
+
+class SharedSectionHeader extends StatelessWidget {
+ const SharedSectionHeader({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ final theme = AppFlowyTheme.of(context);
+ return Padding(
+ padding: EdgeInsets.only(
+ left: theme.spacing.xs,
+ bottom: theme.spacing.s,
+ ),
+ child: Text(
+ 'Shared', // TODO: i18n
+ style: theme.textStyle.caption.enhanced(
+ color: theme.textColorScheme.tertiary,
+ ),
+ ),
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/shared_section_loading.dart b/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/shared_section_loading.dart
new file mode 100644
index 0000000000..8238a3dc83
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/features/shared_section/presentation/widgets/shared_section_loading.dart
@@ -0,0 +1,16 @@
+import 'package:appflowy_ui/appflowy_ui.dart';
+import 'package:flutter/material.dart';
+
+class SharedSectionLoading extends StatelessWidget {
+ const SharedSectionLoading({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ final theme = AppFlowyTheme.of(context);
+ return Center(
+ child: CircularProgressIndicator(
+ color: theme.iconColorScheme.primary,
+ ),
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/features/shared_section/util/extensions.dart b/frontend/appflowy_flutter/lib/features/shared_section/util/extensions.dart
new file mode 100644
index 0000000000..e6a2692511
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/features/shared_section/util/extensions.dart
@@ -0,0 +1,85 @@
+import 'package:appflowy/features/share_tab/data/models/models.dart';
+import 'package:appflowy/features/shared_section/models/shared_page.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
+
+extension RepeatedSharedViewResponsePBExtension
+ on RepeatedSharedViewResponsePB {
+ SharedPages get sharedPages {
+ return sharedViews.map((e) => e.sharedPage).toList();
+ }
+}
+
+extension SharedViewPBExtension on SharedViewPB {
+ SharedPage get sharedPage {
+ return SharedPage(
+ view: view,
+ accessLevel: accessLevel.shareAccessLevel,
+ );
+ }
+}
+
+extension RepeatedSharedUserPBExtension on RepeatedSharedUserPB {
+ List<SharedUser> get sharedUsers {
+ return items.map((e) => e.sharedUser).toList();
+ }
+}
+
+extension SharedUserPBExtension on SharedUserPB {
+ SharedUser get sharedUser {
+ return SharedUser(
+ email: email,
+ name: name,
+ accessLevel: accessLevel.shareAccessLevel,
+ role: role.shareRole,
+ avatarUrl: avatarUrl,
+ );
+ }
+}
+
+extension AFAccessLevelPBExtension on AFAccessLevelPB {
+ ShareAccessLevel get shareAccessLevel {
+ switch (this) {
+ case AFAccessLevelPB.ReadOnly:
+ return ShareAccessLevel.readOnly;
+ case AFAccessLevelPB.ReadAndComment:
+ return ShareAccessLevel.readAndComment;
+ case AFAccessLevelPB.ReadAndWrite:
+ return ShareAccessLevel.readAndWrite;
+ case AFAccessLevelPB.FullAccess:
+ return ShareAccessLevel.fullAccess;
+ default:
+ throw Exception('Unknown share role: $this');
+ }
+ }
+}
+
+extension ShareAccessLevelExtension on ShareAccessLevel {
+ AFAccessLevelPB get accessLevel {
+ switch (this) {
+ case ShareAccessLevel.readOnly:
+ return AFAccessLevelPB.ReadOnly;
+ case ShareAccessLevel.readAndComment:
+ return AFAccessLevelPB.ReadAndComment;
+ case ShareAccessLevel.readAndWrite:
+ return AFAccessLevelPB.ReadAndWrite;
+ case ShareAccessLevel.fullAccess:
+ return AFAccessLevelPB.FullAccess;
+ }
+ }
+}
+
+extension AFRolePBExtension on AFRolePB {
+ ShareRole get shareRole {
+ switch (this) {
+ case AFRolePB.Guest:
+ return ShareRole.guest;
+ case AFRolePB.Member:
+ return ShareRole.member;
+ case AFRolePB.Owner:
+ return ShareRole.owner;
+ default:
+ throw Exception('Unknown share role: $this');
+ }
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/plugins/shared/share/share_button.dart b/frontend/appflowy_flutter/lib/plugins/shared/share/share_button.dart
index c1fda78c34..6fda185bd2 100644
--- a/frontend/appflowy_flutter/lib/plugins/shared/share/share_button.dart
+++ b/frontend/appflowy_flutter/lib/plugins/shared/share/share_button.dart
@@ -1,4 +1,4 @@
-import 'package:appflowy/features/share_tab/data/repositories/rust_share_repository.dart';
+import 'package:appflowy/features/share_tab/data/repositories/rust_share_with_user_repository.dart';
import 'package:appflowy/features/share_tab/logic/share_with_user_bloc.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/database/application/tab_bar_bloc.dart';
@@ -44,8 +44,7 @@ class ShareButton extends StatelessWidget {
),
BlocProvider(
create: (context) => ShareWithUserBloc(
- // repository: MockShareRepository(),
- repository: RustShareRepository(),
+ repository: RustShareWithUserRepository(),
pageId: view.id,
workspaceId: workspaceId,
)..add(const ShareWithUserEvent.init()),
diff --git a/frontend/appflowy_flutter/lib/plugins/shared/share/share_menu.dart b/frontend/appflowy_flutter/lib/plugins/shared/share/share_menu.dart
index cc98b6cb4c..4b743de6f2 100644
--- a/frontend/appflowy_flutter/lib/plugins/shared/share/share_menu.dart
+++ b/frontend/appflowy_flutter/lib/plugins/shared/share/share_menu.dart
@@ -1,10 +1,12 @@
-// import 'package:appflowy/features/share_tab/presentation/share_tab.dart';
+import 'package:appflowy/features/share_tab/presentation/share_tab.dart'
+ as share_section;
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/mobile/presentation/home/tab/_round_underline_tab_indicator.dart';
import 'package:appflowy/plugins/shared/share/export_tab.dart';
import 'package:appflowy/plugins/shared/share/share_bloc.dart';
-import 'package:appflowy/plugins/shared/share/share_tab.dart';
+import 'package:appflowy/plugins/shared/share/share_tab.dart' as share_plugin;
+import 'package:appflowy/shared/feature_flags.dart';
import 'package:appflowy_ui/appflowy_ui.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
@@ -127,12 +129,14 @@ class _ShareMenuState extends State<ShareMenu>
case ShareMenuTab.exportAs:
return const ExportTab();
case ShareMenuTab.share:
- return const ShareTab();
- // TODO: enable it when share folder is ready.
- // return ShareTab(
- // workspaceId: context.read<ShareBloc>().state.workspaceId,
- // pageId: context.read<ShareBloc>().state.viewId,
- // );
+ if (FeatureFlag.sharedSection.isOn) {
+ return share_section.ShareTab(
+ workspaceId: context.read<ShareBloc>().state.workspaceId,
+ pageId: context.read<ShareBloc>().state.viewId,
+ );
+ }
+
+ return const share_plugin.ShareTab();
}
}
}
diff --git a/frontend/appflowy_flutter/lib/shared/feature_flags.dart b/frontend/appflowy_flutter/lib/shared/feature_flags.dart
index 7ea66076df..7b80231824 100644
--- a/frontend/appflowy_flutter/lib/shared/feature_flags.dart
+++ b/frontend/appflowy_flutter/lib/shared/feature_flags.dart
@@ -41,6 +41,9 @@ enum FeatureFlag {
// used for the inline sub-page mention
inlineSubPageMention,
+ // used for the shared section
+ sharedSection,
+
// used for ignore the conflicted feature flag
unknown;
@@ -121,6 +124,7 @@ enum FeatureFlag {
case FeatureFlag.syncDatabase:
case FeatureFlag.spaceDesign:
case FeatureFlag.inlineSubPageMention:
+ case FeatureFlag.sharedSection:
return true;
case FeatureFlag.collaborativeWorkspace:
case FeatureFlag.membersSettings:
@@ -147,6 +151,8 @@ enum FeatureFlag {
return 'if it\'s on, the space design feature will be available';
case FeatureFlag.inlineSubPageMention:
return 'if it\'s on, the inline sub-page mention feature will be available';
+ case FeatureFlag.sharedSection:
+ return 'if it\'s on, the shared section will be available';
case FeatureFlag.unknown:
return '';
}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space.dart
index 72015135b0..06204e82d7 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space.dart
@@ -1,3 +1,5 @@
+import 'package:appflowy/features/shared_section/presentation/shared_section.dart';
+import 'package:appflowy/shared/feature_flags.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/workspace/application/favorite/favorite_bloc.dart';
import 'package:appflowy/workspace/application/sidebar/space/space_bloc.dart';
@@ -30,6 +32,9 @@ class SidebarSpace extends StatelessWidget {
@override
Widget build(BuildContext context) {
+ final currentWorkspace =
+ context.watch<UserWorkspaceBloc>().state.currentWorkspace;
+ final currentWorkspaceId = currentWorkspace?.workspaceId ?? '';
return ValueListenableBuilder(
valueListenable: getIt<MenuSharedState>().notifier,
builder: (_, __, ___) => Provider.value(
@@ -48,9 +53,19 @@ class SidebarSpace extends StatelessWidget {
);
},
),
+
const VSpace(16.0),
// spaces
const _Space(),
+
+ // shared
+ if (FeatureFlag.sharedSection.isOn) ...[
+ const VSpace(16.0),
+ SharedSection(
+ workspaceId: currentWorkspaceId,
+ ),
+ ],
+
const VSpace(200),
],
),
diff --git a/frontend/appflowy_flutter/test/bloc_test/lib/features/share_section/shared_section_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/lib/features/share_section/shared_section_bloc_test.dart
new file mode 100644
index 0000000000..b58a4eeb0d
--- /dev/null
+++ b/frontend/appflowy_flutter/test/bloc_test/lib/features/share_section/shared_section_bloc_test.dart
@@ -0,0 +1,57 @@
+import 'package:appflowy/features/share_tab/data/models/share_access_level.dart';
+import 'package:appflowy/features/shared_section/data/share_pages_repository.dart';
+import 'package:appflowy/features/shared_section/logic/shared_section_bloc.dart';
+import 'package:appflowy/features/shared_section/models/shared_page.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
+import 'package:appflowy_result/appflowy_result.dart';
+import 'package:bloc_test/bloc_test.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mocktail/mocktail.dart';
+
+class MockSharePagesRepository extends Mock implements SharePagesRepository {}
+
+void main() {
+ late MockSharePagesRepository repository;
+ late SharedSectionBloc bloc;
+ const workspaceId = 'workspace-id';
+ final initialPages = <SharedPage>[];
+ final updatedPages = <SharedPage>[
+ SharedPage(
+ view: ViewPB(
+ id: '1',
+ name: 'Page 1',
+ ),
+ accessLevel: ShareAccessLevel.readOnly,
+ ),
+ ];
+
+ setUp(() {
+ repository = MockSharePagesRepository();
+ when(() => repository.getSharedPages())
+ .thenAnswer((_) async => FlowyResult.success(initialPages));
+ bloc = SharedSectionBloc(
+ repository: repository,
+ workspaceId: workspaceId,
+ )..add(const SharedSectionEvent.init());
+ });
+
+ tearDown(() async {
+ await bloc.close();
+ });
+
+ blocTest<SharedSectionBloc, SharedSectionState>(
+ 'emits updated sharedPages on updateSharedPages',
+ build: () => bloc,
+ act: (bloc) => bloc.add(
+ SharedSectionEvent.updateSharedPages(
+ sharedPages: updatedPages,
+ ),
+ ),
+ wait: const Duration(milliseconds: 100),
+ expect: () => [
+ SharedSectionState.initial().copyWith(
+ sharedPages: updatedPages,
+ ),
+ ],
+ );
+}
diff --git a/frontend/appflowy_flutter/test/bloc_test/lib/features/share_tab/share_with_user_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/lib/features/share_tab/share_with_user_bloc_test.dart
index c7e5367b91..1216f707c2 100644
--- a/frontend/appflowy_flutter/test/bloc_test/lib/features/share_tab/share_with_user_bloc_test.dart
+++ b/frontend/appflowy_flutter/test/bloc_test/lib/features/share_tab/share_with_user_bloc_test.dart
@@ -1,5 +1,5 @@
import 'package:appflowy/features/share_tab/data/models/models.dart';
-import 'package:appflowy/features/share_tab/data/repositories/mock_share_repository.dart';
+import 'package:appflowy/features/share_tab/data/repositories/local_share_with_user_repository.dart';
import 'package:appflowy/features/share_tab/logic/share_with_user_bloc.dart';
import 'package:bloc_test/bloc_test.dart';
import 'package:flutter_test/flutter_test.dart';
@@ -7,11 +7,11 @@ import 'package:flutter_test/flutter_test.dart';
void main() {
const pageId = 'test_page_id';
const workspaceId = 'test_workspace_id';
- late MockShareRepository repository;
+ late LocalShareWithUserRepository repository;
late ShareWithUserBloc bloc;
setUp(() {
- repository = MockShareRepository();
+ repository = LocalShareWithUserRepository();
bloc = ShareWithUserBloc(
repository: repository,
pageId: pageId,
@@ -19,6 +19,10 @@ void main() {
);
});
+ tearDown(() async {
+ await bloc.close();
+ });
+
const email = '[email protected]';
group('ShareWithUserBloc', () {
diff --git a/frontend/appflowy_flutter/test/widget_test/lib/features/share_section/refresh_button_test.dart b/frontend/appflowy_flutter/test/widget_test/lib/features/share_section/refresh_button_test.dart
new file mode 100644
index 0000000000..68c27f4424
--- /dev/null
+++ b/frontend/appflowy_flutter/test/widget_test/lib/features/share_section/refresh_button_test.dart
@@ -0,0 +1,25 @@
+import 'package:appflowy/features/shared_section/presentation/widgets/refresh_button.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import '../../../widget_test_wrapper.dart';
+
+void main() {
+ group('refresh_button.dart: ', () {
+ testWidgets('shows refresh icon and triggers callback',
+ (WidgetTester tester) async {
+ bool pressed = false;
+ await tester.pumpWidget(
+ WidgetTestWrapper(
+ child: RefreshSharedSectionButton(
+ onTap: () => pressed = true,
+ ),
+ ),
+ );
+ expect(find.byIcon(Icons.refresh), findsOneWidget);
+ await tester.tap(find.byIcon(Icons.refresh));
+ await tester.pumpAndSettle();
+ expect(pressed, isTrue);
+ });
+ });
+}
diff --git a/frontend/appflowy_flutter/test/widget_test/lib/features/share_section/shared_pages_list_test.dart b/frontend/appflowy_flutter/test/widget_test/lib/features/share_section/shared_pages_list_test.dart
new file mode 100644
index 0000000000..dce47fa082
--- /dev/null
+++ b/frontend/appflowy_flutter/test/widget_test/lib/features/share_section/shared_pages_list_test.dart
@@ -0,0 +1,61 @@
+import 'package:appflowy/core/config/kv.dart';
+import 'package:appflowy/features/share_tab/data/models/share_access_level.dart';
+import 'package:appflowy/features/shared_section/models/shared_page.dart';
+import 'package:appflowy/features/shared_section/presentation/widgets/shared_pages_list.dart';
+import 'package:appflowy/workspace/presentation/home/menu/menu_shared_state.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:get_it/get_it.dart';
+import 'package:mocktail/mocktail.dart';
+
+import '../../../widget_test_wrapper.dart';
+
+void main() {
+ setUp(() {
+ final mockStorage = MockKeyValueStorage();
+ // Stub methods to return appropriate Future values
+ when(() => mockStorage.get(any())).thenAnswer((_) => Future.value());
+ when(() => mockStorage.set(any(), any())).thenAnswer((_) => Future.value());
+ when(() => mockStorage.remove(any())).thenAnswer((_) => Future.value());
+ when(() => mockStorage.clear()).thenAnswer((_) => Future.value());
+
+ GetIt.I.registerSingleton<KeyValueStorage>(mockStorage);
+ GetIt.I.registerSingleton<MenuSharedState>(MenuSharedState());
+ });
+
+ tearDown(() {
+ GetIt.I.reset();
+ });
+
+ group('shared_pages_list.dart: ', () {
+ testWidgets('shows list of shared pages', (WidgetTester tester) async {
+ final sharedPages = [
+ SharedPage(
+ view: ViewPB()
+ ..id = '1'
+ ..name = 'Page 1',
+ accessLevel: ShareAccessLevel.readOnly,
+ ),
+ SharedPage(
+ view: ViewPB()
+ ..id = '2'
+ ..name = 'Page 2',
+ accessLevel: ShareAccessLevel.readOnly,
+ ),
+ ];
+ await tester.pumpWidget(
+ WidgetTestWrapper(
+ child: SingleChildScrollView(
+ child: SharedPagesList(sharedPages: sharedPages),
+ ),
+ ),
+ );
+ expect(find.text('Page 1'), findsOneWidget);
+ expect(find.text('Page 2'), findsOneWidget);
+ expect(find.byType(SharedPagesList), findsOneWidget);
+ });
+ });
+}
+
+class MockKeyValueStorage extends Mock implements KeyValueStorage {}
diff --git a/frontend/appflowy_flutter/test/widget_test/lib/features/share_section/shared_section_error_test.dart b/frontend/appflowy_flutter/test/widget_test/lib/features/share_section/shared_section_error_test.dart
new file mode 100644
index 0000000000..fafaa4fcff
--- /dev/null
+++ b/frontend/appflowy_flutter/test/widget_test/lib/features/share_section/shared_section_error_test.dart
@@ -0,0 +1,18 @@
+import 'package:appflowy/features/shared_section/presentation/widgets/shared_section_error.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import '../../../widget_test_wrapper.dart';
+
+void main() {
+ group('shared_section_error.dart: ', () {
+ testWidgets('shows error message', (WidgetTester tester) async {
+ await tester.pumpWidget(
+ WidgetTestWrapper(
+ child: SharedSectionError(errorMessage: 'An error occurred'),
+ ),
+ );
+ expect(find.text('An error occurred'), findsOneWidget);
+ expect(find.byType(SharedSectionError), findsOneWidget);
+ });
+ });
+}
diff --git a/frontend/appflowy_flutter/test/widget_test/lib/features/share_section/shared_section_header_test.dart b/frontend/appflowy_flutter/test/widget_test/lib/features/share_section/shared_section_header_test.dart
new file mode 100644
index 0000000000..b1a2983dd6
--- /dev/null
+++ b/frontend/appflowy_flutter/test/widget_test/lib/features/share_section/shared_section_header_test.dart
@@ -0,0 +1,18 @@
+import 'package:appflowy/features/shared_section/presentation/widgets/shared_section_header.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import '../../../widget_test_wrapper.dart';
+
+void main() {
+ group('shared_section_header.dart: ', () {
+ testWidgets('shows header title', (WidgetTester tester) async {
+ await tester.pumpWidget(
+ WidgetTestWrapper(
+ child: const SharedSectionHeader(),
+ ),
+ );
+ expect(find.text('Shared'), findsOneWidget);
+ expect(find.byType(SharedSectionHeader), findsOneWidget);
+ });
+ });
+}
diff --git a/frontend/appflowy_flutter/test/widget_test/lib/features/share_section/shared_section_loading_test.dart b/frontend/appflowy_flutter/test/widget_test/lib/features/share_section/shared_section_loading_test.dart
new file mode 100644
index 0000000000..940c629b49
--- /dev/null
+++ b/frontend/appflowy_flutter/test/widget_test/lib/features/share_section/shared_section_loading_test.dart
@@ -0,0 +1,17 @@
+import 'package:appflowy/features/shared_section/presentation/widgets/shared_section_loading.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import '../../../widget_test_wrapper.dart';
+
+void main() {
+ group('shared_section_loading.dart: ', () {
+ testWidgets('shows loading indicator', (WidgetTester tester) async {
+ await tester.pumpWidget(
+ WidgetTestWrapper(
+ child: SharedSectionLoading(),
+ ),
+ );
+ expect(find.byType(SharedSectionLoading), findsOneWidget);
+ });
+ });
+}
diff --git a/frontend/appflowy_flutter/test/widget_test/lib/features/share_tab/copy_link_widget_test.dart b/frontend/appflowy_flutter/test/widget_test/lib/features/share_tab/copy_link_widget_test.dart
index b930a3fa64..97d5beb8c9 100644
--- a/frontend/appflowy_flutter/test/widget_test/lib/features/share_tab/copy_link_widget_test.dart
+++ b/frontend/appflowy_flutter/test/widget_test/lib/features/share_tab/copy_link_widget_test.dart
@@ -1,4 +1,4 @@
-import 'package:appflowy/features/share_tab/data/repositories/mock_share_repository.dart';
+import 'package:appflowy/features/share_tab/data/repositories/local_share_with_user_repository.dart';
import 'package:appflowy/features/share_tab/logic/share_with_user_bloc.dart';
import 'package:appflowy/features/share_tab/presentation/widgets/copy_link_widget.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/copy_and_paste/clipboard_service.dart';
@@ -27,7 +27,7 @@ void main() {
final mockClipboard = getIt<ClipboardService>() as _MockClipboardService;
when(() => mockClipboard.setData(any())).thenAnswer((_) async {});
final bloc = ShareWithUserBloc(
- repository: MockShareRepository(),
+ repository: LocalShareWithUserRepository(),
pageId: 'pageId',
workspaceId: 'workspaceId',
);
diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock
index bd787e392a..52453b2cc5 100644
--- a/frontend/rust-lib/Cargo.lock
+++ b/frontend/rust-lib/Cargo.lock
@@ -2569,11 +2569,14 @@ name = "flowy-folder-pub"
version = "0.1.0"
dependencies = [
"anyhow",
+ "chrono",
"client-api",
"collab",
"collab-entity",
"collab-folder",
+ "diesel",
"flowy-error",
+ "flowy-sqlite",
"lib-infra",
"serde",
"serde_json",
diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/cloud_service_impl.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/cloud_service_impl.rs
index ab1f4f1027..d5e4fbd606 100644
--- a/frontend/rust-lib/flowy-core/src/deps_resolve/cloud_service_impl.rs
+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/cloud_service_impl.rs
@@ -32,7 +32,8 @@ use flowy_folder_pub::entities::PublishPayload;
use flowy_search_pub::cloud::SearchCloudService;
use flowy_server_pub::af_cloud_config::AFCloudConfiguration;
use flowy_server_pub::guest_dto::{
- RevokeSharedViewAccessRequest, ShareViewWithGuestRequest, SharedViewDetails,
+ ListSharedViewResponse, RevokeSharedViewAccessRequest, ShareViewWithGuestRequest,
+ SharedViewDetails,
};
use flowy_storage_pub::cloud::{ObjectIdentity, ObjectValue, StorageCloudService};
use flowy_storage_pub::storage::{CompletedPartRequest, CreateUploadResponse, UploadPartResponse};
@@ -444,6 +445,17 @@ impl FolderCloudService for ServerProvider {
.get_shared_page_details(workspace_id, view_id)
.await
}
+
+ async fn get_shared_views(
+ &self,
+ workspace_id: &Uuid,
+ ) -> Result<ListSharedViewResponse, FlowyError> {
+ self
+ .get_server()?
+ .folder_service()
+ .get_shared_views(workspace_id)
+ .await
+ }
}
#[async_trait]
diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps/mod.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps/mod.rs
index 62a02e177d..39a749bfb0 100644
--- a/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps/mod.rs
+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps/mod.rs
@@ -14,6 +14,7 @@ use flowy_folder::entities::UpdateViewParams;
use flowy_folder::manager::{FolderManager, FolderUser};
use flowy_folder::ViewLayout;
use flowy_sqlite::kv::KVStorePreferences;
+use flowy_sqlite::DBConnection;
use flowy_user::services::authenticate_user::AuthenticateUser;
use flowy_user::services::data_import::load_collab_by_object_id;
use std::str::FromStr;
@@ -102,6 +103,10 @@ impl FolderUser for FolderUserImpl {
.upgrade_user()?
.is_collab_on_disk(uid, workspace_id.to_string().as_str())
}
+
+ fn sqlite_connection(&self, uid: i64) -> Result<DBConnection, FlowyError> {
+ self.upgrade_user()?.get_sqlite_connection(uid)
+ }
}
#[derive(Clone)]
diff --git a/frontend/rust-lib/flowy-folder-pub/Cargo.toml b/frontend/rust-lib/flowy-folder-pub/Cargo.toml
index 725196a3b9..b266cbc703 100644
--- a/frontend/rust-lib/flowy-folder-pub/Cargo.toml
+++ b/frontend/rust-lib/flowy-folder-pub/Cargo.toml
@@ -16,6 +16,9 @@ serde = { version = "1.0.202", features = ["derive"] }
serde_json.workspace = true
client-api = { workspace = true }
flowy-error.workspace = true
+flowy-sqlite = { workspace = true }
+diesel = { workspace = true }
+chrono = { workspace = true }
[dev-dependencies]
tokio.workspace = true
diff --git a/frontend/rust-lib/flowy-folder-pub/src/cloud.rs b/frontend/rust-lib/flowy-folder-pub/src/cloud.rs
index 6423a73d74..0bfe7c81bc 100644
--- a/frontend/rust-lib/flowy-folder-pub/src/cloud.rs
+++ b/frontend/rust-lib/flowy-folder-pub/src/cloud.rs
@@ -2,7 +2,10 @@ use crate::entities::PublishPayload;
pub use anyhow::Error;
use client_api::entity::{
PublishInfo,
- guest_dto::{RevokeSharedViewAccessRequest, ShareViewWithGuestRequest, SharedViewDetails},
+ guest_dto::{
+ ListSharedViewResponse, RevokeSharedViewAccessRequest, ShareViewWithGuestRequest,
+ SharedViewDetails,
+ },
workspace_dto::PublishInfoView,
};
use collab::entity::EncodedCollab;
@@ -113,6 +116,12 @@ pub trait FolderCloudService: Send + Sync + 'static {
workspace_id: &Uuid,
view_id: &Uuid,
) -> Result<SharedViewDetails, FlowyError>;
+
+ /// Get the shared views of a workspace
+ async fn get_shared_views(
+ &self,
+ workspace_id: &Uuid,
+ ) -> Result<ListSharedViewResponse, FlowyError>;
}
#[derive(Debug)]
diff --git a/frontend/rust-lib/flowy-folder-pub/src/lib.rs b/frontend/rust-lib/flowy-folder-pub/src/lib.rs
index 38d61c8e9c..cfd694fd50 100644
--- a/frontend/rust-lib/flowy-folder-pub/src/lib.rs
+++ b/frontend/rust-lib/flowy-folder-pub/src/lib.rs
@@ -1,3 +1,4 @@
pub mod cloud;
pub mod entities;
pub mod query;
+pub mod sql;
diff --git a/frontend/rust-lib/flowy-folder-pub/src/sql/mod.rs b/frontend/rust-lib/flowy-folder-pub/src/sql/mod.rs
new file mode 100644
index 0000000000..4177ed9026
--- /dev/null
+++ b/frontend/rust-lib/flowy-folder-pub/src/sql/mod.rs
@@ -0,0 +1 @@
+pub mod workspace_shared_view_sql;
diff --git a/frontend/rust-lib/flowy-folder-pub/src/sql/workspace_shared_view_sql.rs b/frontend/rust-lib/flowy-folder-pub/src/sql/workspace_shared_view_sql.rs
new file mode 100644
index 0000000000..be6c7b87e6
--- /dev/null
+++ b/frontend/rust-lib/flowy-folder-pub/src/sql/workspace_shared_view_sql.rs
@@ -0,0 +1,105 @@
+use diesel::{RunQueryDsl, insert_into};
+use flowy_error::FlowyResult;
+use flowy_sqlite::schema::workspace_shared_view;
+use flowy_sqlite::schema::workspace_shared_view::dsl;
+use flowy_sqlite::{DBConnection, ExpressionMethods, prelude::*};
+
+#[derive(Queryable, Insertable, AsChangeset, Debug, Clone)]
+#[diesel(table_name = workspace_shared_view)]
+#[diesel(primary_key(uid, workspace_id, view_id))]
+pub struct WorkspaceSharedViewTable {
+ pub uid: i64,
+ pub workspace_id: String,
+ pub view_id: String,
+ pub permission_id: i32,
+ pub created_at: Option<chrono::NaiveDateTime>,
+}
+
+pub fn upsert_workspace_shared_view<T: Into<WorkspaceSharedViewTable>>(
+ conn: &mut SqliteConnection,
+ shared_view: T,
+) -> FlowyResult<()> {
+ let shared_view = shared_view.into();
+
+ insert_into(workspace_shared_view::table)
+ .values(&shared_view)
+ .on_conflict((
+ workspace_shared_view::uid,
+ workspace_shared_view::workspace_id,
+ workspace_shared_view::view_id,
+ ))
+ .do_update()
+ .set(&shared_view)
+ .execute(conn)?;
+
+ Ok(())
+}
+
+pub fn select_workspace_shared_view(
+ mut conn: DBConnection,
+ workspace_id: &str,
+ view_id: &str,
+ uid: i64,
+) -> FlowyResult<WorkspaceSharedViewTable> {
+ let shared_view = dsl::workspace_shared_view
+ .filter(workspace_shared_view::workspace_id.eq(workspace_id))
+ .filter(workspace_shared_view::view_id.eq(view_id))
+ .filter(workspace_shared_view::uid.eq(uid))
+ .first::<WorkspaceSharedViewTable>(&mut conn)?;
+
+ Ok(shared_view)
+}
+
+pub fn select_all_workspace_shared_views(
+ mut conn: DBConnection,
+ workspace_id: &str,
+ uid: i64,
+) -> FlowyResult<Vec<WorkspaceSharedViewTable>> {
+ let shared_views = dsl::workspace_shared_view
+ .filter(workspace_shared_view::workspace_id.eq(workspace_id))
+ .filter(workspace_shared_view::uid.eq(uid))
+ .load::<WorkspaceSharedViewTable>(&mut conn)?;
+ Ok(shared_views)
+}
+
+pub fn upsert_workspace_shared_views<T: Into<WorkspaceSharedViewTable> + Clone>(
+ conn: &mut SqliteConnection,
+ _workspace_id: &str,
+ _uid: i64,
+ shared_views: &[T],
+) -> FlowyResult<()> {
+ for shared_view in shared_views.iter().cloned() {
+ let shared_view: WorkspaceSharedViewTable = shared_view.into();
+ insert_into(workspace_shared_view::table)
+ .values(&shared_view)
+ .on_conflict((
+ workspace_shared_view::uid,
+ workspace_shared_view::workspace_id,
+ workspace_shared_view::view_id,
+ ))
+ .do_update()
+ .set(&shared_view)
+ .execute(conn)?;
+ }
+ Ok(())
+}
+
+/// Removes all workspace_shared_view items for the given workspace_id and uid, then inserts the provided new items.
+pub fn replace_all_workspace_shared_views<T: Into<WorkspaceSharedViewTable> + Clone>(
+ conn: &mut SqliteConnection,
+ workspace_id: &str,
+ uid: i64,
+ new_shared_views: &[T],
+) -> FlowyResult<()> {
+ // Remove all existing items for the workspace_id and uid
+ delete(
+ workspace_shared_view::table
+ .filter(workspace_shared_view::workspace_id.eq(workspace_id))
+ .filter(workspace_shared_view::uid.eq(uid)),
+ )
+ .execute(conn)?;
+
+ upsert_workspace_shared_views(conn, workspace_id, uid, new_shared_views)?;
+
+ Ok(())
+}
diff --git a/frontend/rust-lib/flowy-folder-pub/src/workspace_shared_view_sql.rs b/frontend/rust-lib/flowy-folder-pub/src/workspace_shared_view_sql.rs
new file mode 100644
index 0000000000..718e616d82
--- /dev/null
+++ b/frontend/rust-lib/flowy-folder-pub/src/workspace_shared_view_sql.rs
@@ -0,0 +1,51 @@
+use diesel::{RunQueryDsl, insert_into};
+use flowy_error::FlowyResult;
+use flowy_sqlite::schema::workspace_shared_view;
+use flowy_sqlite::schema::workspace_shared_view::dsl;
+use flowy_sqlite::{DBConnection, ExpressionMethods, prelude::*};
+
+#[derive(Queryable, Insertable, AsChangeset, Debug, Clone)]
+#[diesel(table_name = workspace_shared_view)]
+#[diesel(primary_key(uid, workspace_id, view_id))]
+pub struct WorkspaceSharedViewTable {
+ pub uid: i64,
+ pub workspace_id: String,
+ pub view_id: String,
+ pub permission_id: i32,
+ pub created_at: Option<chrono::NaiveDateTime>,
+}
+
+pub fn upsert_workspace_shared_view<T: Into<WorkspaceSharedViewTable>>(
+ conn: &mut SqliteConnection,
+ shared_view: T,
+) -> FlowyResult<()> {
+ let shared_view = shared_view.into();
+
+ insert_into(workspace_shared_view::table)
+ .values(&shared_view)
+ .on_conflict((
+ workspace_shared_view::uid,
+ workspace_shared_view::workspace_id,
+ workspace_shared_view::view_id,
+ ))
+ .do_update()
+ .set(&shared_view)
+ .execute(conn)?;
+
+ Ok(())
+}
+
+pub fn select_workspace_shared_view(
+ mut conn: DBConnection,
+ workspace_id: &str,
+ view_id: &str,
+ uid: i64,
+) -> FlowyResult<WorkspaceSharedViewTable> {
+ let shared_view = dsl::workspace_shared_view
+ .filter(workspace_shared_view::workspace_id.eq(workspace_id))
+ .filter(workspace_shared_view::view_id.eq(view_id))
+ .filter(workspace_shared_view::uid.eq(uid))
+ .first::<WorkspaceSharedViewTable>(&mut conn)?;
+
+ Ok(shared_view)
+}
diff --git a/frontend/rust-lib/flowy-folder/src/entities/view.rs b/frontend/rust-lib/flowy-folder/src/entities/view.rs
index 973ffd24c0..a2c56d5138 100644
--- a/frontend/rust-lib/flowy-folder/src/entities/view.rs
+++ b/frontend/rust-lib/flowy-folder/src/entities/view.rs
@@ -8,6 +8,7 @@ use flowy_error::ErrorCode;
use flowy_folder_pub::cloud::gen_view_id;
use lib_infra::validator_fn::required_not_empty_str;
use std::collections::HashMap;
+use std::collections::HashSet;
use std::convert::TryInto;
use std::ops::{Deref, DerefMut};
use std::str::FromStr;
@@ -144,6 +145,44 @@ pub fn view_pb_with_child_views(view: Arc<View>, child_views: Vec<Arc<View>>) ->
}
}
+/// Returns a ViewPB with all descendants recursively included in child_views.
+pub fn view_pb_with_all_child_views<F>(view: Arc<View>, get_children: &F) -> ViewPB
+where
+ F: Fn(&str) -> Vec<Arc<View>>,
+{
+ fn helper<F>(view: Arc<View>, get_children: &F, visited: &mut HashSet<String>) -> ViewPB
+ where
+ F: Fn(&str) -> Vec<Arc<View>>,
+ {
+ if !visited.insert(view.id.clone()) {
+ // Already visited this view, stop recursion to prevent cycle
+ return view_pb_without_child_views(view.as_ref().clone());
+ }
+ let child_views = get_children(&view.id)
+ .into_iter()
+ .map(|child| helper(child, get_children, visited))
+ .collect();
+ ViewPB {
+ id: view.id.clone(),
+ parent_view_id: view.parent_view_id.clone(),
+ name: view.name.clone(),
+ create_time: view.created_at,
+ child_views,
+ layout: view.layout.clone().into(),
+ icon: view.icon.clone().map(|icon| icon.into()),
+ is_favorite: view.is_favorite,
+ extra: view.extra.clone(),
+ created_by: view.created_by,
+ last_edited: view.last_edited_time,
+ last_edited_by: view.last_edited_by,
+ is_locked: view.is_locked,
+ }
+ }
+
+ let mut visited = HashSet::new();
+ helper(view, get_children, &mut visited)
+}
+
#[derive(Eq, PartialEq, Hash, Debug, ProtoBuf_Enum, Clone, Default)]
pub enum ViewLayoutPB {
#[default]
@@ -714,6 +753,23 @@ impl From<AFAccessLevel> for AFAccessLevelPB {
}
}
+impl From<i32> for AFAccessLevelPB {
+ // These values are from client-api, so don't change them.
+ // ReadOnly = 10,
+ // ReadAndComment = 20,
+ // ReadAndWrite = 30,
+ // FullAccess = 50,
+ fn from(value: i32) -> Self {
+ match value {
+ 10 => AFAccessLevelPB::ReadOnly,
+ 20 => AFAccessLevelPB::ReadAndComment,
+ 30 => AFAccessLevelPB::ReadAndWrite,
+ 50 => AFAccessLevelPB::FullAccess,
+ _ => AFAccessLevelPB::ReadOnly,
+ }
+ }
+}
+
#[derive(Debug, ProtoBuf_Enum, Clone, Default, Eq, PartialEq)]
pub enum AFRolePB {
Owner = 0,
@@ -837,6 +893,20 @@ pub struct GetSharedUsersPayloadPB {
pub view_id: String,
}
+#[derive(Default, ProtoBuf, Clone, Debug)]
+pub struct SharedViewPB {
+ #[pb(index = 1)]
+ pub view: ViewPB,
+ #[pb(index = 2)]
+ pub access_level: AFAccessLevelPB,
+}
+
+#[derive(Default, ProtoBuf, Clone, Debug)]
+pub struct RepeatedSharedViewResponsePB {
+ #[pb(index = 1)]
+ pub shared_views: Vec<SharedViewPB>,
+}
+
// impl<'de> Deserialize<'de> for ViewDataType {
// fn deserialize<D>(deserializer: D) -> Result<Self, <D as Deserializer<'de>>::Error>
// where
diff --git a/frontend/rust-lib/flowy-folder/src/event_handler.rs b/frontend/rust-lib/flowy-folder/src/event_handler.rs
index 780f1f6b58..ef9e495d8a 100644
--- a/frontend/rust-lib/flowy-folder/src/event_handler.rs
+++ b/frontend/rust-lib/flowy-folder/src/event_handler.rs
@@ -580,3 +580,12 @@ pub(crate) async fn remove_user_from_shared_page_handler(
folder.revoke_shared_page_access(&page_id, params).await?;
Ok(())
}
+
+#[tracing::instrument(level = "debug", skip(folder), err)]
+pub(crate) async fn get_shared_views_handler(
+ folder: AFPluginState<Weak<FolderManager>>,
+) -> DataResult<RepeatedSharedViewResponsePB, FlowyError> {
+ let folder = upgrade_folder(folder)?;
+ let resp = folder.get_shared_pages().await?;
+ data_result_ok(resp)
+}
diff --git a/frontend/rust-lib/flowy-folder/src/event_map.rs b/frontend/rust-lib/flowy-folder/src/event_map.rs
index 8adac46b43..75fe784d7d 100644
--- a/frontend/rust-lib/flowy-folder/src/event_map.rs
+++ b/frontend/rust-lib/flowy-folder/src/event_map.rs
@@ -57,6 +57,7 @@ pub fn init(folder: Weak<FolderManager>) -> AFPlugin {
.event(FolderEvent::SharePageWithUser, share_page_with_user_handler)
.event(FolderEvent::RemoveUserFromSharedPage, remove_user_from_shared_page_handler)
.event(FolderEvent::GetSharedUsers, get_shared_users_handler)
+ .event(FolderEvent::GetSharedViews, get_shared_views_handler)
}
#[derive(Clone, Copy, PartialEq, Eq, Debug, Display, Hash, ProtoBuf_Enum, Flowy_Event)]
@@ -238,4 +239,7 @@ pub enum FolderEvent {
#[event(input = "GetSharedUsersPayloadPB", output = "RepeatedSharedUserPB")]
GetSharedUsers = 58,
+
+ #[event(output = "RepeatedSharedViewResponsePB")]
+ GetSharedViews = 59,
}
diff --git a/frontend/rust-lib/flowy-folder/src/manager.rs b/frontend/rust-lib/flowy-folder/src/manager.rs
index 3742841e29..0601516e96 100644
--- a/frontend/rust-lib/flowy-folder/src/manager.rs
+++ b/frontend/rust-lib/flowy-folder/src/manager.rs
@@ -1,8 +1,9 @@
use crate::entities::icon::UpdateViewIconParams;
use crate::entities::{
- CreateViewParams, DeletedViewPB, DuplicateViewParams, FolderSnapshotPB, MoveNestedViewParams,
- RepeatedTrashPB, RepeatedViewIdPB, RepeatedViewPB, UpdateViewParams, ViewLayoutPB, ViewPB,
- ViewSectionPB, WorkspaceLatestPB, WorkspacePB, view_pb_with_child_views,
+ AFAccessLevelPB, CreateViewParams, DeletedViewPB, DuplicateViewParams, FolderSnapshotPB,
+ MoveNestedViewParams, RepeatedSharedViewResponsePB, RepeatedTrashPB, RepeatedViewIdPB,
+ RepeatedViewPB, SharedViewPB, UpdateViewParams, ViewLayoutPB, ViewPB, ViewSectionPB,
+ WorkspaceLatestPB, WorkspacePB, view_pb_with_all_child_views, view_pb_with_child_views,
view_pb_without_child_views, view_pb_without_child_views_from_arc,
};
use crate::manager_observer::{
@@ -41,6 +42,10 @@ use flowy_folder_pub::entities::{
PublishDatabaseData, PublishDatabasePayload, PublishDocumentPayload, PublishPayload,
PublishViewInfo, PublishViewMeta, PublishViewMetaData,
};
+use flowy_folder_pub::sql::workspace_shared_view_sql::{
+ WorkspaceSharedViewTable, replace_all_workspace_shared_views, select_all_workspace_shared_views,
+};
+use flowy_sqlite::DBConnection;
use flowy_sqlite::kv::KVStorePreferences;
use futures::future;
use std::collections::HashMap;
@@ -55,7 +60,7 @@ pub trait FolderUser: Send + Sync {
fn user_id(&self) -> Result<i64, FlowyError>;
fn workspace_id(&self) -> Result<Uuid, FlowyError>;
fn collab_db(&self, uid: i64) -> Result<Weak<CollabKVDB>, FlowyError>;
-
+ fn sqlite_connection(&self, uid: i64) -> Result<DBConnection, FlowyError>;
fn is_folder_exist_on_disk(&self, uid: i64, workspace_id: &Uuid) -> FlowyResult<bool>;
}
@@ -2136,6 +2141,103 @@ impl FolderManager {
.filter(|id| !my_private_view_ids.contains(id))
.collect()
}
+
+ /// Get the shared views of the workspace.
+ pub async fn get_shared_pages(&self) -> FlowyResult<RepeatedSharedViewResponsePB> {
+ let uid = self.user.user_id()?;
+ let conn = self.user.sqlite_connection(uid)?;
+ let workspace_id = self.user.workspace_id()?;
+ let mut local_shared_views = vec![];
+
+ let all_views: Vec<Arc<View>> = self.get_all_views().await?;
+
+ // 1. Get the data from the local database first
+ if let Ok(shared_views) =
+ select_all_workspace_shared_views(conn, &workspace_id.to_string(), uid)
+ {
+ local_shared_views = shared_views
+ .into_iter()
+ .filter_map(|shared_view| {
+ let view = all_views
+ .iter()
+ .find(|view| view.id == shared_view.view_id)?;
+ Some(SharedViewPB {
+ view: view_pb_with_all_child_views(view.clone(), &|parent_id| {
+ all_views
+ .iter()
+ .filter(|v| v.parent_view_id == *parent_id)
+ .cloned()
+ .collect()
+ }),
+ access_level: AFAccessLevelPB::from(shared_view.permission_id),
+ })
+ })
+ .collect();
+ }
+
+ // 2. Fetch the data from the cloud service and persist to the local database
+ let cloud_workspace_id = workspace_id;
+ let user = self.user.clone();
+ let cloud_service = self.cloud_service.clone();
+ tokio::spawn(async move {
+ if let Some(cloud_service) = cloud_service.upgrade() {
+ if let Ok(resp) = cloud_service.get_shared_views(&cloud_workspace_id).await {
+ if let Ok(mut conn) = user.sqlite_connection(uid) {
+ let shared_views: Vec<WorkspaceSharedViewTable> = resp
+ .shared_views
+ .iter()
+ .map(|shared_view| WorkspaceSharedViewTable {
+ uid,
+ workspace_id: workspace_id.to_string(),
+ view_id: shared_view.view_id.to_string(),
+ permission_id: shared_view.access_level as i32,
+ created_at: None,
+ })
+ .collect();
+ let _ = replace_all_workspace_shared_views(
+ &mut conn,
+ &cloud_workspace_id.to_string(),
+ uid,
+ &shared_views,
+ );
+
+ let repeated_shared_view_response = RepeatedSharedViewResponsePB {
+ shared_views: resp
+ .shared_views
+ .into_iter()
+ .filter_map(|shared_view| {
+ let view = all_views
+ .iter()
+ .find(|view| view.id == shared_view.view_id.to_string())?;
+ Some(SharedViewPB {
+ view: view_pb_with_all_child_views(view.clone(), &|parent_id| {
+ all_views
+ .iter()
+ .filter(|v| v.parent_view_id == *parent_id)
+ .cloned()
+ .collect()
+ }),
+ access_level: AFAccessLevelPB::from(shared_view.access_level),
+ })
+ })
+ .collect(),
+ };
+
+ // Notify UI to refresh the shared views
+ folder_notification_builder(workspace_id, FolderNotification::DidUpdateSharedViews)
+ .payload(repeated_shared_view_response)
+ .send();
+ }
+ }
+ }
+ });
+
+ let local_result = RepeatedSharedViewResponsePB {
+ shared_views: local_shared_views.clone(),
+ };
+
+ Ok(local_result)
+ }
}
/// Return the views that belong to the workspace. The views are filtered by the trash and all the private views.
diff --git a/frontend/rust-lib/flowy-folder/src/notification.rs b/frontend/rust-lib/flowy-folder/src/notification.rs
index c0bedd18a5..a887779527 100644
--- a/frontend/rust-lib/flowy-folder/src/notification.rs
+++ b/frontend/rust-lib/flowy-folder/src/notification.rs
@@ -39,6 +39,8 @@ pub enum FolderNotification {
/// Trigger when the ROOT views (the first level) in section are updated
DidUpdateSectionViews = 39,
+
+ DidUpdateSharedViews = 40,
}
#[tracing::instrument(level = "trace", skip_all)]
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 68f0bbed6a..47e85f4a03 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
@@ -5,7 +5,8 @@ use client_api::entity::{
use client_api::entity::{PatchPublishedCollab, PublishInfo};
use collab_entity::CollabType;
use flowy_server_pub::guest_dto::{
- RevokeSharedViewAccessRequest, ShareViewWithGuestRequest, SharedViewDetails,
+ ListSharedViewResponse, RevokeSharedViewAccessRequest, ShareViewWithGuestRequest,
+ SharedViewDetails,
};
use serde_json::to_vec;
use std::path::PathBuf;
@@ -310,4 +311,16 @@ where
.map_err(FlowyError::from)?;
Ok(details)
}
+
+ async fn get_shared_views(
+ &self,
+ workspace_id: &Uuid,
+ ) -> Result<ListSharedViewResponse, FlowyError> {
+ let try_get_client = self.inner.try_get_client();
+ let resp = try_get_client?
+ .get_shared_views(workspace_id)
+ .await
+ .map_err(FlowyError::from)?;
+ Ok(resp)
+ }
}
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 03a1217c95..0560523c6a 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
@@ -16,7 +16,8 @@ use flowy_folder_pub::cloud::{
};
use flowy_folder_pub::entities::PublishPayload;
use flowy_server_pub::guest_dto::{
- RevokeSharedViewAccessRequest, ShareViewWithGuestRequest, SharedViewDetails,
+ ListSharedViewResponse, RevokeSharedViewAccessRequest, ShareViewWithGuestRequest,
+ SharedViewDetails,
};
use lib_infra::async_trait::async_trait;
use std::sync::Arc;
@@ -194,4 +195,11 @@ impl FolderCloudService for LocalServerFolderCloudServiceImpl {
) -> Result<SharedViewDetails, FlowyError> {
Err(FlowyError::local_version_not_support())
}
+
+ async fn get_shared_views(
+ &self,
+ _workspace_id: &Uuid,
+ ) -> Result<ListSharedViewResponse, FlowyError> {
+ Err(FlowyError::local_version_not_support())
+ }
}
diff --git a/frontend/rust-lib/flowy-sqlite/migrations/2025-05-19-074647_create_shared_views_table/down.sql b/frontend/rust-lib/flowy-sqlite/migrations/2025-05-19-074647_create_shared_views_table/down.sql
new file mode 100644
index 0000000000..2c466f11c8
--- /dev/null
+++ b/frontend/rust-lib/flowy-sqlite/migrations/2025-05-19-074647_create_shared_views_table/down.sql
@@ -0,0 +1,2 @@
+-- This file should undo anything in `up.sql`
+DROP TABLE IF EXISTS af_workspace_shared_view;
diff --git a/frontend/rust-lib/flowy-sqlite/migrations/2025-05-19-074647_create_shared_views_table/up.sql b/frontend/rust-lib/flowy-sqlite/migrations/2025-05-19-074647_create_shared_views_table/up.sql
new file mode 100644
index 0000000000..13e3e6ff85
--- /dev/null
+++ b/frontend/rust-lib/flowy-sqlite/migrations/2025-05-19-074647_create_shared_views_table/up.sql
@@ -0,0 +1,9 @@
+-- Your SQL goes here
+CREATE TABLE IF NOT EXISTS workspace_shared_view (
+ uid BigInt NOT NULL,
+ workspace_id TEXT NOT NULL,
+ view_id TEXT NOT NULL,
+ permission_id INTEGER NOT NULL,
+ created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (uid, workspace_id, view_id)
+);
diff --git a/frontend/rust-lib/flowy-sqlite/src/schema.rs b/frontend/rust-lib/flowy-sqlite/src/schema.rs
index c5fb956d9e..e6dfc4437c 100644
--- a/frontend/rust-lib/flowy-sqlite/src/schema.rs
+++ b/frontend/rust-lib/flowy-sqlite/src/schema.rs
@@ -147,6 +147,16 @@ diesel::table! {
}
}
+diesel::table! {
+ workspace_shared_view (uid, workspace_id, view_id) {
+ uid -> BigInt,
+ workspace_id -> Text,
+ view_id -> Text,
+ permission_id -> Integer,
+ created_at -> Nullable<Timestamp>,
+ }
+}
+
diesel::allow_tables_to_appear_in_same_query!(
af_collab_metadata,
chat_local_setting_table,
@@ -162,4 +172,5 @@ diesel::allow_tables_to_appear_in_same_query!(
user_workspace_table,
workspace_members_table,
workspace_setting_table,
+ workspace_shared_view,
);