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
fix: media option improvements (#6260)
Mathias Mogensen4888d5d52860
diff --git a/frontend/appflowy_flutter/integration_test/desktop/database/database_media_test.dart b/frontend/appflowy_flutter/integration_test/desktop/database/database_media_test.dartindex ddbffa6ca7..43f6f1f4a5 100644--- a/frontend/appflowy_flutter/integration_test/desktop/database/database_media_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/database/database_media_test.dart@@ -4,9 +4,12 @@ import 'package:flutter/services.dart';import 'package:appflowy/core/config/kv.dart';import 'package:appflowy/core/config/kv_keys.dart';+import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database/widgets/cell_editor/media_cell_editor.dart';import 'package:appflowy/startup/startup.dart';+import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/shared_widget.dart';+import 'package:appflowy/workspace/presentation/widgets/toggle/toggle.dart';import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pbenum.dart';import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';import 'package:easy_localization/easy_localization.dart';@@ -18,12 +21,13 @@ import 'package:path_provider/path_provider.dart';import '../../shared/database_test_op.dart';import '../../shared/mock/mock_file_picker.dart';import '../../shared/util.dart';+import '../board/board_hide_groups_test.dart';void main() {IntegrationTestWidgetsFlutterBinding.ensureInitialized();group('media type option in database', () {- testWidgets('add media field and add files', (tester) async {+ testWidgets('add media field and add files two times', (tester) async {await tester.initializeAppFlowy();await tester.tapAnonymousSignInButton();@@ -92,5 +96,217 @@ void main() {// Remove the temp filesawait Future.wait([firstFile.delete(), secondFile.delete()]);});++ testWidgets('add two files at once', (tester) async {+ await tester.initializeAppFlowy();+ await tester.tapAnonymousSignInButton();++ await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Grid);++ // Invoke the field editor+ await tester.tapGridFieldWithName('Type');+ await tester.tapEditFieldButton();++ // Change to media type+ await tester.tapSwitchFieldTypeButton();+ await tester.selectFieldType(FieldType.Media);+ await tester.dismissFieldEditor();++ // Open media cell editor+ await tester.tapCellInGrid(rowIndex: 0, fieldType: FieldType.Media);+ await tester.findMediaCellEditor(findsOneWidget);++ // Prepare files for upload from local+ final firstImage =+ await rootBundle.load('assets/test/images/sample.jpeg');+ final secondImage =+ await rootBundle.load('assets/test/images/sample.gif');+ final tempDirectory = await getTemporaryDirectory();++ final firstImagePath = p.join(tempDirectory.path, 'sample.jpeg');+ final firstFile = File(firstImagePath)+ ..writeAsBytesSync(firstImage.buffer.asUint8List());++ final secondImagePath = p.join(tempDirectory.path, 'sample.gif');+ final secondFile = File(secondImagePath)+ ..writeAsBytesSync(secondImage.buffer.asUint8List());++ mockPickFilePaths(paths: [firstImagePath, secondImagePath]);+ await getIt<KeyValueStorage>().set(KVKeys.kCloudType, '0');++ // Click on add file button in the Media Cell Editor+ await tester.tap(find.text(LocaleKeys.grid_media_addFileOrImage.tr()));+ await tester.pumpAndSettle();++ // Tap on the upload interaction+ await tester.tapButtonWithName(+ LocaleKeys.document_plugins_file_fileUploadHint.tr(),+ );+ await tester.pumpAndSettle();++ // Expect two files+ expect(find.byType(RenderMedia), findsNWidgets(2));++ // Remove the temp files+ await Future.wait([firstFile.delete(), secondFile.delete()]);+ });++ testWidgets('delete files', (tester) async {+ await tester.initializeAppFlowy();+ await tester.tapAnonymousSignInButton();++ await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Grid);++ // Invoke the field editor+ await tester.tapGridFieldWithName('Type');+ await tester.tapEditFieldButton();++ // Change to media type+ await tester.tapSwitchFieldTypeButton();+ await tester.selectFieldType(FieldType.Media);+ await tester.dismissFieldEditor();++ // Open media cell editor+ await tester.tapCellInGrid(rowIndex: 0, fieldType: FieldType.Media);+ await tester.findMediaCellEditor(findsOneWidget);++ // Prepare files for upload from local+ final firstImage =+ await rootBundle.load('assets/test/images/sample.jpeg');+ final secondImage =+ await rootBundle.load('assets/test/images/sample.gif');+ final tempDirectory = await getTemporaryDirectory();++ final firstImagePath = p.join(tempDirectory.path, 'sample.jpeg');+ final firstFile = File(firstImagePath)+ ..writeAsBytesSync(firstImage.buffer.asUint8List());++ final secondImagePath = p.join(tempDirectory.path, 'sample.gif');+ final secondFile = File(secondImagePath)+ ..writeAsBytesSync(secondImage.buffer.asUint8List());++ mockPickFilePaths(paths: [firstImagePath, secondImagePath]);+ await getIt<KeyValueStorage>().set(KVKeys.kCloudType, '0');++ // Click on add file button in the Media Cell Editor+ await tester.tap(find.text(LocaleKeys.grid_media_addFileOrImage.tr()));+ await tester.pumpAndSettle();++ // Tap on the upload interaction+ await tester.tapButtonWithName(+ LocaleKeys.document_plugins_file_fileUploadHint.tr(),+ );+ await tester.pumpAndSettle();++ // Expect two files+ expect(find.byType(RenderMedia), findsNWidgets(2));++ // Tap on the three dots menu for the first RenderMedia+ final mediaMenuFinder = find.descendant(+ of: find.byType(RenderMedia),+ matching: find.byFlowySvg(FlowySvgs.three_dots_s),+ );++ await tester.tap(mediaMenuFinder.first);+ await tester.pumpAndSettle();++ // Tap on the delete button+ await tester.tap(find.text(LocaleKeys.grid_media_delete.tr()));+ await tester.pumpAndSettle();++ // Tap on Delete button in the confirmation dialog+ await tester.tap(+ find.descendant(+ of: find.byType(SpaceCancelOrConfirmButton),+ matching: find.text(LocaleKeys.grid_media_delete.tr()),+ ),+ );+ await tester.pumpAndSettle(const Duration(seconds: 1));++ // Expect one file+ expect(find.byType(RenderMedia), findsOneWidget);++ // Remove the temp files+ await Future.wait([firstFile.delete(), secondFile.delete()]);+ });++ testWidgets('hide file names', (tester) async {+ await tester.initializeAppFlowy();+ await tester.tapAnonymousSignInButton();++ await tester.createNewPageWithNameUnderParent(layout: ViewLayoutPB.Grid);++ // Invoke the field editor+ await tester.tapGridFieldWithName('Type');+ await tester.tapEditFieldButton();++ // Change to media type+ await tester.tapSwitchFieldTypeButton();+ await tester.selectFieldType(FieldType.Media);+ await tester.dismissFieldEditor();++ // Open media cell editor+ await tester.tapCellInGrid(rowIndex: 0, fieldType: FieldType.Media);+ await tester.findMediaCellEditor(findsOneWidget);++ // Prepare files for upload from local+ final firstImage =+ await rootBundle.load('assets/test/images/sample.jpeg');+ final secondImage =+ await rootBundle.load('assets/test/images/sample.gif');+ final tempDirectory = await getTemporaryDirectory();++ final firstImagePath = p.join(tempDirectory.path, 'sample.jpeg');+ final firstFile = File(firstImagePath)+ ..writeAsBytesSync(firstImage.buffer.asUint8List());++ final secondImagePath = p.join(tempDirectory.path, 'sample.gif');+ final secondFile = File(secondImagePath)+ ..writeAsBytesSync(secondImage.buffer.asUint8List());++ mockPickFilePaths(paths: [firstImagePath, secondImagePath]);+ await getIt<KeyValueStorage>().set(KVKeys.kCloudType, '0');++ // Click on add file button in the Media Cell Editor+ await tester.tap(find.text(LocaleKeys.grid_media_addFileOrImage.tr()));+ await tester.pumpAndSettle();++ // Tap on the upload interaction+ await tester.tapButtonWithName(+ LocaleKeys.document_plugins_file_fileUploadHint.tr(),+ );+ await tester.pumpAndSettle();++ // Expect two files+ expect(find.byType(RenderMedia), findsNWidgets(2));++ await tester.dismissCellEditor();+ await tester.pumpAndSettle();++ // Open first row in row detail view then toggle hide file names+ await tester.openFirstRowDetailPage();+ await tester.pumpAndSettle();++ // Expect file names to be shown+ expect(find.text('sample.jpeg'), findsOneWidget);+ expect(find.text('sample.gif'), findsOneWidget);++ await tester.tapGridFieldWithNameInRowDetailPage('Type');+ await tester.pumpAndSettle();++ // Toggle hide file names+ await tester.tap(find.byType(Toggle));+ await tester.pumpAndSettle();++ await tester.dismissRowDetailPage();+ await tester.pumpAndSettle();++ // Expect file names to be hidden+ expect(find.text('sample.jpeg'), findsNothing);+ expect(find.text('sample.gif'), findsNothing);++ // Remove the temp files+ await Future.wait([firstFile.delete(), secondFile.delete()]);+ });});}diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/cell/bloc/media_cell_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/application/cell/bloc/media_cell_bloc.dartindex 3e0bd25da7..5b260784a9 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/cell/bloc/media_cell_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/cell/bloc/media_cell_bloc.dart@@ -2,6 +2,7 @@ import 'dart:async';import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart';import 'package:appflowy/plugins/database/application/field/field_info.dart';+import 'package:appflowy/plugins/database/application/field/type_option/type_option_data_parser.dart';import 'package:appflowy/user/application/user_service.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';import 'package:appflowy_backend/log.dart';@@ -58,7 +59,15 @@ class MediaCellBloc extends Bloc<MediaCellEvent, MediaCellState> {emit(state.copyWith(files: files));},didUpdateField: (fieldName) {- emit(state.copyWith(fieldName: fieldName));+ final typeOption =+ cellController.getTypeOption(MediaTypeOptionDataParser());++ emit(+ state.copyWith(+ fieldName: fieldName,+ hideFileNames: typeOption.hideFileNames,+ ),+ );},addFile: (url, name, uploadType, fileType) async {final newFile = MediaFilePB(@@ -213,14 +222,18 @@ class MediaCellState with _$MediaCellState {required String fieldName,@Default([]) List<MediaFilePB> files,@Default(false) showAllFiles,+ @Default(false) hideFileNames,}) = _MediaCellState;factory MediaCellState.initial(MediaCellController cellController) {final cellData = cellController.getCellData();+ final typeOption =+ cellController.getTypeOption(MediaTypeOptionDataParser());return MediaCellState(fieldName: cellController.fieldInfo.field.name,files: cellData?.files ?? const [],+ hideFileNames: typeOption.hideFileNames,);}}diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/field/type_option/type_option_data_parser.dart b/frontend/appflowy_flutter/lib/plugins/database/application/field/type_option/type_option_data_parser.dartindex f318bad9d5..c76e6d095c 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/field/type_option/type_option_data_parser.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/field/type_option/type_option_data_parser.dart@@ -57,3 +57,10 @@ class TranslateTypeOptionDataParserreturn TranslateTypeOptionPB.fromBuffer(buffer);}}++class MediaTypeOptionDataParser extends TypeOptionParser<MediaTypeOptionPB> {+ @override+ MediaTypeOptionPB fromBuffer(List<int> buffer) {+ return MediaTypeOptionPB.fromBuffer(buffer);+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_media_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_media_cell.dartindex 5a622dcdcf..3841a5cad6 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_media_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_media_cell.dart@@ -47,7 +47,7 @@ class GridMediaCellSkin extends IEditableMediaCellSkin {if (extraCount > 0) _ExtraInfo(extraCount: extraCount),];- if (filesToDisplay.isEmpty && isMobile) {+ if (isMobileRowDetail && filesToDisplay.isEmpty) {children.add(Padding(padding: const EdgeInsets.symmetric(vertical: 4),@@ -130,7 +130,8 @@ class GridMediaCellSkin extends IEditableMediaCellSkin {}child = InkWell(- borderRadius: BorderRadius.circular(12),+ borderRadius:+ isMobileRowDetail ? BorderRadius.circular(12) : BorderRadius.zero,onTap: () {showMobileBottomSheet(context,diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_media_cell.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_media_cell.dartindex 8869aa39dc..cf3288ddd3 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_media_cell.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_media_cell.dart@@ -21,6 +21,7 @@ import 'package:appflowy/workspace/presentation/widgets/image_viewer/image_proviimport 'package:appflowy/workspace/presentation/widgets/image_viewer/interactive_image_viewer.dart';import 'package:appflowy_backend/protobuf/flowy-database2/media_entities.pb.dart';import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:collection/collection.dart';import 'package:cross_file/cross_file.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/size.dart';@@ -57,6 +58,9 @@ class DekstopRowDetailMediaCellSkin extends IEditableMediaCellSkin {? state.files: state.files.take(_defaultFilesToDisplay).toList();final extraCount = state.files.length - _defaultFilesToDisplay;+ final images = state.files+ .where((f) => f.fileType == MediaFileTypePB.Image)+ .toList();return SizedBox(width: double.infinity,@@ -96,12 +100,15 @@ class DekstopRowDetailMediaCellSkin extends IEditableMediaCellSkin {runSpacing: 12,spacing: 12,children: [- ...filesToDisplay.map(- (file) => _FilePreviewRender(+ ...filesToDisplay.mapIndexed(+ (index, file) => _FilePreviewRender(key: ValueKey(file.id),- file: file,+ file: state.files[index],+ index: index,+ images: images,size: size,mutex: mutex,+ hideFileNames: state.hideFileNames,),),SizedBox(@@ -171,12 +178,13 @@ class _AddFileButton extends StatelessWidget {offset: const Offset(0, 10),direction: direction,popupBuilder: (_) => FileUploadMenu(- onInsertLocalFile: (file) => insertLocalFile(+ allowMultipleFiles: true,+ onInsertLocalFile: (files) => insertLocalFiles(context,- file,+ files,userProfile: context.read<MediaCellBloc>().state.userProfile,documentId: context.read<MediaCellBloc>().rowId,- onUploadSuccess: (path, isLocalMode) {+ onUploadSuccess: (file, path, isLocalMode) {final mediaCellBloc = context.read<MediaCellBloc>();if (mediaCellBloc.isClosed) {return;@@ -238,13 +246,19 @@ class _FilePreviewRender extends StatefulWidget {const _FilePreviewRender({super.key,required this.file,+ required this.images,+ required this.index,required this.size,required this.mutex,+ this.hideFileNames = false,});final MediaFilePB file;+ final List<MediaFilePB> images;+ final int index;final double size;final PopoverMutex mutex;+ final bool hideFileNames;@overrideState<_FilePreviewRender> createState() => _FilePreviewRenderState();@@ -257,41 +271,51 @@ class _FilePreviewRenderState extends State<_FilePreviewRender> {bool isHovering = false;bool isSelected = false;+ late int thisIndex;++ MediaFilePB get file => widget.file;++ @override+ void initState() {+ super.initState();+ thisIndex = widget.images.indexOf(file);+ }+@overridevoid dispose() {controller.close();super.dispose();}+ @override+ void didUpdateWidget(covariant _FilePreviewRender oldWidget) {+ thisIndex = widget.images.indexOf(file);+ super.didUpdateWidget(oldWidget);+ }+@overrideWidget build(BuildContext context) {Widget child;- if (widget.file.fileType == MediaFileTypePB.Image) {- if (widget.file.uploadType == MediaUploadTypePB.NetworkMedia) {- child = Image.network(- widget.file.url,- fit: BoxFit.cover,- );- } else if (widget.file.uploadType == MediaUploadTypePB.LocalMedia) {- child = Image.file(- File(widget.file.url),- fit: BoxFit.cover,- );+ if (file.fileType == MediaFileTypePB.Image) {+ if (file.uploadType == MediaUploadTypePB.NetworkMedia) {+ child = Image.network(file.url, fit: BoxFit.cover);+ } else if (file.uploadType == MediaUploadTypePB.LocalMedia) {+ child = Image.file(File(file.url), fit: BoxFit.cover);} else {// Cloudchild = FlowyNetworkImage(- url: widget.file.url,+ url: file.url,userProfilePB: context.read<MediaCellBloc>().state.userProfile,);}} else {child = DecoratedBox(- decoration: BoxDecoration(color: widget.file.fileType.color),+ decoration: BoxDecoration(color: file.fileType.color),child: Center(child: Container(padding: const EdgeInsets.all(8),child: FlowySvg(- widget.file.fileType.icon,+ file.fileType.icon,color: AFThemeExtension.of(context).strongText,size: const Size.square(32),),@@ -309,7 +333,7 @@ class _FilePreviewRenderState extends State<_FilePreviewRender> {separatorBuilder: () => const VSpace(4),mainAxisSize: MainAxisSize.min,children: [- if (widget.file.fileType == MediaFileTypePB.Image) ...[+ if (file.fileType == MediaFileTypePB.Image) ...[FlowyButton(onTap: () {controller.close();@@ -319,15 +343,19 @@ class _FilePreviewRenderState extends State<_FilePreviewRender> {userProfile:context.read<MediaCellBloc>().state.userProfile,imageProvider: AFBlockImageProvider(- images: [- ImageBlockData(- url: widget.file.url,- type: widget.file.uploadType.toCustomImageType(),- ),- ],- onDeleteImage: (_) => context- .read<MediaCellBloc>()- .deleteFile(widget.file.id),+ initialIndex: thisIndex,+ images: widget.images+ .map(+ (e) => ImageBlockData(+ url: e.url,+ type: e.uploadType.toCustomImageType(),+ ),+ )+ .toList(),+ onDeleteImage: (index) {+ final deleteFile = widget.images[index];+ context.read<MediaCellBloc>().deleteFile(deleteFile.id);+ },),),);@@ -357,7 +385,7 @@ class _FilePreviewRenderState extends State<_FilePreviewRender> {onTap: () {controller.close();- nameController.text = widget.file.name;+ nameController.text = file.name;nameController.selection = TextSelection(baseOffset: 0,extentOffset: nameController.text.length,@@ -384,7 +412,7 @@ class _FilePreviewRenderState extends State<_FilePreviewRender> {FlowyButton(onTap: () async => downloadMediaFile(context,- widget.file,+ file,userProfile: context.read<MediaCellBloc>().state.userProfile,),leftIcon: FlowySvg(@@ -404,11 +432,11 @@ class _FilePreviewRenderState extends State<_FilePreviewRender> {controller.close();showConfirmDeletionDialog(context: context,- name: widget.file.name,+ name: file.name,description: LocaleKeys.grid_media_deleteFileDescription.tr(),onConfirm: () => context.read<MediaCellBloc>()- .add(MediaCellEvent.removeFile(fileId: widget.file.id)),+ .add(MediaCellEvent.removeFile(fileId: file.id)),);},leftIcon: FlowySvg(@@ -427,14 +455,17 @@ class _FilePreviewRenderState extends State<_FilePreviewRender> {),child: GestureDetector(behavior: HitTestBehavior.translucent,- onTap: widget.file.fileType != MediaFileTypePB.Image+ onTap: file.fileType != MediaFileTypePB.Image? null- : () => openInteractiveViewerFromFile(+ : () => openInteractiveViewerFromFiles(context,- widget.file,+ widget.images,userProfile: context.read<MediaCellBloc>().state.userProfile,- onDeleteImage: (_) =>- context.read<MediaCellBloc>().deleteFile(widget.file.id),+ initialIndex: thisIndex,+ onDeleteImage: (index) {+ final deleteFile = widget.images[index];+ context.read<MediaCellBloc>().deleteFile(deleteFile.id);+ },),child: FlowyHover(isSelected: () => isSelected,@@ -464,39 +495,46 @@ class _FilePreviewRenderState extends State<_FilePreviewRender> {clipBehavior: Clip.antiAlias,decoration: BoxDecoration(color: AFThemeExtension.of(context).greyHover,- borderRadius: const BorderRadius.only(+ borderRadius: BorderRadius.only(topLeft: Corners.s6Radius,topRight: Corners.s6Radius,+ bottomLeft: widget.hideFileNames+ ? Corners.s6Radius+ : Radius.zero,+ bottomRight: widget.hideFileNames+ ? Corners.s6Radius+ : Radius.zero,),),child: child,),- Container(- height: 28,- width: widget.size,- clipBehavior: Clip.antiAlias,- decoration: BoxDecoration(- color: Theme.of(context).isLightMode- ? Theme.of(context).cardColor- : AFThemeExtension.of(context).greyHover,- borderRadius: const BorderRadius.only(- bottomLeft: Corners.s6Radius,- bottomRight: Corners.s6Radius,+ if (!widget.hideFileNames)+ Container(+ height: 28,+ width: widget.size,+ clipBehavior: Clip.antiAlias,+ decoration: BoxDecoration(+ color: Theme.of(context).isLightMode+ ? Theme.of(context).cardColor+ : AFThemeExtension.of(context).greyHover,+ borderRadius: const BorderRadius.only(+ bottomLeft: Corners.s6Radius,+ bottomRight: Corners.s6Radius,+ ),),- ),- child: Padding(- padding: const EdgeInsets.symmetric(horizontal: 8),- child: Center(- child: FlowyText.medium(- widget.file.name,- overflow: TextOverflow.ellipsis,- fontSize: 12,- color:- AFThemeExtension.of(context).secondaryTextColor,+ child: Padding(+ padding: const EdgeInsets.symmetric(horizontal: 8),+ child: Center(+ child: FlowyText.medium(+ file.name,+ overflow: TextOverflow.ellipsis,+ fontSize: 12,+ color: AFThemeExtension.of(context)+ .secondaryTextColor,+ ),),),),- ),],),),@@ -541,7 +579,7 @@ class _FilePreviewRenderState extends State<_FilePreviewRender> {context.read<MediaCellBloc>()- .add(MediaCellEvent.renameFile(fileId: widget.file.id, name: newName));+ .add(MediaCellEvent.renameFile(fileId: file.id, name: newName));Navigator.of(context).pop();}}diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/media_cell_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/media_cell_editor.dartindex 33b15377cc..7d8a80d98a 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/media_cell_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/media_cell_editor.dart@@ -47,6 +47,10 @@ class _MediaCellEditorState extends State<MediaCellEditor> {Widget build(BuildContext context) {return BlocBuilder<MediaCellBloc, MediaCellState>(builder: (context, state) {+ final images = state.files+ .where((file) => file.fileType == MediaFileTypePB.Image)+ .toList();+return Padding(padding: const EdgeInsets.all(4),child: SingleChildScrollView(@@ -63,6 +67,7 @@ class _MediaCellEditorState extends State<MediaCellEditor> {value: context.read<MediaCellBloc>(),child: RenderMedia(file: state.files[index],+ images: images,index: index,enableReordering: state.files.length > 1,mutex: itemMutex,@@ -92,13 +97,14 @@ class _MediaCellEditorState extends State<MediaCellEditor> {),triggerActions: PopoverTriggerFlags.none,popupBuilder: (popoverContext) => FileUploadMenu(- onInsertLocalFile: (file) async => insertLocalFile(+ allowMultipleFiles: true,+ onInsertLocalFile: (files) async => insertLocalFiles(context,- file,+ files,userProfile:context.read<MediaCellBloc>().state.userProfile,documentId: context.read<MediaCellBloc>().rowId,- onUploadSuccess: (path, isLocalMode) {+ onUploadSuccess: (file, path, isLocalMode) {final mediaCellBloc = context.read<MediaCellBloc>();if (mediaCellBloc.isClosed) {return;@@ -201,12 +207,14 @@ class RenderMedia extends StatefulWidget {super.key,required this.index,required this.file,+ required this.images,required this.enableReordering,required this.mutex,});final int index;final MediaFilePB file;+ final List<MediaFilePB> images;final bool enableReordering;final PopoverMutex mutex;@@ -216,6 +224,21 @@ class RenderMedia extends StatefulWidget {class _RenderMediaState extends State<RenderMedia> {bool isHovering = false;+ int? imageIndex;++ MediaFilePB get file => widget.file;++ @override+ void initState() {+ super.initState();+ imageIndex = widget.images.indexOf(file);+ }++ @override+ void didUpdateWidget(covariant RenderMedia oldWidget) {+ imageIndex = widget.images.indexOf(file);+ super.didUpdateWidget(oldWidget);+ }@overrideWidget build(BuildContext context) {@@ -242,33 +265,34 @@ class _RenderMediaState extends State<RenderMedia> {child: const FlowySvg(FlowySvgs.drag_element_s),),const HSpace(8),- if (widget.file.fileType == MediaFileTypePB.Image &&- widget.file.uploadType == MediaUploadTypePB.CloudMedia) ...[+ if (file.fileType == MediaFileTypePB.Image &&+ file.uploadType == MediaUploadTypePB.CloudMedia) ...[Expanded(child: _openInteractiveViewer(context,- file: widget.file,+ files: widget.images,+ index: imageIndex!,child: FlowyNetworkImage(- url: widget.file.url,+ url: file.url,userProfilePB:context.read<MediaCellBloc>().state.userProfile,),),),- ] else if (widget.file.fileType == MediaFileTypePB.Image) ...[+ ] else if (file.fileType == MediaFileTypePB.Image) ...[Expanded(child: _openInteractiveViewer(context,- file: widget.file,- child: widget.file.uploadType ==- MediaUploadTypePB.NetworkMedia+ files: widget.images,+ index: imageIndex!,+ child: file.uploadType == MediaUploadTypePB.NetworkMedia? Image.network(- widget.file.url,+ file.url,fit: BoxFit.cover,alignment: Alignment.centerLeft,): Image.file(- File(widget.file.url),+ File(file.url),fit: BoxFit.cover,alignment: Alignment.centerLeft,),@@ -277,18 +301,18 @@ class _RenderMediaState extends State<RenderMedia> {] else ...[Expanded(child: GestureDetector(- onTap: () => afLaunchUrlString(widget.file.url),+ onTap: () => afLaunchUrlString(file.url),child: Row(children: [FlowySvg(- widget.file.fileType.icon,+ file.fileType.icon,color: AFThemeExtension.of(context).strongText,size: const Size.square(18),),const HSpace(8),Flexible(child: FlowyText(- widget.file.name,+ file.name,overflow: TextOverflow.ellipsis,),),@@ -307,7 +331,7 @@ class _RenderMediaState extends State<RenderMedia> {popupBuilder: (popoverContext) => BlocProvider.value(value: context.read<MediaCellBloc>(),child: MediaItemMenu(- file: widget.file,+ file: file,closeContext: popoverContext,),),@@ -330,17 +354,21 @@ class _RenderMediaState extends State<RenderMedia> {Widget _openInteractiveViewer(BuildContext context, {- required MediaFilePB file,+ required List<MediaFilePB> files,+ required int index,required Widget child,}) =>GestureDetector(behavior: HitTestBehavior.translucent,- onTap: () => openInteractiveViewerFromFile(+ onTap: () => openInteractiveViewerFromFiles(context,- file,- onDeleteImage: (_) =>- context.read<MediaCellBloc>().deleteFile(file.id),+ files,+ onDeleteImage: (index) {+ final deleteFile = files[index];+ context.read<MediaCellBloc>().deleteFile(deleteFile.id);+ },userProfile: context.read<MediaCellBloc>().state.userProfile,+ initialIndex: index,),child: child,);diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/mobile_media_cell_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/mobile_media_cell_editor.dartindex 825de97d64..45fe7ff5d6 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/mobile_media_cell_editor.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/mobile_media_cell_editor.dart@@ -68,19 +68,19 @@ class MobileMediaCellEditor extends StatelessWidget {minHeight: 80,),child: FileUploadMenu(- onInsertLocalFile: (file) async {+ onInsertLocalFile: (files) async {dialogContext.pop();- await insertLocalFile(+ await insertLocalFiles(context,- file,+ files,userProfile: context.read<MediaCellBloc>().state.userProfile,documentId:context.read<MediaCellBloc>().rowId,- onUploadSuccess: (path, isLocalMode) {+ onUploadSuccess: (file, path, isLocalMode) {final mediaCellBloc =context.read<MediaCellBloc>();if (mediaCellBloc.isClosed) {diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/media.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/media.dartindex ecd1ba73fb..532b19fe66 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/media.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/type_option_editor/media.dart@@ -1,8 +1,17 @@import 'package:flutter/material.dart';+import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy/plugins/database/application/field/type_option/type_option_data_parser.dart';+import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';import 'package:appflowy/plugins/database/widgets/field/type_option_editor/builder.dart';+import 'package:appflowy/workspace/presentation/widgets/toggle/toggle.dart';import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pb.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/media_entities.pb.dart';import 'package:appflowy_popover/appflowy_popover.dart';+import 'package:easy_localization/easy_localization.dart';+import 'package:flowy_infra_ui/style_widget/button.dart';+import 'package:flowy_infra_ui/style_widget/text.dart';+import 'package:protobuf/protobuf.dart';class MediaTypeOptionEditorFactory implements TypeOptionEditorFactory {const MediaTypeOptionEditorFactory();@@ -14,6 +23,53 @@ class MediaTypeOptionEditorFactory implements TypeOptionEditorFactory {required FieldPB field,required PopoverMutex popoverMutex,required TypeOptionDataCallback onTypeOptionUpdated,- }) =>- null;+ }) {+ final typeOption = _parseTypeOptionData(field.typeOptionData);++ return Container(+ padding: const EdgeInsets.symmetric(horizontal: 6),+ height: GridSize.popoverItemHeight,+ alignment: Alignment.centerLeft,+ child: Column(+ mainAxisSize: MainAxisSize.min,+ children: [+ Row(+ children: [+ Expanded(+ child: FlowyButton(+ resetHoverOnRebuild: false,+ text: FlowyText.medium(+ LocaleKeys.grid_media_hideFileNames.tr(),+ lineHeight: 1.0,+ ),+ rightIcon: Toggle(+ value: typeOption.hideFileNames,+ onChanged: (value) {+ onTypeOptionUpdated(+ _toggleHideFiles(typeOption, !value).writeToBuffer(),+ );+ },+ padding: EdgeInsets.zero,+ ),+ ),+ ),+ ],+ ),+ ],+ ),+ );+ }++ MediaTypeOptionPB _parseTypeOptionData(List<int> data) {+ return MediaTypeOptionDataParser().fromBuffer(data);+ }++ MediaTypeOptionPB _toggleHideFiles(+ MediaTypeOptionPB typeOption,+ bool hideFileNames,+ ) {+ typeOption.freeze();+ return typeOption+ .rebuild((typeOption) => typeOption.hideFileNames = hideFileNames);+ }}diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_block_component.dartindex e65ab9aab6..8f68d14e4f 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_block_component.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_block_component.dart@@ -245,7 +245,7 @@ class FileBlockComponentState extends State<FileBlockComponent>},onDragDone: (details) {if (dropManagerState.isDropEnabled) {- insertFileFromLocal(details.files.first);+ insertFileFromLocal(details.files);}},child: AppFlowyPopover(@@ -471,7 +471,10 @@ class FileBlockComponentState extends State<FileBlockComponent>);}- Future<void> insertFileFromLocal(XFile file) async {+ Future<void> insertFileFromLocal(List<XFile> files) async {+ if (files.isEmpty) return;++ final file = files.first;final path = file.path;final documentBloc = context.read<DocumentBloc>();final isLocalMode = documentBloc.isLocalMode;diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_upload_menu.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_upload_menu.dartindex 3170a05f3d..f86916a39f 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_upload_menu.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_upload_menu.dart@@ -19,10 +19,12 @@ class FileUploadMenu extends StatefulWidget {super.key,required this.onInsertLocalFile,required this.onInsertNetworkFile,+ this.allowMultipleFiles = false,});- final void Function(XFile file) onInsertLocalFile;+ final void Function(List<XFile> files) onInsertLocalFile;final void Function(String url) onInsertNetworkFile;+ final bool allowMultipleFiles;@overrideState<FileUploadMenu> createState() => _FileUploadMenuState();@@ -59,9 +61,10 @@ class _FileUploadMenuState extends State<FileUploadMenu> {const Divider(height: 4),if (currentTab == 0) ...[_FileUploadLocal(- onFilePicked: (file) {- if (file != null) {- widget.onInsertLocalFile(file);+ allowMultipleFiles: widget.allowMultipleFiles,+ onFilesPicked: (files) {+ if (files.isNotEmpty) {+ widget.onInsertLocalFile(files);}},),@@ -94,9 +97,13 @@ class _Tab extends StatelessWidget {}class _FileUploadLocal extends StatefulWidget {- const _FileUploadLocal({required this.onFilePicked});+ const _FileUploadLocal({+ required this.onFilesPicked,+ this.allowMultipleFiles = false,+ });- final void Function(XFile?) onFilePicked;+ final void Function(List<XFile>) onFilesPicked;+ final bool allowMultipleFiles;@overrideState<_FileUploadLocal> createState() => _FileUploadLocalState();@@ -137,7 +144,7 @@ class _FileUploadLocalState extends State<_FileUploadLocal> {child: DropTarget(onDragEntered: (_) => setState(() => isDragging = true),onDragExited: (_) => setState(() => isDragging = false),- onDragDone: (details) => widget.onFilePicked(details.files.first),+ onDragDone: (details) => widget.onFilesPicked(details.files),child: MouseRegion(cursor: SystemMouseCursors.click,child: GestureDetector(@@ -200,10 +207,16 @@ class _FileUploadLocalState extends State<_FileUploadLocal> {}Future<void> _uploadFile(BuildContext context) async {- final result = await getIt<FilePickerService>().pickFiles(dialogTitle: '');- final file =- result?.files.isNotEmpty ?? false ? result?.files.first.xFile : null;- widget.onFilePicked(file);+ final result = await getIt<FilePickerService>().pickFiles(+ dialogTitle: '',+ allowMultiple: widget.allowMultipleFiles,+ );++ final List<XFile> files = result?.files.isNotEmpty ?? false+ ? result!.files.map((f) => f.xFile).toList()+ : const [];++ widget.onFilesPicked(files);}}diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_util.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_util.dartindex d0ec60da4f..ad0c74d3e7 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_util.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_util.dart@@ -1,6 +1,8 @@import 'dart:convert';import 'dart:io';+import 'package:flutter/material.dart';+import 'package:appflowy/core/helpers/url_launcher.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/document/application/document_service.dart';@@ -9,6 +11,7 @@ import 'package:appflowy/startup/startup.dart';import 'package:appflowy/util/xfile_ext.dart';import 'package:appflowy/workspace/application/settings/application_data_storage.dart';import 'package:appflowy/workspace/presentation/home/toast.dart';+import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';import 'package:appflowy_backend/dispatch/error.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database2/media_entities.pb.dart';@@ -19,9 +22,9 @@ import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/file_picker/file_picker_impl.dart';import 'package:flowy_infra/uuid.dart';import 'package:flowy_infra_ui/style_widget/snap_bar.dart';-import 'package:flutter/material.dart';import 'package:http/http.dart' as http;import 'package:path/path.dart' as p;+import 'package:toastification/toastification.dart';import 'package:universal_platform/universal_platform.dart';Future<String?> saveFileToLocalStorage(String localFilePath) async {@@ -88,6 +91,8 @@ Future<(String? path, String? errorMessage)> saveFileToCloudStorage(/// On Mobile the file is fetched first using HTTP, and then saved using FilePicker./// On Desktop the files location is picked first using FilePicker, and then the file is saved.///+/// [onDownloadBegin] and [onDownloadEnd] are only used for Mobile.+///Future<void> downloadMediaFile(BuildContext context,MediaFilePB file, {@@ -105,7 +110,7 @@ Future<void> downloadMediaFile(if (userProfile == null) {return showSnapBar(context,- "Failed to download file, could not find user token",+ LocaleKeys.grid_media_downloadFailedToken.tr(),);}@@ -120,14 +125,23 @@ Future<void> downloadMediaFile(if (response.statusCode == 200) {final tempFile = File(uri.pathSegments.last);- await FilePicker().saveFile(+ final result = await FilePicker().saveFile(fileName: p.basename(tempFile.path),bytes: response.bodyBytes,);++ if (result != null && context.mounted) {+ showToastNotification(+ context,+ type: ToastificationType.error,+ message: LocaleKeys.grid_media_downloadSuccess.tr(),+ );+ }} else if (context.mounted) {- showSnapBar(+ showToastNotification(context,- LocaleKeys.document_plugins_image_imageDownloadFailed.tr(),+ type: ToastificationType.error,+ message: LocaleKeys.document_plugins_image_imageDownloadFailed.tr(),);}@@ -144,6 +158,13 @@ Future<void> downloadMediaFile(if (response.statusCode == 200) {final imgFile = File(savePath);await imgFile.writeAsBytes(response.bodyBytes);++ if (context.mounted) {+ showSnapBar(+ context,+ LocaleKeys.grid_media_downloadSuccess.tr(),+ );+ }} else if (context.mounted) {showSnapBar(context,@@ -191,3 +212,53 @@ Future<void> insertLocalFile(onUploadSuccess?.call(path, isLocalMode);}++/// [onUploadSuccess] Callback to be called when the upload is successful.+///+/// The callback is called for each file that is successfully uploaded.+/// In case of an error, the error message will be shown on a per-file basis.+///+Future<void> insertLocalFiles(+ BuildContext context,+ List<XFile> files, {+ required String documentId,+ UserProfilePB? userProfile,+ void Function(+ XFile file,+ String path,+ bool isLocalMode,+ )? onUploadSuccess,+}) async {+ if (files.every((f) => f.path.isEmpty)) return;++ // Check upload type+ final isLocalMode = (userProfile?.authenticator ?? AuthenticatorPB.Local) ==+ AuthenticatorPB.Local;++ for (final file in files) {+ final fileType = file.fileType.toMediaFileTypePB();++ String? path;+ String? errorMsg;++ if (isLocalMode) {+ path = await saveFileToLocalStorage(file.path);+ } else {+ (path, errorMsg) = await saveFileToCloudStorage(+ file.path,+ documentId,+ fileType == MediaFileTypePB.Image,+ );+ }++ if (errorMsg != null) {+ showSnackBarMessage(context, errorMsg);+ continue;+ }++ if (path == null) {+ continue;+ }+ onUploadSuccess?.call(file, path, isLocalMode);+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/upload_image_menu/upload_image_menu.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/upload_image_menu/upload_image_menu.dartindex 4e6b68489d..f40cc0e221 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/upload_image_menu/upload_image_menu.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/upload_image_menu/upload_image_menu.dart@@ -1,7 +1,6 @@import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/document/presentation/editor_plugins/header/cover_editor.dart';import 'package:appflowy/plugins/document/presentation/editor_plugins/image/unsplash_image_widget.dart';-//import 'package:appflowy/plugins/document/presentation/editor_plugins/image/upload_image_menu/widgets/stability_ai_image_widget.dart';import 'package:appflowy/plugins/document/presentation/editor_plugins/image/upload_image_menu/widgets/upload_image_file_widget.dart';import 'package:appflowy/plugins/document/presentation/editor_plugins/plugins.dart';import 'package:appflowy_editor/appflowy_editor.dart' hide ColorOption;@@ -20,18 +19,15 @@ enum UploadImageType {unsplash,color;- String get description {- switch (this) {- case UploadImageType.local:- return LocaleKeys.document_imageBlock_upload_label.tr();- case UploadImageType.url:- return LocaleKeys.document_imageBlock_embedLink_label.tr();- case UploadImageType.unsplash:- return LocaleKeys.document_imageBlock_unsplash_label.tr();- case UploadImageType.color:- return LocaleKeys.document_plugins_cover_colors.tr();- }- }+ String get description => switch (this) {+ UploadImageType.local =>+ LocaleKeys.document_imageBlock_upload_label.tr(),+ UploadImageType.url =>+ LocaleKeys.document_imageBlock_embedLink_label.tr(),+ UploadImageType.unsplash =>+ LocaleKeys.document_imageBlock_unsplash_label.tr(),+ UploadImageType.color => LocaleKeys.document_plugins_cover_colors.tr(),+ };}class UploadImageMenu extends StatefulWidget {@@ -65,7 +61,6 @@ class _UploadImageMenuState extends State<UploadImageMenu> {@overridevoid initState() {super.initState();-values = widget.supportTypes;}diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/image_viewer/interactive_image_viewer.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/image_viewer/interactive_image_viewer.dartindex 7ea37e3ce2..1678be5a16 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/image_viewer/interactive_image_viewer.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/image_viewer/interactive_image_viewer.dart@@ -211,3 +211,29 @@ void openInteractiveViewerFromFile(),),);++void openInteractiveViewerFromFiles(+ BuildContext context,+ List<MediaFilePB> files, {+ required void Function(int) onDeleteImage,+ int initialIndex = 0,+ UserProfilePB? userProfile,+}) =>+ showDialog(+ context: context,+ builder: (_) => InteractiveImageViewer(+ userProfile: userProfile,+ imageProvider: AFBlockImageProvider(+ initialIndex: initialIndex,+ images: files+ .map(+ (f) => ImageBlockData(+ url: f.url,+ type: f.uploadType.toCustomImageType(),+ ),+ )+ .toList(),+ onDeleteImage: onDeleteImage,+ ),+ ),+ );diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.jsonindex 46fe8a32af..686ab8b60a 100644--- a/frontend/resources/translations/en.json+++ b/frontend/resources/translations/en.json@@ -1477,7 +1477,10 @@"showFiles": "Show {} files","hideFile": "Hide 1 file","hideFiles": "Hide {} files",- "deleteFileDescription": "Are you sure you want to delete this file? This action is irreversible."+ "deleteFileDescription": "Are you sure you want to delete this file? This action is irreversible.",+ "hideFileNames": "Hide file names",+ "downloadSuccess": "Successfully saved file",+ "downloadFailedToken": "Failed to download file, user token unavailable"}},"document": {@@ -1625,8 +1628,8 @@"addAnImageMobile": "Click to add one or more images","dropImageToInsert": "Drop images to insert","imageUploadFailed": "Image upload failed",- "imageDownloadFailed": "Image upload failed, please try again",- "imageDownloadFailedToken": "Image upload failed due to missing user token, please try again",+ "imageDownloadFailed": "Image download failed, please try again",+ "imageDownloadFailedToken": "Image download failed due to missing user token, please try again","errorCode": "Error code"},"photoGallery": {@@ -2557,4 +2560,4 @@"zoomIn": "Zoom in","zoomOut": "Zoom out"}-}+}\ No newline at end of filediff --git a/frontend/rust-lib/flowy-database2/src/entities/type_option_entities/media_entities.rs b/frontend/rust-lib/flowy-database2/src/entities/type_option_entities/media_entities.rsindex 543a5a726c..fd8ed9d95b 100644--- a/frontend/rust-lib/flowy-database2/src/entities/type_option_entities/media_entities.rs+++ b/frontend/rust-lib/flowy-database2/src/entities/type_option_entities/media_entities.rs@@ -31,6 +31,9 @@ impl From<MediaCellDataPB> for MediaCellData {pub struct MediaTypeOptionPB {#[pb(index = 1)]pub files: Vec<MediaFilePB>,++ #[pb(index = 2)]+ pub hide_file_names: bool,}#[derive(Debug, Clone, Default, ProtoBuf)]diff --git a/frontend/rust-lib/flowy-database2/src/services/database_view/view_group.rs b/frontend/rust-lib/flowy-database2/src/services/database_view/view_group.rsindex 97e7a91cb0..2e8b69d10c 100644--- a/frontend/rust-lib/flowy-database2/src/services/database_view/view_group.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database_view/view_group.rs@@ -99,7 +99,7 @@ impl GroupControllerDelegate for GroupControllerDelegateImpl {async fn get_all_rows(&self, view_id: &str) -> Vec<Arc<Row>> {let row_orders = self.delegate.get_all_row_orders(view_id).await;let rows = self.delegate.get_all_rows(view_id, row_orders).await;-+self.filter_controller.filter_rows(rows).await}}diff --git a/frontend/rust-lib/flowy-database2/src/services/database_view/view_sort.rs b/frontend/rust-lib/flowy-database2/src/services/database_view/view_sort.rsindex 12ff919e3c..53b70a42ca 100644--- a/frontend/rust-lib/flowy-database2/src/services/database_view/view_sort.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database_view/view_sort.rs@@ -63,7 +63,7 @@ impl SortDelegate for DatabaseViewSortDelegateImpl {let view_id = view_id.to_string();let row_orders = self.delegate.get_all_row_orders(&view_id).await;let rows = self.delegate.get_all_rows(&view_id, row_orders).await;-+self.filter_controller.filter_rows(rows).await}diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/media_type_option/media_type_option.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/media_type_option/media_type_option.rsindex 77a5e32ad9..073256f6fa 100644--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/media_type_option/media_type_option.rs+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/media_type_option/media_type_option.rs@@ -100,6 +100,9 @@ impl ToString for MediaCellData {pub struct MediaTypeOption {#[serde(default)]pub files: Vec<MediaFile>,++ #[serde(default)]+ pub hide_file_names: bool,}impl TypeOption for MediaTypeOption {@@ -129,6 +132,7 @@ impl From<MediaTypeOption> for MediaTypeOptionPB {fn from(value: MediaTypeOption) -> Self {Self {files: value.files.into_iter().map(Into::into).collect(),+ hide_file_names: value.hide_file_names,}}}@@ -137,6 +141,7 @@ impl From<MediaTypeOptionPB> for MediaTypeOption {fn from(value: MediaTypeOptionPB) -> Self {Self {files: value.files.into_iter().map(Into::into).collect(),+ hide_file_names: value.hide_file_names,}}}diff --git a/frontend/rust-lib/flowy-database2/tests/database/mock_data/grid_mock_data.rs b/frontend/rust-lib/flowy-database2/tests/database/mock_data/grid_mock_data.rsindex ac9b741a3d..c57bf930fc 100644--- a/frontend/rust-lib/flowy-database2/tests/database/mock_data/grid_mock_data.rs+++ b/frontend/rust-lib/flowy-database2/tests/database/mock_data/grid_mock_data.rs@@ -152,7 +152,10 @@ pub fn make_test_grid() -> DatabaseData {fields.push(translate_field);},FieldType::Media => {- let type_option = MediaTypeOption { files: vec![] };+ let type_option = MediaTypeOption {+ files: vec![],+ hide_file_names: false,+ };let media_field = FieldBuilder::new(field_type, type_option).name("Media")