From e0d6b194bfb7450236dab13bf7a3a066c6c20d25 Mon Sep 17 00:00:00 2001 From: Richard Shiue <71320345+richardshiue@users.noreply.github.com> Date: Mon, 29 Apr 2024 17:34:18 +0800 Subject: [PATCH] fix: some database bugs (#5210) * fix: open logic for url cell in database * fix: row date created not working * fix: help my toasts are burnt * chore: quote style and add comment --- .../cell/editable_cell_skeleton/url.dart | 33 +++++++------------ .../workspace/presentation/home/toast.dart | 3 +- .../src/services/database/database_editor.rs | 11 ++++--- 3 files changed, 19 insertions(+), 28 deletions(-) diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/url.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/url.dart index 2646aadf1f..1535886ea1 100644 --- a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/url.dart +++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell/editable_cell_skeleton/url.dart @@ -4,7 +4,6 @@ import 'dart:io'; import 'package:appflowy/generated/flowy_svgs.g.dart'; import 'package:appflowy/generated/locale_keys.g.dart'; import 'package:appflowy/mobile/presentation/widgets/flowy_mobile_quick_action_button.dart'; -import 'package:appflowy/core/helpers/url_launcher.dart'; import 'package:appflowy/plugins/database/application/cell/cell_controller.dart'; import 'package:appflowy/plugins/database/application/cell/cell_controller_builder.dart'; import 'package:appflowy/plugins/database/application/database_controller.dart'; @@ -19,6 +18,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:go_router/go_router.dart'; +import 'package:url_launcher/url_launcher.dart'; import '../desktop_grid/desktop_grid_url_cell.dart'; import '../desktop_row_detail/desktop_row_detail_url_cell.dart'; @@ -214,29 +214,20 @@ class MobileURLEditor extends StatelessWidget { } void openUrlCellLink(String content) async { - String url = ""; + late Uri uri; try { - // check protocol is provided - const linkPrefix = [ - 'http://', - 'https://', - 'file://', - 'ftp://', - 'ftps://', - 'mailto:', - ]; - final shouldAddScheme = - !linkPrefix.any((pattern) => content.startsWith(pattern)); - url = shouldAddScheme ? 'http://$content' : content; - - // get hostname and check validity - final uri = Uri.parse(url); - final hostName = uri.host; - await InternetAddress.lookup(hostName); + uri = Uri.parse(content); + // `Uri` identifies `localhost` as a scheme + if (!uri.hasScheme || uri.scheme == 'localhost') { + uri = Uri.parse("http://$content"); + await InternetAddress.lookup(uri.host); + } } catch (_) { - url = "https://www.google.com/search?q=${Uri.encodeComponent(content)}"; + uri = Uri.parse( + "https://www.google.com/search?q=${Uri.encodeComponent(content)}", + ); } finally { - await afLaunchUrlString(url); + await launchUrl(uri); } } diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/toast.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/toast.dart index cd4314fc01..6e9d575dce 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/home/toast.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/toast.dart @@ -41,8 +41,7 @@ void showMessageToast( ToastGravity gravity = ToastGravity.BOTTOM, }) { final child = FlowyMessageToast(message: message); - final toast = context == null ? getIt() : FToast() - ..init(context!); + final toast = context == null ? getIt() : (FToast()..init(context)); toast.showToast( child: child, gravity: gravity, diff --git a/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs b/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs index 11a23eaad5..ba0266dc6e 100644 --- a/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs +++ b/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs @@ -10,7 +10,8 @@ use crate::services::database_view::{ use crate::services::field::{ default_type_option_data_from_type, select_type_option_from_field, transform_type_option, type_option_data_from_pb, ChecklistCellChangeset, RelationTypeOption, SelectOptionCellChangeset, - StrCellData, TimestampCellData, TypeOptionCellDataHandler, TypeOptionCellExt, + StrCellData, TimestampCellData, TimestampCellDataWrapper, TypeOptionCellDataHandler, + TypeOptionCellExt, }; use crate::services::field_settings::{default_field_settings_by_layout_map, FieldSettings}; use crate::services::filter::{Filter, FilterChangeset}; @@ -722,12 +723,12 @@ impl DatabaseEditor { match field_type { FieldType::LastEditedTime | FieldType::CreatedTime => { let row = database.get_row(row_id); - let cell_data = if field_type.is_created_time() { - TimestampCellData::new(row.created_at) + let wrapped_cell_data = if field_type.is_created_time() { + TimestampCellDataWrapper::from((field_type, TimestampCellData::new(row.created_at))) } else { - TimestampCellData::new(row.modified_at) + TimestampCellDataWrapper::from((field_type, TimestampCellData::new(row.modified_at))) }; - Some(Cell::from(cell_data)) + Some(Cell::from(wrapped_cell_data)) }, _ => database.get_cell(field_id, row_id).cell, }