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.

fix: show default view name (#6571)

Mathias Mogensenda80c599bfa8
diff --git a/frontend/appflowy_flutter/lib/mobile/application/notification/notification_reminder_bloc.dart b/frontend/appflowy_flutter/lib/mobile/application/notification/notification_reminder_bloc.dart
index 193634b2d5..45302db221 100644
--- a/frontend/appflowy_flutter/lib/mobile/application/notification/notification_reminder_bloc.dart
+++ b/frontend/appflowy_flutter/lib/mobile/application/notification/notification_reminder_bloc.dart
@@ -56,7 +56,7 @@ class NotificationReminderBloc
emit(
NotificationReminderState(
createdAt: createdAt,
- pageTitle: view.name,
+ pageTitle: view.nameOrDefault,
view: view,
reminderContent: node.delta?.toPlainText() ?? '',
nodes: [node],
@@ -68,7 +68,7 @@ class NotificationReminderBloc
emit(
NotificationReminderState(
createdAt: createdAt,
- pageTitle: view.name,
+ pageTitle: view.nameOrDefault,
view: view,
reminderContent: reminder.message,
status: NotificationReminderStatus.loaded,
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/page_item/mobile_view_item.dart b/frontend/appflowy_flutter/lib/mobile/presentation/page_item/mobile_view_item.dart
index 8db1db3114..69f0abe9ff 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/page_item/mobile_view_item.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/page_item/mobile_view_item.dart
@@ -1,7 +1,6 @@
import 'dart:io';
import 'package:appflowy/generated/flowy_svgs.g.dart';
-import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/mobile/application/mobile_router.dart';
import 'package:appflowy/workspace/application/sidebar/folder/folder_bloc.dart';
import 'package:appflowy/workspace/application/view/view_bloc.dart';
@@ -9,7 +8,6 @@ import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy/workspace/presentation/home/home_sizes.dart';
import 'package:appflowy/workspace/presentation/home/menu/view/draggable_view_item.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
-import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -262,9 +260,7 @@ class _SingleMobileInnerViewItemState extends State<SingleMobileInnerViewItem> {
// title
Expanded(
child: FlowyText.regular(
- widget.view.name.isEmpty
- ? LocaleKeys.menuAppHeader_defaultNewPageName.tr()
- : widget.view.name,
+ widget.view.nameOrDefault,
fontSize: 16.0,
figmaLineHeight: 20.0,
overflow: TextOverflow.ellipsis,
diff --git a/frontend/appflowy_flutter/lib/plugins/document/document_page.dart b/frontend/appflowy_flutter/lib/plugins/document/document_page.dart
index aa73148fc8..a154e7a011 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/document_page.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/document_page.dart
@@ -14,6 +14,7 @@ import 'package:appflowy/startup/startup.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/view/prelude.dart';
+import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
@@ -172,7 +173,7 @@ class _DocumentPageState extends State<DocumentPage>
Widget buildBanner(BuildContext context) {
return DocumentBanner(
- viewName: widget.view.name,
+ viewName: widget.view.nameOrDefault,
onRestore: () =>
context.read<DocumentBloc>().add(const DocumentEvent.restorePage()),
onDelete: () => context
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/insert_page_command.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/insert_page_command.dart
index 9bcd0e18b8..ff529029f4 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/insert_page_command.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/insert_page_command.dart
@@ -2,6 +2,7 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/database/domain/database_view_service.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mention_block.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/plugins.dart';
+import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy/workspace/application/view/view_service.dart';
import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
@@ -98,7 +99,7 @@ extension InsertDatabase on EditorState {
final prefix = _referencedDatabasePrefix(view.layout);
final ref = await ViewBackendService.createDatabaseLinkedView(
parentViewId: view.id,
- name: "$prefix ${view.name}",
+ name: "$prefix ${view.nameOrDefault}",
layoutType: view.layout,
databaseId: databaseId,
).then((value) => value.toNullable());
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/sub_page/sub_page_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/sub_page/sub_page_block_component.dart
index fec677146a..21fa965125 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/sub_page/sub_page_block_component.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/sub_page/sub_page_block_component.dart
@@ -256,10 +256,7 @@ class SubPageBlockComponentState extends State<SubPageBlockComponent>
const HSpace(10),
Flexible(
child: FlowyText(
- view.name.trim().isEmpty
- ? LocaleKeys.menuAppHeader_defaultNewPageName
- .tr()
- : view.name,
+ view.nameOrDefault,
fontSize: textStyle.fontSize,
fontWeight: textStyle.fontWeight,
lineHeight: textStyle.height,
diff --git a/frontend/appflowy_flutter/lib/plugins/inline_actions/handlers/inline_page_reference.dart b/frontend/appflowy_flutter/lib/plugins/inline_actions/handlers/inline_page_reference.dart
index 7d20ac32a4..130509d644 100644
--- a/frontend/appflowy_flutter/lib/plugins/inline_actions/handlers/inline_page_reference.dart
+++ b/frontend/appflowy_flutter/lib/plugins/inline_actions/handlers/inline_page_reference.dart
@@ -125,7 +125,15 @@ class InlinePageReferenceService extends InlineActionsDelegate {
items = allViews
.where(
- (view) => view.name.toLowerCase().contains(search.toLowerCase()),
+ (view) =>
+ view.id != currentViewId &&
+ view.name.toLowerCase().contains(search.toLowerCase()) ||
+ (view.name.isEmpty && search.isEmpty) ||
+ (view.name.isEmpty &&
+ LocaleKeys.menuAppHeader_defaultNewPageName
+ .tr()
+ .toLowerCase()
+ .contains(search.toLowerCase())),
)
.take(limitResults)
.map((view) => _fromView(view))
@@ -224,8 +232,8 @@ class InlinePageReferenceService extends InlineActionsDelegate {
}
InlineActionsMenuItem _fromView(ViewPB view) => InlineActionsMenuItem(
- keywords: [view.name.toLowerCase()],
- label: view.name,
+ keywords: [view.nameOrDefault.toLowerCase()],
+ label: view.nameOrDefault,
icon: (onSelected) => view.icon.value.isNotEmpty
? FlowyText.emoji(
view.icon.value,
diff --git a/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart b/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart
index 4d02811063..ebaca4e607 100644
--- a/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart
@@ -53,6 +53,9 @@ class ViewExtKeys {
}
extension ViewExtension on ViewPB {
+ String get nameOrDefault =>
+ name.isEmpty ? LocaleKeys.menuAppHeader_defaultNewPageName.tr() : name;
+
Widget defaultIcon({Size? size}) => FlowySvg(
switch (layout) {
ViewLayoutPB.Board => FlowySvgs.icon_board_s,
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/recent_view_tile.dart b/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/recent_view_tile.dart
index 7ac439dcba..c4bc5aa845 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/recent_view_tile.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/recent_view_tile.dart
@@ -1,3 +1,4 @@
+import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:flutter/material.dart';
import 'package:appflowy/startup/startup.dart';
@@ -27,7 +28,7 @@ class RecentViewTile extends StatelessWidget {
children: [
icon,
const HSpace(6),
- FlowyText(view.name),
+ FlowyText(view.nameOrDefault),
],
),
focusColor: Theme.of(context).colorScheme.primary.withOpacity(0.1),
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart
index 36e7e1de99..fb8b611f9e 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart
@@ -509,9 +509,7 @@ class _SingleInnerViewItemState extends State<SingleInnerViewItem> {
Widget _buildViewItem(bool onHover, [bool isSelected = false]) {
final name = FlowyText.regular(
- widget.view.name.isEmpty
- ? LocaleKeys.menuAppHeader_defaultNewPageName.tr()
- : widget.view.name,
+ widget.view.nameOrDefault,
overflow: TextOverflow.ellipsis,
fontSize: 14.0,
figmaLineHeight: 18.0,
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/more_view_actions/widgets/common_view_action.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/more_view_actions/widgets/common_view_action.dart
index c32c1d1872..5d0cf62f73 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/more_view_actions/widgets/common_view_action.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/more_view_actions/widgets/common_view_action.dart
@@ -1,6 +1,7 @@
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/workspace/application/sidebar/folder/folder_bloc.dart';
import 'package:appflowy/workspace/application/view/view_bloc.dart';
+import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy/workspace/application/view/view_service.dart';
import 'package:appflowy/workspace/presentation/home/menu/view/view_action_type.dart';
import 'package:appflowy/workspace/presentation/home/menu/view/view_item.dart';
@@ -57,7 +58,7 @@ class ViewAction extends StatelessWidget {
if (containPublishedPage && context.mounted) {
await showConfirmDeletionDialog(
context: context,
- name: view.name,
+ name: view.nameOrDefault,
description: LocaleKeys.publish_containsPublishedPage.tr(),
onConfirm: () {
context.read<ViewBloc>().add(const ViewEvent.delete());
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/tab_bar_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/tab_bar_item.dart
index cef51258ff..b12d4f1e05 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/tab_bar_item.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/tab_bar_item.dart
@@ -1,3 +1,4 @@
+import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:flutter/material.dart';
import 'package:appflowy/workspace/application/view/view_listener.dart';
@@ -38,5 +39,5 @@ class _ViewTabBarItemState extends State<ViewTabBarItem> {
}
@override
- Widget build(BuildContext context) => FlowyText.medium(view.name);
+ Widget build(BuildContext context) => FlowyText.medium(view.nameOrDefault);
}