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.

chore: adjust view selector logic (#7913)

Richard Shiue808bee5eb2a3
diff --git a/frontend/appflowy_flutter/lib/ai/service/view_selector_cubit.dart b/frontend/appflowy_flutter/lib/ai/service/view_selector_cubit.dart
index 2fa259d96e..ec551ab114 100644
--- a/frontend/appflowy_flutter/lib/ai/service/view_selector_cubit.dart
+++ b/frontend/appflowy_flutter/lib/ai/service/view_selector_cubit.dart
@@ -74,8 +74,8 @@ class ViewSelectorItem {
return null;
}
- void setIsDisabledRecursive(bool Function(ViewPB) newIsDisabled) {
- isDisabledNotifier.value = newIsDisabled(view);
+ void setIsDisabledRecursive(bool Function(ViewSelectorItem) newIsDisabled) {
+ isDisabledNotifier.value = newIsDisabled(this);
for (final child in children) {
child.setIsDisabledRecursive(newIsDisabled);
@@ -108,7 +108,7 @@ class ViewSelectorCubit extends Cubit<ViewSelectorState> {
filterTextController.addListener(onFilterChanged);
}
- final IgnoreViewType Function(ViewPB) getIgnoreViewType;
+ final IgnoreViewType Function(ViewSelectorItem) getIgnoreViewType;
final int? maxSelectedParentPageCount;
final List<String> selectedSourceIds = [];
@@ -131,6 +131,8 @@ class ViewSelectorCubit extends Cubit<ViewSelectorState> {
spaceViews.map((view) => _recursiveBuild(view, null)),
);
+ _setIsDisabledAndHideIfNecessary(newSources);
+
_restrictSelectionIfNecessary(newSources);
if (currentSpace != null) {
@@ -182,10 +184,6 @@ class ViewSelectorCubit extends Cubit<ViewSelectorState> {
if (childrenViews != null) {
for (final childView in childrenViews) {
- if (getIgnoreViewType(childView) == IgnoreViewType.hide) {
- continue;
- }
-
final childItem = await _recursiveBuild(childView, view);
if (childItem.selectedStatus.isSelected) {
selectedCount++;
@@ -211,12 +209,27 @@ class ViewSelectorCubit extends Cubit<ViewSelectorState> {
view: view,
parentView: parentView,
children: children,
- isDisabled: getIgnoreViewType(view) == IgnoreViewType.disable,
+ isDisabled: false,
isExpanded: false,
selectedStatus: selectedStatus,
);
}
+ void _setIsDisabledAndHideIfNecessary(
+ List<ViewSelectorItem> sources,
+ ) {
+ sources.retainWhere((source) {
+ final ignoreViewType = getIgnoreViewType(source);
+ return ignoreViewType != IgnoreViewType.hide;
+ });
+
+ for (final source in sources) {
+ source.isDisabledNotifier.value =
+ getIgnoreViewType(source) == IgnoreViewType.disable;
+ _setIsDisabledAndHideIfNecessary(source.children);
+ }
+ }
+
void _restrictSelectionIfNecessary(List<ViewSelectorItem> sources) {
if (maxSelectedParentPageCount == null) {
return;
diff --git a/frontend/appflowy_flutter/lib/ai/widgets/ai_prompt_modal/ai_prompt_database_selector.dart b/frontend/appflowy_flutter/lib/ai/widgets/ai_prompt_modal/ai_prompt_database_selector.dart
index 33655e101d..a003e9d3aa 100644
--- a/frontend/appflowy_flutter/lib/ai/widgets/ai_prompt_modal/ai_prompt_database_selector.dart
+++ b/frontend/appflowy_flutter/lib/ai/widgets/ai_prompt_modal/ai_prompt_database_selector.dart
@@ -42,15 +42,7 @@ class _CustomPromptDatabaseSelectorState
return ViewSelector(
viewSelectorCubit: BlocProvider(
create: (context) => ViewSelectorCubit(
- getIgnoreViewType: (view) {
- if (view.layout.isDatabaseView) {
- return IgnoreViewType.none;
- }
- if (view.layout.isDocumentView) {
- return IgnoreViewType.none;
- }
- return IgnoreViewType.hide;
- },
+ getIgnoreViewType: getIgnoreViewType,
),
),
child: BlocSelector<SpaceBloc, SpaceState, (List<ViewPB>, ViewPB?)>(
@@ -67,12 +59,18 @@ class _CustomPromptDatabaseSelectorState
return BlocProvider.value(
value: context.read<ViewSelectorCubit>(),
child: _PopoverContent(
- onSelectView: (view) {
+ onSelectViewItem: (item) {
+ final view = item.view;
if (view.layout.isDatabaseView) {
context
.read<AiPromptSelectorCubit>()
.updateCustomPromptDatabaseViewId(view.id);
popoverController.close();
+ } else if (!view.isSpace && view.layout.isDocumentView) {
+ context.read<ViewSelectorCubit>().toggleIsExpanded(
+ item,
+ false,
+ );
}
},
),
@@ -93,6 +91,37 @@ class _CustomPromptDatabaseSelectorState
),
);
}
+
+ IgnoreViewType getIgnoreViewType(ViewSelectorItem item) {
+ final layout = item.view.layout;
+
+ if (layout.isDatabaseView) {
+ return IgnoreViewType.none;
+ }
+ if (layout.isDocumentView) {
+ return hasDatabaseDescendent(item)
+ ? IgnoreViewType.none
+ : IgnoreViewType.hide;
+ }
+ return IgnoreViewType.hide;
+ }
+
+ bool hasDatabaseDescendent(ViewSelectorItem viewSelectorItem) {
+ final layout = viewSelectorItem.view.layout;
+
+ if (layout == ViewLayoutPB.Chat) {
+ return false;
+ }
+
+ if (layout.isDatabaseView) {
+ return true;
+ }
+
+ // document may have children
+ return viewSelectorItem.children.any(
+ (child) => hasDatabaseDescendent(child),
+ );
+ }
}
class AiPromptDatabaseSelectorButton extends StatefulWidget {
@@ -232,10 +261,10 @@ class _AiPromptDatabaseSelectorButtonState
class _PopoverContent extends StatefulWidget {
const _PopoverContent({
- required this.onSelectView,
+ required this.onSelectViewItem,
});
- final void Function(ViewPB view) onSelectView;
+ final void Function(ViewSelectorItem item) onSelectViewItem;
@override
State<_PopoverContent> createState() => _PopoverContentState();
@@ -309,9 +338,7 @@ class _PopoverContentState extends State<_PopoverContent> {
isDescendentOfSpace: e.view.isSpace,
isSelectedSection: false,
showCheckbox: false,
- onSelected: (source) {
- widget.onSelectView(source.view);
- },
+ onSelected: widget.onSelectViewItem,
height: 30.0,
),
);
diff --git a/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_sources_bottom_sheet.dart b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_sources_bottom_sheet.dart
index 149482eda0..cbfdf933e7 100644
--- a/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_sources_bottom_sheet.dart
+++ b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_sources_bottom_sheet.dart
@@ -37,11 +37,11 @@ class _PromptInputMobileSelectSourcesButtonState
extends State<PromptInputMobileSelectSourcesButton> {
late final cubit = ViewSelectorCubit(
maxSelectedParentPageCount: 3,
- getIgnoreViewType: (view) {
- if (view.isSpace) {
+ getIgnoreViewType: (item) {
+ if (item.view.isSpace) {
return IgnoreViewType.none;
}
- if (view.layout != ViewLayoutPB.Document) {
+ if (item.view.layout != ViewLayoutPB.Document) {
return IgnoreViewType.hide;
}
return IgnoreViewType.none;
diff --git a/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_sources_menu.dart b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_sources_menu.dart
index 7d3f50c9fb..44439d9cf8 100644
--- a/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_sources_menu.dart
+++ b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_sources_menu.dart
@@ -40,7 +40,9 @@ class _PromptInputDesktopSelectSourcesButtonState
extends State<PromptInputDesktopSelectSourcesButton> {
late final cubit = ViewSelectorCubit(
maxSelectedParentPageCount: 3,
- getIgnoreViewType: (view) {
+ getIgnoreViewType: (item) {
+ final view = item.view;
+
if (view.isSpace) {
return IgnoreViewType.none;
}
@@ -50,6 +52,7 @@ class _PromptInputDesktopSelectSourcesButtonState
if (view.layout != ViewLayoutPB.Document) {
return IgnoreViewType.disable;
}
+
return IgnoreViewType.none;
},
);
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_message_selector_banner.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_message_selector_banner.dart
index 96485d500c..5aa40af3ab 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_message_selector_banner.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_message_selector_banner.dart
@@ -136,7 +136,9 @@ class _SaveToPageButtonState extends State<SaveToPageButton> {
return ViewSelector(
viewSelectorCubit: BlocProvider(
create: (context) => ViewSelectorCubit(
- getIgnoreViewType: (view) {
+ getIgnoreViewType: (item) {
+ final view = item.view;
+
if (view.isSpace) {
return IgnoreViewType.none;
}
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_action_bar.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_action_bar.dart
index a1f3307187..bd9c29dec8 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_action_bar.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_message_action_bar.dart
@@ -516,13 +516,16 @@ class _SaveToPageButtonState extends State<SaveToPageButton> {
return ViewSelector(
viewSelectorCubit: BlocProvider(
create: (context) => ViewSelectorCubit(
- getIgnoreViewType: (view) {
+ getIgnoreViewType: (item) {
+ final view = item.view;
+
if (view.isSpace) {
return IgnoreViewType.none;
}
if (view.layout != ViewLayoutPB.Document) {
return IgnoreViewType.hide;
}
+
return IgnoreViewType.none;
},
),
diff --git a/frontend/appflowy_flutter/macos/Podfile.lock b/frontend/appflowy_flutter/macos/Podfile.lock
index 9709711e3b..879f010c46 100644
--- a/frontend/appflowy_flutter/macos/Podfile.lock
+++ b/frontend/appflowy_flutter/macos/Podfile.lock
@@ -135,32 +135,32 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos
SPEC CHECKSUMS:
- app_links: 10e0a0ab602ffaf34d142cd4862f29d34b303b2a
- appflowy_backend: 865496343de667fc8c600e04b9fd05234e130cf9
- auto_updater_macos: 3e3462c418fe4e731917eacd8d28eef7af84086d
- bitsdojo_window_macos: 44e3b8fe3dd463820e0321f6256c5b1c16bb6a00
- connectivity_plus: 18d3c32514c886e046de60e9c13895109866c747
- desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898
- device_info_plus: 1b14eed9bf95428983aed283a8d51cce3d8c4215
- file_selector_macos: cc3858c981fe6889f364731200d6232dac1d812d
- flowy_infra_ui: 03301a39ad118771adbf051a664265c61c507f38
+ app_links: 9028728e32c83a0831d9db8cf91c526d16cc5468
+ appflowy_backend: 464aeb3e5c6966a41641a2111e5ead72ce2695f7
+ auto_updater_macos: 3a42f1a06be6981f1a18be37e6e7bf86aa732118
+ bitsdojo_window_macos: 7959fb0ca65a3ccda30095c181ecb856fae48ea9
+ connectivity_plus: e74b9f74717d2d99d45751750e266e55912baeb5
+ desktop_drop: e0b672a7d84c0a6cbc378595e82cdb15f2970a43
+ device_info_plus: 4fb280989f669696856f8b129e4a5e3cd6c48f76
+ file_selector_macos: 6280b52b459ae6c590af5d78fc35c7267a3c4b31
+ flowy_infra_ui: 8760ff42a789de40bf5007a5f176b454722a341e
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
HotKey: 400beb7caa29054ea8d864c96f5ba7e5b4852277
- hotkey_manager: c32bf0bfe8f934b7bc17ab4ad5c4c142960b023c
- irondash_engine_context: da62996ee25616d2f01bbeb85dc115d813359478
- local_notifier: e9506bc66fc70311e8bc7291fb70f743c081e4ff
- package_info_plus: 12f1c5c2cfe8727ca46cbd0b26677728972d9a5b
- path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+ hotkey_manager: b443f35f4d772162937aa73fd8995e579f8ac4e2
+ irondash_engine_context: 893c7d96d20ce361d7e996f39d360c4c2f9869ba
+ local_notifier: ebf072651e35ae5e47280ad52e2707375cb2ae4e
+ package_info_plus: f0052d280d17aa382b932f399edf32507174e870
+ path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda
- screen_retriever_macos: 776e0fa5d42c6163d2bf772d22478df4b302b161
- share_plus: 1fa619de8392a4398bfaf176d441853922614e89
- shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+ screen_retriever_macos: 452e51764a9e1cdb74b3c541238795849f21557f
+ share_plus: 510bf0af1a42cd602274b4629920c9649c52f4cc
+ shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
Sparkle: 9c328bdcfbcaf8f030c4b678eadfd0fcb03822d8
- sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
- super_native_extensions: 85efee3a7495b46b04befcfc86ed12069264ebf3
- url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
- webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4
- window_manager: 990c8e348c4da2a93b81da638245d40554ec9436
+ sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
+ super_native_extensions: c2795d6d9aedf4a79fae25cb6160b71b50549189
+ url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673
+ webview_flutter_wkwebview: 44d4dee7d7056d5ad185d25b38404436d56c547c
+ window_manager: e8d0b1431ab6c454f2b5c9ae26004bbfa43469aa
PODFILE CHECKSUM: 0532f3f001ca3110b8be345d6491fff690e95823