AppFlowy-IO/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-11-09 13:09:21 +03:00
Code Issues Projects Releases Wiki Activity

feat: error message should persist on the image block (#4710)

Browse Source
This commit is contained in:
Lucas.Xu 2024-02-24 10:05:20 +07:00 committed by GitHub
parent fa3bc97698
commit 236b5bfe90
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/image_placeholder.dart
View File

@ -45,6 +45,7 @@ class ImagePlaceholderState extends State<ImagePlaceholder> {
late final editorState = context.read<EditorState>();
bool showLoading = false;
String? errorMessage;
@override
Widget build(BuildContext context) {
@ -67,19 +68,7 @@ class ImagePlaceholderState extends State<ImagePlaceholder> {
size: Size.square(24),
),
const HSpace(10),
...showLoading
? [
FlowyText(
LocaleKeys.document_imageBlock_imageIsUploading.tr(),
),
const HSpace(8),
const CircularProgressIndicator.adaptive(),
]
: [
FlowyText(
LocaleKeys.document_plugins_image_addAnImage.tr(),
),
],
..._buildTrailing(context),
],
),
),
@ -136,6 +125,30 @@ class ImagePlaceholderState extends State<ImagePlaceholder> {
}
}
List<Widget> _buildTrailing(BuildContext context) {
if (errorMessage != null) {
return [
FlowyText(
'${LocaleKeys.document_plugins_image_imageUploadFailed.tr()}: ${errorMessage!}',
),
];
} else if (showLoading) {
return [
FlowyText(
LocaleKeys.document_imageBlock_imageIsUploading.tr(),
),
const HSpace(8),
const CircularProgressIndicator.adaptive(),
];
} else {
return [
FlowyText(
LocaleKeys.document_plugins_image_addAnImage.tr(),
),
];
}
}
void showUploadImageMenu() {
if (PlatformExtension.isDesktopOrWeb) {
controller.show();
@ -188,8 +201,13 @@ class ImagePlaceholderState extends State<ImagePlaceholder> {
final size = url.fileSize;
if (size == null || size > 10 * 1024 * 1024) {
// show error
controller.close();
setState(() {
showLoading = false;
this.errorMessage =
LocaleKeys.document_imageBlock_uploadImageErrorImageSizeTooBig.tr();
});
// show error
showSnackBarMessage(
context,
LocaleKeys.document_imageBlock_uploadImageErrorImageSizeTooBig.tr(),
@ -210,10 +228,12 @@ class ImagePlaceholderState extends State<ImagePlaceholder> {
// else we should save the image to cloud storage
setState(() {
showLoading = true;
this.errorMessage = null;
});
(path, errorMessage) = await saveImageToCloudStorage(url);
setState(() {
showLoading = false;
this.errorMessage = errorMessage;
});
imageType = CustomImageType.internal;
}
@ -225,6 +245,9 @@ class ImagePlaceholderState extends State<ImagePlaceholder> {
? LocaleKeys.document_imageBlock_error_invalidImage.tr()
: ': $errorMessage',
);
setState(() {
this.errorMessage = errorMessage;
});
return;
}

3
frontend/resources/translations/en.json
View File

@ -786,7 +786,8 @@
},
"image": {
"copiedToPasteBoard": "The image link has been copied to the clipboard",
"addAnImage": "Add an image"
"addAnImage": "Add an image",
"imageUploadFailed": "Image upload failed"
},
"urlPreview": {
"copiedToPasteBoard": "The link has been copied to the clipboard"