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.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
chore: display preview
Nathana44ad63230ed
diff --git a/frontend/appflowy_flutter/integration_test/desktop/command_palette/folder_search_test.dart b/frontend/appflowy_flutter/integration_test/desktop/command_palette/folder_search_test.dartindex a1d7f12667..0b77a0167b 100644--- a/frontend/appflowy_flutter/integration_test/desktop/command_palette/folder_search_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/command_palette/folder_search_test.dart@@ -6,7 +6,7 @@ import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';import 'package:appflowy/workspace/presentation/command_palette/command_palette.dart';import 'package:appflowy/workspace/presentation/command_palette/widgets/search_field.dart';-import 'package:appflowy/workspace/presentation/command_palette/widgets/search_result_tile.dart';+import 'package:appflowy/workspace/presentation/command_palette/widgets/search_result_cell.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pbenum.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:easy_localization/easy_localization.dart';@@ -49,7 +49,7 @@ void main() {// The score should be higher for "ViewOna" thus it should be shown firstfinal secondDocumentWidget = tester.widget(find.byType(SearchResultCell).first) as SearchResultCell;- expect(secondDocumentWidget.item.data, secondDocument);+ expect(secondDocumentWidget.item.displayName, secondDocument);// Change search to "ViewOne"await tester.enterText(searchFieldFinder, firstDocument);@@ -59,7 +59,7 @@ void main() {final firstDocumentWidget = tester.widget(find.byType(SearchResultCell).first,) as SearchResultCell;- expect(firstDocumentWidget.item.data, firstDocument);+ expect(firstDocumentWidget.item.displayName, firstDocument);});testWidgets('Displaying icons in search results', (tester) async {diff --git a/frontend/appflowy_flutter/lib/workspace/application/command_palette/search_result_ext.dart b/frontend/appflowy_flutter/lib/workspace/application/command_palette/search_result_ext.dartindex 563eac8a0a..6b6ea6d5c0 100644--- a/frontend/appflowy_flutter/lib/workspace/application/command_palette/search_result_ext.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/command_palette/search_result_ext.dart@@ -5,19 +5,19 @@ import 'package:appflowy_backend/protobuf/flowy-search/result.pb.dart';import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flutter/material.dart';-extension GetIcon on SearchResponseItemPB {+extension GetIcon on ResultIconPB {Widget? getIcon() {- final iconValue = icon.value, iconType = icon.ty;+ final iconValue = value, iconType = ty;if (iconType == ResultIconTypePB.Emoji) {return iconValue.isNotEmpty? FlowyText.emoji(iconValue, fontSize: 18): null;- } else if (icon.ty == ResultIconTypePB.Icon) {+ } else if (ty == ResultIconTypePB.Icon) {if (_resultIconValueTypes.contains(iconValue)) {- return FlowySvg(icon.getViewSvg(), size: const Size.square(18));+ return FlowySvg(getViewSvg(), size: const Size.square(18));}return RawEmojiIconWidget(- emoji: EmojiIconData(iconType.toFlowyIconType(), icon.value),+ emoji: EmojiIconData(iconType.toFlowyIconType(), value),emojiSize: 18,);}diff --git a/frontend/appflowy_flutter/lib/workspace/application/command_palette/search_result_list_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/command_palette/search_result_list_bloc.dartnew file mode 100644index 0000000000..c77530ba77--- /dev/null+++ b/frontend/appflowy_flutter/lib/workspace/application/command_palette/search_result_list_bloc.dart@@ -0,0 +1,62 @@+import 'dart:async';++import 'package:appflowy_backend/protobuf/flowy-search/result.pb.dart';+import 'package:bloc/bloc.dart';+import 'package:flutter/foundation.dart';+import 'package:freezed_annotation/freezed_annotation.dart';++part 'search_result_list_bloc.freezed.dart';++class SearchResultListBloc+ extends Bloc<SearchResultListEvent, SearchResultListState> {+ SearchResultListBloc() : super(SearchResultListState.initial()) {+ // Register event handlers+ on<_OnHoverSummary>(_onHoverSummary);+ on<_OnHoverResult>(_onHoverResult);+ }++ FutureOr<void> _onHoverSummary(+ _OnHoverSummary event,+ Emitter<SearchResultListState> emit,+ ) {+ emit(+ state.copyWith(+ hoveredSummary: event.summary,+ hoveredResult: null,+ ),+ );+ }++ FutureOr<void> _onHoverResult(+ _OnHoverResult event,+ Emitter<SearchResultListState> emit,+ ) {+ emit(+ state.copyWith(+ hoveredSummary: null,+ hoveredResult: event.item,+ ),+ );+ }+}++@freezed+class SearchResultListEvent with _$SearchResultListEvent {+ const factory SearchResultListEvent.onHoverSummary({+ required SearchSummaryPB summary,+ }) = _OnHoverSummary;+ const factory SearchResultListEvent.onHoverResult({+ required SearchResponseItemPB item,+ }) = _OnHoverResult;+}++@freezed+class SearchResultListState with _$SearchResultListState {+ const SearchResultListState._();+ const factory SearchResultListState({+ @Default(null) SearchSummaryPB? hoveredSummary,+ @Default(null) SearchResponseItemPB? hoveredResult,+ }) = _SearchResultListState;++ factory SearchResultListState.initial() => const SearchResultListState();+}diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/command_palette.dart b/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/command_palette.dartindex 9a507decc6..f54fbebe14 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/command_palette.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/command_palette.dart@@ -135,9 +135,9 @@ class CommandPaletteModal extends StatelessWidget {alignment: Alignment.topCenter,insetPadding: const EdgeInsets.only(top: 100),constraints: const BoxConstraints(- maxHeight: 520,- maxWidth: 510,- minHeight: 420,+ maxHeight: 600,+ maxWidth: 800,+ minHeight: 600,),expandHeight: false,child: shortcutBuilder(diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_result_tile.dart b/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_result_cell.dartsimilarity index 66%rename from frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_result_tile.dartrename to frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_result_cell.dartindex 551823f08e..1bd3d0b03a 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_result_tile.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_result_cell.dart@@ -4,6 +4,7 @@ import 'package:appflowy/util/string_extension.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/application/command_palette/search_result_ext.dart';+import 'package:appflowy/workspace/application/command_palette/search_result_list_bloc.dart';import 'package:appflowy_backend/protobuf/flowy-search/result.pb.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';@@ -12,19 +13,18 @@ import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';import 'package:flutter/services.dart';+import 'package:flutter_bloc/flutter_bloc.dart';class SearchResultCell extends StatefulWidget {const SearchResultCell({super.key,required this.item,required this.onSelected,- required this.onHover,this.isTrashed = false,});final SearchResponseItemPB item;final VoidCallback onSelected;- final Function(SearchResponseItemPB) onHover;final bool isTrashed;@override@@ -46,7 +46,7 @@ class _SearchResultCellState extends State<SearchResultCell> {widget.onSelected();getIt<ActionNavigationBloc>().add(ActionNavigationEvent.performAction(- action: NavigationAction(objectId: widget.item.viewId),+ action: NavigationAction(objectId: widget.item.id),),);}@@ -58,10 +58,10 @@ class _SearchResultCellState extends State<SearchResultCell> {@overrideWidget build(BuildContext context) {- final title = widget.item.data.orDefault(+ final title = widget.item.displayName.orDefault(LocaleKeys.menuAppHeader_defaultNewPageName.tr(),);- final icon = widget.item.getIcon();+ final icon = widget.item.icon.getIcon();final cleanedPreview = _cleanPreview(widget.item.preview);final hasPreview = cleanedPreview.isNotEmpty;final trashHintText =@@ -134,36 +134,45 @@ class _SearchResultCellState extends State<SearchResultCell> {);}- return MouseRegion(- onEnter: (_) => widget.onHover(widget.item),- child: GestureDetector(- behavior: HitTestBehavior.opaque,- onTap: _handleSelection,- child: Focus(- focusNode: focusNode,- onKeyEvent: (node, event) {- if (event is! KeyDownEvent) return KeyEventResult.ignored;- if (event.logicalKey == LogicalKeyboardKey.enter) {- _handleSelection();- return KeyEventResult.handled;- }- return KeyEventResult.ignored;+ return GestureDetector(+ behavior: HitTestBehavior.opaque,+ onTap: _handleSelection,+ child: Focus(+ focusNode: focusNode,+ onKeyEvent: (node, event) {+ if (event is! KeyDownEvent) return KeyEventResult.ignored;+ if (event.logicalKey == LogicalKeyboardKey.enter) {+ _handleSelection();+ return KeyEventResult.handled;+ }+ return KeyEventResult.ignored;+ },+ onFocusChange: (hasFocus) {+ setState(() {+ context.read<SearchResultListBloc>().add(+ SearchResultListEvent.onHoverResult(item: widget.item),+ );+ _hasFocus = hasFocus;+ });+ },+ child: FlowyHover(+ onHover: (value) {+ context.read<SearchResultListBloc>().add(+ SearchResultListEvent.onHoverResult(item: widget.item),+ );},- onFocusChange: (hasFocus) => setState(() => _hasFocus = hasFocus),- child: FlowyHover(- isSelected: () => _hasFocus,- style: HoverStyle(- borderRadius: BorderRadius.circular(8),- hoverColor:- Theme.of(context).colorScheme.primary.withValues(alpha: 0.1),- foregroundColorOnHover: AFThemeExtension.of(context).textColor,- ),- child: Padding(- padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 6),- child: ConstrainedBox(- constraints: const BoxConstraints(minHeight: 30),- child: tileContent,- ),+ isSelected: () => _hasFocus,+ style: HoverStyle(+ borderRadius: BorderRadius.circular(8),+ hoverColor:+ Theme.of(context).colorScheme.primary.withValues(alpha: 0.1),+ foregroundColorOnHover: AFThemeExtension.of(context).textColor,+ ),+ child: Padding(+ padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 6),+ child: ConstrainedBox(+ constraints: const BoxConstraints(minHeight: 30),+ child: tileContent,),),),@@ -192,3 +201,32 @@ class _DocumentPreview extends StatelessWidget {);}}++class SearchResultPreview extends StatelessWidget {+ const SearchResultPreview({+ super.key,+ required this.data,+ });++ final SearchResponseItemPB data;++ @override+ Widget build(BuildContext context) {+ return Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ FlowyText(LocaleKeys.commandPalette_pagePreview.tr()),+ const Divider(+ thickness: 1,+ ),+ const VSpace(6),+ Expanded(+ child: FlowyText(+ data.content,+ maxLines: 30,+ ),+ ),+ ],+ );+ }+}diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_results_list.dart b/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_results_list.dartindex 2eb3b44b3e..5d2e305c15 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_results_list.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_results_list.dart@@ -1,13 +1,17 @@+import 'package:appflowy/workspace/application/command_palette/search_result_list_bloc.dart';import 'package:flutter/material.dart';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/workspace/presentation/command_palette/widgets/search_result_tile.dart';import 'package:appflowy_backend/protobuf/flowy-folder/trash.pb.dart';import 'package:appflowy_backend/protobuf/flowy-search/result.pb.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter_bloc/flutter_bloc.dart';-class SearchResultList extends StatefulWidget {+import 'search_result_cell.dart';+import 'search_summary_cell.dart';++class SearchResultList extends StatelessWidget {const SearchResultList({required this.trash,required this.resultItems,@@ -19,13 +23,6 @@ class SearchResultList extends StatefulWidget {final List<SearchResponseItemPB> resultItems;final List<SearchSummaryPB> resultSummaries;- @override- State<SearchResultList> createState() => _SearchResultListState();-}--class _SearchResultListState extends State<SearchResultList> {- dynamic _selectedCellData;-Widget _buildSectionHeader(String title) => Padding(padding: const EdgeInsets.symmetric(vertical: 8) +const EdgeInsets.only(left: 8),@@ -35,31 +32,18 @@ class _SearchResultListState extends State<SearchResultList> {),);- void _onHoverSummary(SearchSummaryPB summary) {- setState(() {- _selectedCellData = summary;- });- }-- void _onHoverResult(SearchResponseItemPB item) {- setState(() {- _selectedCellData = item;- });- }-Widget _buildSummariesSection() {return Column(crossAxisAlignment: CrossAxisAlignment.start,children: [- _buildSectionHeader(LocaleKeys.commandPalette_aiSummary.tr()),+ _buildSectionHeader(LocaleKeys.commandPalette_aiOverview.tr()),ListView.separated(physics: const NeverScrollableScrollPhysics(),shrinkWrap: true,- itemCount: widget.resultSummaries.length,+ itemCount: resultSummaries.length,separatorBuilder: (_, __) => const Divider(height: 0),itemBuilder: (_, index) => SearchSummaryCell(- summary: widget.resultSummaries[index],- onHover: _onHoverSummary,+ summary: resultSummaries[index],),),],@@ -75,15 +59,14 @@ class _SearchResultListState extends State<SearchResultList> {ListView.separated(physics: const NeverScrollableScrollPhysics(),shrinkWrap: true,- itemCount: widget.resultItems.length,+ itemCount: resultItems.length,separatorBuilder: (_, __) => const Divider(height: 0),itemBuilder: (_, index) {- final item = widget.resultItems[index];+ final item = resultItems[index];return SearchResultCell(item: item,onSelected: () => FlowyOverlay.pop(context),- isTrashed: widget.trash.any((t) => t.id == item.viewId),- onHover: _onHoverResult,+ isTrashed: trash.any((t) => t.id == item.id),);},),@@ -95,128 +78,55 @@ class _SearchResultListState extends State<SearchResultList> {Widget build(BuildContext context) {return Padding(padding: const EdgeInsets.symmetric(horizontal: 6),- child: Row(- children: [- Flexible(- flex: 7,- child: ListView(- shrinkWrap: true,- physics: const ClampingScrollPhysics(),- children: [- if (widget.resultSummaries.isNotEmpty) _buildSummariesSection(),- const VSpace(10),- if (widget.resultItems.isNotEmpty)- _buildResultsSection(context),- ],- ),- ),- Flexible(- flex: 3,- child: SearchCellDetail(cellData: _selectedCellData),- ),- ],- ),- );- }-}--class SearchCellDetail extends StatelessWidget {- const SearchCellDetail({- super.key,- required this.cellData,- });-- final dynamic cellData;-- @override- Widget build(BuildContext context) {- if (cellData == null) {- return const Padding(- padding: EdgeInsets.all(16.0),- child: Center(- child: FlowyText(- 'Hover over an item to see details',- fontSize: 12,- color: Colors.grey,- ),- ),- );- }-- if (cellData is SearchSummaryPB) {- return Padding(- padding: const EdgeInsets.all(16.0),- child: Column(- crossAxisAlignment: CrossAxisAlignment.start,- children: [- const FlowyText(- 'AI Summary',- fontSize: 14,- fontWeight: FontWeight.bold,- ),- const VSpace(8),- FlowyText(- cellData.content,- fontSize: 12,- ),- ],- ),- );- }-- if (cellData is SearchResponseItemPB) {- final item = cellData as SearchResponseItemPB;- return Padding(- padding: const EdgeInsets.all(16.0),- child: Column(+ child: BlocProvider(+ create: (context) => SearchResultListBloc(),+ child: Row(crossAxisAlignment: CrossAxisAlignment.start,children: [- FlowyText(- item.data,- fontSize: 14,- fontWeight: FontWeight.bold,+ Flexible(+ flex: 7,+ child: ListView(+ shrinkWrap: true,+ physics: const ClampingScrollPhysics(),+ children: [+ if (resultSummaries.isNotEmpty) _buildSummariesSection(),+ const VSpace(10),+ if (resultItems.isNotEmpty) _buildResultsSection(context),+ ],+ ),),- const VSpace(8),- if (item.preview.isNotEmpty)- FlowyText(- item.preview,- fontSize: 12,+ const HSpace(10),+ Flexible(+ flex: 3,+ child: Padding(+ padding: const EdgeInsets.symmetric(+ horizontal: 12,+ vertical: 16,+ ),+ child: const SearchCellPreview(),),+ ),],),- );- }-- return const SizedBox.shrink();+ ),+ );}}-class SearchSummaryCell extends StatefulWidget {- const SearchSummaryCell({- required this.summary,- required this.onHover,- super.key,- });-- final SearchSummaryPB summary;- final Function(SearchSummaryPB) onHover;-- @override- State<SearchSummaryCell> createState() => _SearchSummaryCellState();-}+class SearchCellPreview extends StatelessWidget {+ const SearchCellPreview({super.key});-class _SearchSummaryCellState extends State<SearchSummaryCell> {@overrideWidget build(BuildContext context) {- return MouseRegion(- onEnter: (_) => widget.onHover(widget.summary),- child: Padding(- padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),- child: FlowyText(- widget.summary.content,- maxLines: 3,- ),- ),+ return BlocBuilder<SearchResultListBloc, SearchResultListState>(+ builder: (context, state) {+ if (state.hoveredSummary != null) {+ return SearchSummaryPreview(summary: state.hoveredSummary!);+ } else if (state.hoveredResult != null) {+ return SearchResultPreview(data: state.hoveredResult!);+ }+ return const SizedBox.shrink();+ },);}}diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_summary_cell.dart b/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_summary_cell.dartnew file mode 100644index 0000000000..c911c46735--- /dev/null+++ b/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_summary_cell.dart@@ -0,0 +1,91 @@+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/workspace/application/command_palette/search_result_ext.dart';+import 'package:appflowy/workspace/application/command_palette/search_result_list_bloc.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra/theme_extension.dart';+import 'package:flowy_infra_ui/style_widget/hover.dart';+import 'package:flutter/material.dart';++import 'package:appflowy_backend/protobuf/flowy-search/result.pb.dart';+import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter_bloc/flutter_bloc.dart';++class SearchSummaryCell extends StatelessWidget {+ const SearchSummaryCell({+ required this.summary,+ super.key,+ });++ final SearchSummaryPB summary;++ @override+ Widget build(BuildContext context) {+ return FlowyHover(+ onHover: (value) {+ context.read<SearchResultListBloc>().add(+ SearchResultListEvent.onHoverSummary(summary: summary),+ );+ },+ style: HoverStyle(+ borderRadius: BorderRadius.circular(8),+ hoverColor:+ Theme.of(context).colorScheme.primary.withValues(alpha: 0.1),+ foregroundColorOnHover: AFThemeExtension.of(context).textColor,+ ),+ child: Padding(+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),+ child: FlowyText(+ summary.content,+ maxLines: 3,+ ),+ ),+ );+ }+}++class SearchSummaryPreview extends StatelessWidget {+ const SearchSummaryPreview({+ required this.summary,+ super.key,+ });++ final SearchSummaryPB summary;++ @override+ Widget build(BuildContext context) {+ return Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ FlowyText(LocaleKeys.commandPalette_aiOverviewSource.tr()),+ const Divider(+ thickness: 1,+ ),+ const VSpace(6),+ ...summary.sources.map((e) => SearchSummarySource(source: e)),+ ],+ );+ }+}++class SearchSummarySource extends StatelessWidget {+ const SearchSummarySource({+ required this.source,+ super.key,+ });++ final SearchSourcePB source;++ @override+ Widget build(BuildContext context) {+ final icon = source.icon.getIcon();+ return Row(+ children: [+ if (icon != null) ...[+ SizedBox(width: 24, child: icon),+ const HSpace(6),+ ],+ FlowyText(source.displayName),+ ],+ );+ }+}diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.jsonindex 147902d799..4279f95425 100644--- a/frontend/resources/translations/en.json+++ b/frontend/resources/translations/en.json@@ -2693,7 +2693,9 @@"commandPalette": {"placeholder": "Search or ask a question...","bestMatches": "Best matches",- "aiSummary": "AI summary",+ "aiOverview": "AI overview",+ "aiOverviewSource": "Sources",+ "pagePreview": "Preview","recentHistory": "Recent history","navigateHint": "to navigate","loadingTooltip": "We are looking for results...",diff --git a/frontend/rust-lib/flowy-search/src/document/handler.rs b/frontend/rust-lib/flowy-search/src/document/handler.rsindex b808b38e74..9077829c07 100644--- a/frontend/rust-lib/flowy-search/src/document/handler.rs+++ b/frontend/rust-lib/flowy-search/src/document/handler.rs@@ -1,6 +1,6 @@use crate::entities::{CreateSearchResultPBArgs, RepeatedSearchResponseItemPB, RepeatedSearchSummaryPB, SearchResultPB,- SearchSummaryPB,+ SearchSourcePB, SearchSummaryPB,};use crate::{entities::{IndexTypePB, ResultIconPB, ResultIconTypePB, SearchFilterPB, SearchResponseItemPB},@@ -8,6 +8,7 @@ use crate::{};use async_stream::stream;use flowy_error::FlowyResult;+use flowy_folder::entities::ViewPB;use flowy_folder::{manager::FolderManager, ViewLayout};use flowy_search_pub::cloud::{SearchCloudService, SearchResult};use lib_infra::async_trait::async_trait;@@ -34,7 +35,6 @@ impl DocumentSearchHandler {}}}-#[async_trait]impl SearchHandler for DocumentSearchHandler {fn search_type(&self) -> SearchType {@@ -50,14 +50,15 @@ impl SearchHandler for DocumentSearchHandler {let folder_manager = self.folder_manager.clone();Box::pin(stream! {- let filter = match filter {- Some(f) => f,- None => {- yield Ok(CreateSearchResultPBArgs::default().build().unwrap());- return;- },+ // Exit early if there is no filter.+ let filter = if let Some(f) = filter {+ f+ } else {+ yield Ok(CreateSearchResultPBArgs::default().build().unwrap());+ return;};+ // Parse workspace id.let workspace_id = match Uuid::from_str(&filter.workspace_id) {Ok(id) => id,Err(e) => {@@ -66,62 +67,54 @@ impl SearchHandler for DocumentSearchHandler {}};+ // Retrieve all available views.let views = match folder_manager.get_all_views_pb().await {Ok(views) => views,Err(e) => {yield Err(e);return;- },+ }};+ // Execute document search.let result_items = match cloud_service.document_search(&workspace_id, query.clone()).await {Ok(items) => items,Err(e) => {yield Err(e);return;- },+ }};- let summary_input = result_items+ // Prepare input for search summary generation.+ let summary_input: Vec<SearchResult> = result_items.iter().map(|v| SearchResult {object_id: v.object_id,content: v.content.clone(),})- .collect::<Vec<_>>();+ .collect();+ // Build search response items.let mut items: Vec<SearchResponseItemPB> = Vec::new();- for item in result_items.iter() {+ for item in &result_items {if let Some(view) = views.iter().find(|v| v.id == item.object_id.to_string()) {- let icon: Option<ResultIconPB> = match view.icon.clone() {- Some(view_icon) => Some(ResultIconPB::from(view_icon)),- None => {- let view_layout_ty: i64 = ViewLayout::from(view.layout.clone()).into();- Some(ResultIconPB {- ty: ResultIconTypePB::Icon,- value: view_layout_ty.to_string(),- })- },- };-items.push(SearchResponseItemPB {index_type: IndexTypePB::Document,- view_id: item.object_id.to_string(),id: item.object_id.to_string(),- data: view.name.clone(),- icon,+ display_name: view.name.clone(),+ icon: extract_icon(view),score: item.score,workspace_id: item.workspace_id.to_string(),preview: item.preview.clone(),- });+ content: item.content.clone()}+ );} else {warn!("No view found for search result: {:?}", item);}}- let search_result = RepeatedSearchResponseItemPB {- items,- };+ // Yield primary search result.+ let search_result = RepeatedSearchResponseItemPB { items };yield Ok(CreateSearchResultPBArgs::default().search_result(Some(search_result))@@ -129,7 +122,7 @@ impl SearchHandler for DocumentSearchHandler {.unwrap(),);- // Search summary generation.+ // Generate and yield search summary.match cloud_service.generate_search_summary(&workspace_id, query.clone(), summary_input).await {Ok(summary_result) => {trace!("[Search] search summary: {:?}", summary_result);@@ -137,13 +130,26 @@ impl SearchHandler for DocumentSearchHandler {.summaries.into_iter().map(|v| {- SearchSummaryPB { content: v.content, source_ids: v.sources.iter().map(|id| id.to_string()).collect() }+ let sources: Vec<SearchSourcePB> = v.sources+ .iter()+ .flat_map(|id| {+ if let Some(view) = views.iter().find(|v| v.id == id.to_string()) {+ Some(SearchSourcePB {+ id: id.to_string(),+ display_name: view.name.clone(),+ icon: extract_icon(view),+ })+ } else {+ None+ }+ })+ .collect();++ SearchSummaryPB { content: v.content, sources }}).collect();- let summary_result = RepeatedSearchSummaryPB {- items: summaries,- };+ let summary_result = RepeatedSearchSummaryPB { items: summaries };yield Ok(CreateSearchResultPBArgs::default().search_summary(Some(summary_result))@@ -158,3 +164,16 @@ impl SearchHandler for DocumentSearchHandler {})}}++fn extract_icon(view: &ViewPB) -> Option<ResultIconPB> {+ match view.icon.clone() {+ Some(view_icon) => Some(ResultIconPB::from(view_icon)),+ None => {+ let view_layout_ty: i64 = ViewLayout::from(view.layout.clone()).into();+ Some(ResultIconPB {+ ty: ResultIconTypePB::Icon,+ value: view_layout_ty.to_string(),+ })+ },+ }+}diff --git a/frontend/rust-lib/flowy-search/src/entities/result.rs b/frontend/rust-lib/flowy-search/src/entities/result.rsindex 48de24728d..28f4c0111f 100644--- a/frontend/rust-lib/flowy-search/src/entities/result.rs+++ b/frontend/rust-lib/flowy-search/src/entities/result.rs@@ -29,7 +29,7 @@ pub struct SearchSummaryPB {pub content: String,#[pb(index = 2)]- pub source_ids: Vec<String>,+ pub sources: Vec<SearchSourcePB>,}#[derive(ProtoBuf, Default, Debug, Clone)]@@ -38,7 +38,10 @@ pub struct SearchSourcePB {pub id: String,#[pb(index = 2)]- pub source: String,+ pub display_name: String,++ #[pb(index = 3, one_of)]+ pub icon: Option<ResultIconPB>,}#[derive(ProtoBuf, Default, Debug, Clone)]@@ -53,38 +56,38 @@ pub struct SearchResponseItemPB {pub index_type: IndexTypePB,#[pb(index = 2)]- pub view_id: String,-- #[pb(index = 3)]pub id: String,- #[pb(index = 4)]- pub data: String,+ #[pb(index = 3)]+ pub display_name: String,- #[pb(index = 5, one_of)]+ #[pb(index = 4, one_of)]pub icon: Option<ResultIconPB>,- #[pb(index = 6)]+ #[pb(index = 5)]pub score: f64,- #[pb(index = 7)]+ #[pb(index = 6)]pub workspace_id: String,- #[pb(index = 8, one_of)]+ #[pb(index = 7, one_of)]pub preview: Option<String>,++ #[pb(index = 8)]+ pub content: String,}impl SearchResponseItemPB {pub fn with_score(&self, score: f64) -> Self {SearchResponseItemPB {index_type: self.index_type.clone(),- view_id: self.view_id.clone(),id: self.id.clone(),- data: self.data.clone(),+ display_name: self.display_name.clone(),icon: self.icon.clone(),score,workspace_id: self.workspace_id.clone(),preview: self.preview.clone(),+ content: self.content.clone(),}}}diff --git a/frontend/rust-lib/flowy-search/src/folder/entities.rs b/frontend/rust-lib/flowy-search/src/folder/entities.rsindex 98f6c469ca..1e9fb1f0d9 100644--- a/frontend/rust-lib/flowy-search/src/folder/entities.rs+++ b/frontend/rust-lib/flowy-search/src/folder/entities.rs@@ -24,13 +24,13 @@ impl From<FolderIndexData> for SearchResponseItemPB {Self {index_type: IndexTypePB::View,- view_id: data.id.clone(),id: data.id,- data: data.title,+ display_name: data.title,score: 0.0,icon,workspace_id: data.workspace_id,preview: None,+ content: "".to_string(),}}}diff --git a/frontend/rust-lib/flowy-search/src/folder/indexer.rs b/frontend/rust-lib/flowy-search/src/folder/indexer.rsindex 5de540b0f2..9875c02465 100644--- a/frontend/rust-lib/flowy-search/src/folder/indexer.rs+++ b/frontend/rust-lib/flowy-search/src/folder/indexer.rs@@ -158,7 +158,7 @@ impl FolderIndexManagerImpl {if !content.is_empty() {let s = serde_json::to_string(&content)?;let result: SearchResponseItemPB = serde_json::from_str::<FolderIndexData>(&s)?.into();- results.push(result.with_score(self.score_result(&query, &result.data) as f64));+ results.push(result.with_score(self.score_result(&query, &result.display_name)));}}