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.

feat(flutter_desktop): colored column names in kanban board (#6270)

Richard Shiueeea3004a9701
diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/application/board_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/board/application/board_bloc.dart
index e35bd3497b..3f4753c760 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/board/application/board_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/board/application/board_bloc.dart
@@ -143,6 +143,13 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
final result = await groupBackendSvc.deleteGroup(groupId: groupId);
result.fold((_) {}, (err) => Log.error(err));
},
+ renameGroup: (groupId, name) async {
+ final result = await groupBackendSvc.updateGroup(
+ groupId: groupId,
+ name: name,
+ );
+ result.fold((_) {}, (err) => Log.error(err));
+ },
didReceiveError: (error) {
emit(BoardState.error(error: error));
},
@@ -207,7 +214,6 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
final currentName = group.generateGroupName(databaseController);
if (currentName != groupName) {
await groupBackendSvc.updateGroup(
- fieldId: groupControllers.values.first.group.fieldId,
groupId: groupId,
name: groupName,
);
@@ -282,7 +288,6 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
);
} else {
await groupBackendSvc.updateGroup(
- fieldId: groupControllers.values.first.group.fieldId,
groupId: group.groupId,
visible: isVisible,
);
@@ -550,6 +555,8 @@ class BoardEvent with _$BoardEvent {
) = _SetGroupVisibility;
const factory BoardEvent.toggleHiddenSectionVisibility(bool isVisible) =
_ToggleHiddenSectionVisibility;
+ const factory BoardEvent.renameGroup(String groupId, String name) =
+ _RenameGroup;
const factory BoardEvent.deleteGroup(String groupId) = _DeleteGroup;
const factory BoardEvent.reorderGroup(String fromGroupId, String toGroupId) =
_ReorderGroup;
@@ -718,7 +725,7 @@ class GroupControllerDelegateImpl extends GroupControllerDelegate {
}
class GroupData {
- GroupData({
+ const GroupData({
required this.group,
required this.fieldInfo,
});
diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/application/column_header_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/board/application/column_header_bloc.dart
deleted file mode 100644
index dcb1578930..0000000000
--- a/frontend/appflowy_flutter/lib/plugins/database/board/application/column_header_bloc.dart
+++ /dev/null
@@ -1,113 +0,0 @@
-import 'package:appflowy/plugins/database/board/group_ext.dart';
-import 'package:appflowy/plugins/database/domain/group_service.dart';
-import 'package:appflowy_backend/protobuf/flowy-database2/group.pb.dart';
-import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
-
-import '../../application/database_controller.dart';
-import '../../application/field/field_controller.dart';
-
-part 'column_header_bloc.freezed.dart';
-
-class ColumnHeaderBloc extends Bloc<ColumnHeaderEvent, ColumnHeaderState> {
- ColumnHeaderBloc({
- required this.databaseController,
- required this.fieldId,
- required this.group,
- }) : super(const ColumnHeaderState.loading()) {
- groupBackendSvc = GroupBackendService(viewId);
- _dispatch();
- }
-
- final DatabaseController databaseController;
- final String fieldId;
- final GroupPB group;
-
- late final GroupBackendService groupBackendSvc;
-
- FieldController get fieldController => databaseController.fieldController;
- String get viewId => databaseController.viewId;
-
- void _dispatch() {
- on<ColumnHeaderEvent>(
- (event, emit) async {
- await event.when(
- initial: () {
- final name = group.generateGroupName(databaseController);
- emit(ColumnHeaderState.initial(name));
- },
- startEditing: () async {
- state.maybeMap(
- ready: (state) => emit(state.copyWith(isEditing: true)),
- orElse: () {},
- );
- },
- endEditing: (String? groupName) async {
- if (groupName != null) {
- final stateGroupName = state.maybeMap(
- ready: (state) => state.groupName,
- orElse: () => null,
- );
-
- if (stateGroupName == null || stateGroupName == groupName) {
- state.maybeMap(
- ready: (state) => emit(
- state.copyWith(
- groupName: stateGroupName!,
- isEditing: false,
- ),
- ),
- orElse: () {},
- );
- }
-
- await groupBackendSvc.renameGroup(
- groupId: group.groupId,
- fieldId: fieldId,
- name: groupName,
- );
- state.maybeMap(
- ready: (state) {
- emit(state.copyWith(groupName: groupName, isEditing: false));
- },
- orElse: () {},
- );
- }
- },
- );
- },
- );
- }
-}
-
-@freezed
-class ColumnHeaderEvent with _$ColumnHeaderEvent {
- const factory ColumnHeaderEvent.initial() = _Initial;
- const factory ColumnHeaderEvent.startEditing() = _StartEditing;
- const factory ColumnHeaderEvent.endEditing(String? groupName) = _EndEditing;
-}
-
-@freezed
-class ColumnHeaderState with _$ColumnHeaderState {
- const ColumnHeaderState._();
-
- const factory ColumnHeaderState.loading() = _ColumnHeaderLoadingState;
-
- const factory ColumnHeaderState.error({
- required FlowyError error,
- }) = _ColumnHeaderErrorState;
-
- const factory ColumnHeaderState.ready({
- required String groupName,
- @Default(false) bool isEditing,
- @Default(false) bool canEdit,
- }) = _ColumnHeaderReadyState;
-
- factory ColumnHeaderState.initial(String name) =>
- ColumnHeaderState.ready(groupName: name);
-
- bool get isLoading => maybeMap(loading: (_) => true, orElse: () => false);
- bool get isError => maybeMap(error: (_) => true, orElse: () => false);
- bool get isReady => maybeMap(ready: (_) => true, orElse: () => false);
-}
diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart
index 1861d771d5..db5c284dda 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/board_page.dart
@@ -6,7 +6,6 @@ import 'package:appflowy/mobile/presentation/database/board/mobile_board_page.da
import 'package:appflowy/plugins/database/application/database_controller.dart';
import 'package:appflowy/plugins/database/application/row/row_controller.dart';
import 'package:appflowy/plugins/database/board/application/board_actions_bloc.dart';
-import 'package:appflowy/plugins/database/board/application/column_header_bloc.dart';
import 'package:appflowy/plugins/database/board/presentation/widgets/board_column_header.dart';
import 'package:appflowy/plugins/database/grid/presentation/grid_page.dart';
import 'package:appflowy/plugins/database/grid/presentation/widgets/header/field_type_extension.dart';
@@ -341,23 +340,10 @@ class _BoardContentState extends State<_BoardContent> {
false
? BoardTrailing(scrollController: scrollController)
: const HSpace(40),
- headerBuilder: (_, groupData) => MultiBlocProvider(
- providers: [
- BlocProvider<BoardBloc>.value(
- value: context.read<BoardBloc>(),
- ),
- BlocProvider<ColumnHeaderBloc>(
- create: (context) => ColumnHeaderBloc(
- databaseController: databaseController,
- fieldId: (groupData.customData as GroupData).fieldInfo.id,
- group: context
- .read<BoardBloc>()
- .groupControllers[groupData.headerData.groupId]!
- .group,
- )..add(const ColumnHeaderEvent.initial()),
- ),
- ],
+ headerBuilder: (_, groupData) => BlocProvider.value(
+ value: context.read<BoardBloc>(),
child: BoardColumnHeader(
+ databaseController: databaseController,
groupData: groupData,
margin: config.groupHeaderPadding,
),
diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_checkbox_column_header.dart b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_checkbox_column_header.dart
new file mode 100644
index 0000000000..a30769c45c
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_checkbox_column_header.dart
@@ -0,0 +1,51 @@
+import 'package:appflowy/generated/flowy_svgs.g.dart';
+import 'package:appflowy/plugins/database/application/database_controller.dart';
+import 'package:appflowy/plugins/database/board/application/board_bloc.dart';
+import 'package:appflowy/plugins/database/board/group_ext.dart';
+import 'package:appflowy_board/appflowy_board.dart';
+import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/material.dart';
+
+import 'board_column_header.dart';
+
+class CheckboxColumnHeader extends StatelessWidget {
+ const CheckboxColumnHeader({
+ super.key,
+ required this.databaseController,
+ required this.groupData,
+ });
+
+ final DatabaseController databaseController;
+ final AppFlowyGroupData groupData;
+
+ @override
+ Widget build(BuildContext context) {
+ final customData = groupData.customData as GroupData;
+ return Row(
+ children: [
+ FlowySvg(
+ customData.asCheckboxGroup()!.isCheck
+ ? FlowySvgs.check_filled_s
+ : FlowySvgs.uncheck_s,
+ blendMode: BlendMode.dst,
+ size: const Size.square(18),
+ ),
+ const HSpace(6),
+ Expanded(
+ child: FlowyText.medium(
+ customData.group.generateGroupName(databaseController),
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+ const HSpace(6),
+ GroupOptionsButton(
+ groupData: groupData,
+ ),
+ const HSpace(4),
+ CreateCardFromTopButton(
+ groupId: groupData.id,
+ ),
+ ],
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_column_header.dart b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_column_header.dart
index 44664e70ee..61088b1d99 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_column_header.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_column_header.dart
@@ -1,10 +1,8 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/plugins/database/application/database_controller.dart';
import 'package:appflowy/plugins/database/board/application/board_bloc.dart';
-import 'package:appflowy/plugins/database/board/application/column_header_bloc.dart';
+import 'package:appflowy/plugins/database/board/group_ext.dart';
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
import 'package:appflowy/plugins/database/grid/presentation/widgets/header/field_type_extension.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
@@ -13,15 +11,21 @@ import 'package:appflowy_board/appflowy_board.dart';
import 'package:appflowy_popover/appflowy_popover.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';
+import 'board_checkbox_column_header.dart';
+import 'board_editable_column_header.dart';
+
class BoardColumnHeader extends StatefulWidget {
const BoardColumnHeader({
super.key,
+ required this.databaseController,
required this.groupData,
required this.margin,
});
+ final DatabaseController databaseController;
final AppFlowyGroupData groupData;
final EdgeInsets margin;
@@ -30,190 +34,61 @@ class BoardColumnHeader extends StatefulWidget {
}
class _BoardColumnHeaderState extends State<BoardColumnHeader> {
- final FocusNode _focusNode = FocusNode();
- final FocusNode _keyboardListenerFocusNode = FocusNode();
-
- late final TextEditingController _controller =
- TextEditingController.fromValue(
- TextEditingValue(
- selection: TextSelection.collapsed(
- offset: widget.groupData.headerData.groupName.length,
- ),
- text: widget.groupData.headerData.groupName,
- ),
- );
+ final ValueNotifier<bool> isEditing = ValueNotifier(false);
- @override
- void initState() {
- super.initState();
- _focusNode.addListener(() {
- if (!_focusNode.hasFocus) {
- _saveEdit();
- }
- });
- }
+ GroupData get customData => widget.groupData.customData;
@override
void dispose() {
- _focusNode.dispose();
- _keyboardListenerFocusNode.dispose();
- _controller.dispose();
+ isEditing.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
- final boardCustomData = widget.groupData.customData as GroupData;
-
- return BlocBuilder<ColumnHeaderBloc, ColumnHeaderState>(
- builder: (context, state) {
- return state.maybeMap(
- orElse: () => const SizedBox.shrink(),
- ready: (state) {
- if (state.isEditing) {
- WidgetsBinding.instance.addPostFrameCallback((_) {
- _focusNode.requestFocus();
- });
- }
-
- Widget title = Expanded(
- child: FlowyText.medium(
- state.groupName,
- overflow: TextOverflow.ellipsis,
- ),
- );
-
- if (!boardCustomData.group.isDefault &&
- boardCustomData.fieldType.canEditHeader) {
- title = Flexible(
- fit: FlexFit.tight,
- child: FlowyTooltip(
- message: LocaleKeys.board_column_renameGroupTooltip.tr(),
- child: MouseRegion(
- cursor: SystemMouseCursors.click,
- child: GestureDetector(
- onTap: () => context
- .read<ColumnHeaderBloc>()
- .add(const ColumnHeaderEvent.startEditing()),
- child: FlowyText.medium(
- state.groupName,
- overflow: TextOverflow.ellipsis,
- ),
- ),
- ),
- ),
- );
- }
-
- if (state.isEditing) {
- title = _buildTextField(context);
- }
-
- return Padding(
- padding: widget.margin,
- child: SizedBox(
- height: 50,
- child: Row(
- children: [
- _buildHeaderIcon(boardCustomData),
- title,
- const HSpace(6),
- _groupOptionsButton(context),
- const HSpace(4),
- FlowyTooltip(
- message:
- LocaleKeys.board_column_addToColumnTopTooltip.tr(),
- preferBelow: false,
- child: FlowyIconButton(
- width: 20,
- icon: const FlowySvg(FlowySvgs.add_s),
- iconColorOnHover:
- Theme.of(context).colorScheme.onSurface,
- onPressed: () => context.read<BoardBloc>().add(
- BoardEvent.createRow(
- widget.groupData.id,
- OrderObjectPositionTypePB.Start,
- null,
- null,
- ),
- ),
- ),
- ),
- ],
- ),
- ),
- );
+ final Widget child = switch (customData.fieldType) {
+ FieldType.MultiSelect ||
+ FieldType.SingleSelect when !customData.group.isDefault =>
+ EditableColumnHeader(
+ databaseController: widget.databaseController,
+ groupData: widget.groupData,
+ isEditing: isEditing,
+ onSubmitted: (columnName) {
+ context
+ .read<BoardBloc>()
+ .add(BoardEvent.renameGroup(widget.groupData.id, columnName));
},
- );
- },
- );
- }
-
- Widget _buildTextField(BuildContext context) {
- return Expanded(
- child: KeyboardListener(
- focusNode: _keyboardListenerFocusNode,
- onKeyEvent: (event) {
- if ([LogicalKeyboardKey.enter, LogicalKeyboardKey.escape]
- .contains(event.logicalKey)) {
- _saveEdit();
- }
- },
- child: TextField(
- controller: _controller,
- focusNode: _focusNode,
- onEditingComplete: _saveEdit,
- style: Theme.of(context).textTheme.bodyMedium!.copyWith(fontSize: 14),
- decoration: InputDecoration(
- filled: true,
- fillColor: Theme.of(context).colorScheme.surface,
- hoverColor: Colors.transparent,
- contentPadding:
- const EdgeInsets.symmetric(vertical: 12, horizontal: 8),
- focusedBorder: OutlineInputBorder(
- borderSide: BorderSide(
- color: Theme.of(context).colorScheme.primary,
- ),
- ),
- enabledBorder: OutlineInputBorder(
- borderSide: BorderSide(
- color: Theme.of(context).colorScheme.primary,
- ),
- ),
- border: OutlineInputBorder(
- borderSide: BorderSide(
- color: Theme.of(context).colorScheme.primary,
- ),
- ),
- isDense: true,
- ),
),
- ),
+ FieldType.Checkbox => CheckboxColumnHeader(
+ databaseController: widget.databaseController,
+ groupData: widget.groupData,
+ ),
+ _ => _DefaultColumnHeaderContent(
+ databaseController: widget.databaseController,
+ groupData: widget.groupData,
+ ),
+ };
+
+ return Container(
+ padding: widget.margin,
+ height: 50,
+ child: child,
);
}
+}
- void _saveEdit() {
- context
- .read<ColumnHeaderBloc>()
- .add(ColumnHeaderEvent.endEditing(_controller.text));
- }
+class GroupOptionsButton extends StatelessWidget {
+ const GroupOptionsButton({
+ super.key,
+ required this.groupData,
+ this.isEditing,
+ });
- Widget _buildHeaderIcon(GroupData customData) =>
- switch (customData.fieldType) {
- FieldType.Checkbox => Padding(
- padding: const EdgeInsets.only(right: 6),
- child: FlowySvg(
- customData.asCheckboxGroup()!.isCheck
- ? FlowySvgs.check_filled_s
- : FlowySvgs.uncheck_s,
- blendMode: BlendMode.dst,
- size: const Size.square(18),
- ),
- ),
- _ => const SizedBox.shrink(),
- };
+ final AppFlowyGroupData groupData;
+ final ValueNotifier<bool>? isEditing;
- Widget _groupOptionsButton(BuildContext context) {
+ @override
+ Widget build(BuildContext context) {
return AppFlowyPopover(
clickHandler: PopoverClickHandler.gestureDetector,
margin: const EdgeInsets.all(8),
@@ -225,14 +100,14 @@ class _BoardColumnHeaderState extends State<BoardColumnHeader> {
iconColorOnHover: Theme.of(context).colorScheme.onSurface,
),
popupBuilder: (popoverContext) {
- final customGroupData = widget.groupData.customData as GroupData;
+ final customGroupData = groupData.customData as GroupData;
final isDefault = customGroupData.group.isDefault;
- final menuItems = GroupOptions.values.toList();
+ final menuItems = GroupOption.values.toList();
if (!customGroupData.fieldType.canEditHeader || isDefault) {
- menuItems.remove(GroupOptions.rename);
+ menuItems.remove(GroupOption.rename);
}
if (!customGroupData.fieldType.canDeleteGroup || isDefault) {
- menuItems.remove(GroupOptions.delete);
+ menuItems.remove(GroupOption.delete);
}
return SeparatedColumn(
mainAxisSize: MainAxisSize.min,
@@ -249,7 +124,7 @@ class _BoardColumnHeaderState extends State<BoardColumnHeader> {
overflow: TextOverflow.ellipsis,
),
onTap: () {
- action.call(context, customGroupData.group);
+ run(context, action, customGroupData.group);
PopoverContainer.of(popoverContext).close();
},
),
@@ -260,37 +135,100 @@ class _BoardColumnHeaderState extends State<BoardColumnHeader> {
},
);
}
-}
-
-enum GroupOptions {
- rename,
- hide,
- delete;
- void call(BuildContext context, GroupPB group) {
- switch (this) {
- case rename:
- context
- .read<ColumnHeaderBloc>()
- .add(const ColumnHeaderEvent.startEditing());
+ void run(BuildContext context, GroupOption option, GroupPB group) {
+ switch (option) {
+ case GroupOption.rename:
+ isEditing?.value = true;
break;
- case hide:
+ case GroupOption.hide:
context
.read<BoardBloc>()
.add(BoardEvent.setGroupVisibility(group, false));
break;
- case delete:
- NavigatorAlertDialog(
- title: LocaleKeys.board_column_deleteColumnConfirmation.tr(),
- confirm: () {
+ case GroupOption.delete:
+ showConfirmDeletionDialog(
+ context: context,
+ name: LocaleKeys.board_column_label.tr(),
+ description: LocaleKeys.board_column_deleteColumnConfirmation.tr(),
+ onConfirm: () {
context
.read<BoardBloc>()
.add(BoardEvent.deleteGroup(group.groupId));
},
- ).show(context);
+ );
break;
}
}
+}
+
+class CreateCardFromTopButton extends StatelessWidget {
+ const CreateCardFromTopButton({
+ super.key,
+ required this.groupId,
+ });
+
+ final String groupId;
+
+ @override
+ Widget build(BuildContext context) {
+ return FlowyTooltip(
+ message: LocaleKeys.board_column_addToColumnTopTooltip.tr(),
+ preferBelow: false,
+ child: FlowyIconButton(
+ width: 20,
+ icon: const FlowySvg(FlowySvgs.add_s),
+ iconColorOnHover: Theme.of(context).colorScheme.onSurface,
+ onPressed: () => context.read<BoardBloc>().add(
+ BoardEvent.createRow(
+ groupId,
+ OrderObjectPositionTypePB.Start,
+ null,
+ null,
+ ),
+ ),
+ ),
+ );
+ }
+}
+
+class _DefaultColumnHeaderContent extends StatelessWidget {
+ const _DefaultColumnHeaderContent({
+ required this.databaseController,
+ required this.groupData,
+ });
+
+ final DatabaseController databaseController;
+ final AppFlowyGroupData groupData;
+
+ @override
+ Widget build(BuildContext context) {
+ final customData = groupData.customData as GroupData;
+ return Row(
+ children: [
+ Expanded(
+ child: FlowyText.medium(
+ customData.group.generateGroupName(databaseController),
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+ const HSpace(6),
+ GroupOptionsButton(
+ groupData: groupData,
+ ),
+ const HSpace(4),
+ CreateCardFromTopButton(
+ groupId: groupData.id,
+ ),
+ ],
+ );
+ }
+}
+
+enum GroupOption {
+ rename,
+ hide,
+ delete;
FlowySvgData get icon => switch (this) {
rename => FlowySvgs.edit_s,
diff --git a/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_editable_column_header.dart b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_editable_column_header.dart
new file mode 100644
index 0000000000..46b73464a1
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/plugins/database/board/presentation/widgets/board_editable_column_header.dart
@@ -0,0 +1,256 @@
+import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/plugins/database/application/database_controller.dart';
+import 'package:appflowy/plugins/database/application/field/type_option/type_option_data_parser.dart';
+import 'package:appflowy/plugins/database/board/application/board_bloc.dart';
+import 'package:appflowy/plugins/database/board/group_ext.dart';
+import 'package:appflowy/plugins/database/widgets/cell_editor/extension.dart';
+import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
+import 'package:appflowy_board/appflowy_board.dart';
+import 'package:collection/collection.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/services.dart';
+
+import 'board_column_header.dart';
+
+/// This column header is used for the MultiSelect and SingleSelect field types.
+class EditableColumnHeader extends StatefulWidget {
+ const EditableColumnHeader({
+ super.key,
+ required this.databaseController,
+ required this.groupData,
+ required this.isEditing,
+ required this.onSubmitted,
+ });
+
+ final DatabaseController databaseController;
+ final AppFlowyGroupData groupData;
+ final ValueNotifier<bool> isEditing;
+ final void Function(String columnName) onSubmitted;
+
+ @override
+ State<EditableColumnHeader> createState() => _EditableColumnHeaderState();
+}
+
+class _EditableColumnHeaderState extends State<EditableColumnHeader> {
+ late final FocusNode focusNode;
+ late final TextEditingController textController = TextEditingController(
+ text: _generateGroupName(),
+ );
+
+ GroupData get customData => widget.groupData.customData;
+
+ @override
+ void initState() {
+ super.initState();
+ focusNode = FocusNode(
+ onKeyEvent: (node, event) {
+ if (event.logicalKey == LogicalKeyboardKey.escape &&
+ event is KeyUpEvent) {
+ focusNode.unfocus();
+ return KeyEventResult.handled;
+ }
+ return KeyEventResult.ignored;
+ },
+ )..addListener(() {
+ if (!focusNode.hasFocus) {
+ widget.isEditing.value = false;
+ widget.onSubmitted(textController.text);
+ } else {
+ textController.selection = TextSelection(
+ baseOffset: 0,
+ extentOffset: textController.text.length,
+ );
+ }
+ });
+ }
+
+ @override
+ void didUpdateWidget(covariant oldWidget) {
+ if (oldWidget.groupData.customData != widget.groupData.customData) {
+ textController.text = _generateGroupName();
+ }
+ super.didUpdateWidget(oldWidget);
+ }
+
+ @override
+ void dispose() {
+ focusNode.dispose();
+ textController.dispose();
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Row(
+ children: [
+ Expanded(
+ child: ValueListenableBuilder(
+ valueListenable: widget.isEditing,
+ builder: (context, isEditing, _) {
+ if (isEditing) {
+ focusNode.requestFocus();
+ }
+ return isEditing ? _buildTextField() : _buildTitle();
+ },
+ ),
+ ),
+ const HSpace(6),
+ GroupOptionsButton(
+ groupData: widget.groupData,
+ isEditing: widget.isEditing,
+ ),
+ const HSpace(4),
+ CreateCardFromTopButton(
+ groupId: widget.groupData.id,
+ ),
+ ],
+ );
+ }
+
+ Widget _buildTitle() {
+ final (backgroundColor, dotColor) = _generateGroupColor();
+ return FlowyTooltip(
+ message: LocaleKeys.board_column_renameGroupTooltip.tr(),
+ child: MouseRegion(
+ cursor: SystemMouseCursors.click,
+ child: GestureDetector(
+ behavior: HitTestBehavior.opaque,
+ onTap: () {
+ widget.isEditing.value = true;
+ },
+ child: Align(
+ alignment: AlignmentDirectional.centerStart,
+ child: Container(
+ height: 20,
+ padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 1),
+ decoration: BoxDecoration(
+ color: backgroundColor,
+ borderRadius: BorderRadius.circular(6),
+ ),
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Center(
+ child: Container(
+ height: 6,
+ width: 6,
+ decoration: BoxDecoration(
+ color: dotColor,
+ borderRadius: BorderRadius.circular(3),
+ ),
+ ),
+ ),
+ const HSpace(4.0),
+ FlowyText.medium(
+ _generateGroupName(),
+ overflow: TextOverflow.ellipsis,
+ ),
+ ],
+ ),
+ ),
+ ),
+ ),
+ ),
+ );
+ }
+
+ Widget _buildTextField() {
+ return TextField(
+ controller: textController,
+ focusNode: focusNode,
+ onEditingComplete: () {
+ widget.isEditing.value = false;
+ },
+ onSubmitted: widget.onSubmitted,
+ style: Theme.of(context).textTheme.bodyMedium,
+ decoration: InputDecoration(
+ filled: true,
+ fillColor: Theme.of(context).colorScheme.surface,
+ hoverColor: Colors.transparent,
+ contentPadding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8),
+ focusedBorder: OutlineInputBorder(
+ borderSide: BorderSide(
+ color: Theme.of(context).colorScheme.primary,
+ ),
+ ),
+ enabledBorder: OutlineInputBorder(
+ borderSide: BorderSide(
+ color: Theme.of(context).colorScheme.primary,
+ ),
+ ),
+ border: OutlineInputBorder(
+ borderSide: BorderSide(
+ color: Theme.of(context).colorScheme.primary,
+ ),
+ ),
+ isDense: true,
+ ),
+ );
+ }
+
+ String _generateGroupName() {
+ return customData.group.generateGroupName(widget.databaseController);
+ }
+
+ (Color? backgroundColor, Color? dotColor) _generateGroupColor() {
+ Color? backgroundColor;
+ Color? dotColor;
+
+ final groupId = widget.groupData.id;
+ final fieldId = customData.fieldInfo.id;
+ final field = widget.databaseController.fieldController.getField(fieldId);
+ if (field != null) {
+ final selectOptions = switch (field.fieldType) {
+ FieldType.MultiSelect => MultiSelectTypeOptionDataParser()
+ .fromBuffer(field.field.typeOptionData)
+ .options,
+ FieldType.SingleSelect => SingleSelectTypeOptionDataParser()
+ .fromBuffer(field.field.typeOptionData)
+ .options,
+ _ => <SelectOptionPB>[],
+ };
+
+ final colorPB =
+ selectOptions.firstWhereOrNull((e) => e.id == groupId)?.color;
+
+ if (colorPB != null) {
+ backgroundColor = colorPB.toColor(context);
+ dotColor = getColorOfDot(colorPB);
+ }
+ }
+
+ return (backgroundColor, dotColor);
+ }
+
+ // move to theme file and allow theme customization once palette is finalized
+ Color getColorOfDot(SelectOptionColorPB color) {
+ return switch (Theme.of(context).brightness) {
+ Brightness.light => switch (color) {
+ SelectOptionColorPB.Purple => const Color(0xFFAB8DFF),
+ SelectOptionColorPB.Pink => const Color(0xFFFF8EF5),
+ SelectOptionColorPB.LightPink => const Color(0xFFFF85A9),
+ SelectOptionColorPB.Orange => const Color(0xFFFFBC7E),
+ SelectOptionColorPB.Yellow => const Color(0xFFFCD86F),
+ SelectOptionColorPB.Lime => const Color(0xFFC6EC41),
+ SelectOptionColorPB.Green => const Color(0xFF74F37D),
+ SelectOptionColorPB.Aqua => const Color(0xFF40F0D1),
+ SelectOptionColorPB.Blue => const Color(0xFF00C8FF),
+ _ => throw ArgumentError,
+ },
+ Brightness.dark => switch (color) {
+ SelectOptionColorPB.Purple => const Color(0xFF502FD6),
+ SelectOptionColorPB.Pink => const Color(0xFFBF1CC0),
+ SelectOptionColorPB.LightPink => const Color(0xFFC42A53),
+ SelectOptionColorPB.Orange => const Color(0xFFD77922),
+ SelectOptionColorPB.Yellow => const Color(0xFFC59A1A),
+ SelectOptionColorPB.Lime => const Color(0xFFA4C824),
+ SelectOptionColorPB.Green => const Color(0xFF23CA2E),
+ SelectOptionColorPB.Aqua => const Color(0xFF19CCAC),
+ SelectOptionColorPB.Blue => const Color(0xFF04A9D7),
+ _ => throw ArgumentError,
+ }
+ };
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/plugins/database/domain/group_service.dart b/frontend/appflowy_flutter/lib/plugins/database/domain/group_service.dart
index 36bb847356..f7a9be4a9c 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/domain/group_service.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/domain/group_service.dart
@@ -22,12 +22,10 @@ class GroupBackendService {
Future<FlowyResult<void, FlowyError>> updateGroup({
required String groupId,
- required String fieldId,
String? name,
bool? visible,
}) {
final payload = UpdateGroupPB.create()
- ..fieldId = fieldId
..viewId = viewId
..groupId = groupId;
@@ -60,18 +58,4 @@ class GroupBackendService {
return DatabaseEventDeleteGroup(payload).send();
}
-
- Future<FlowyResult<void, FlowyError>> renameGroup({
- required String groupId,
- required String fieldId,
- required String name,
- }) {
- final payload = RenameGroupPB.create()
- ..fieldId = fieldId
- ..viewId = viewId
- ..groupId = groupId
- ..name = name;
-
- return DatabaseEventRenameGroup(payload).send();
- }
}
diff --git a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/default_colorscheme.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/default_colorscheme.dart
index a58e257c22..20d953de47 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/default_colorscheme.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/default_colorscheme.dart
@@ -103,15 +103,15 @@ class DefaultColorScheme extends FlowyColorScheme {
bg2: const Color(0xFFEDEEF2),
bg3: ColorSchemeConstants.darkMain1,
bg4: const Color(0xFF2C144B),
- tint1: const Color(0x4d9327FF),
- tint2: const Color(0x66FC0088),
- tint3: const Color(0x4dFC00E2),
- tint4: const Color(0x80BE5B00),
- tint5: const Color(0x33F8EE00),
- tint6: const Color(0x4d6DC300),
- tint7: const Color(0x5900BD2A),
- tint8: const Color(0x80008890),
- tint9: const Color(0x4d0029FF),
+ tint1: const Color(0x4D502FD6),
+ tint2: const Color(0x4DBF1CC0),
+ tint3: const Color(0x4DC42A53),
+ tint4: const Color(0x4DD77922),
+ tint5: const Color(0x4DC59A1A),
+ tint6: const Color(0x4DA4C824),
+ tint7: const Color(0x4D23CA2E),
+ tint8: const Color(0x4D19CCAC),
+ tint9: const Color(0x4D04A9D7),
main1: ColorSchemeConstants.darkMain2,
main2: const Color(0xFF00B7EA),
shadow: const Color(0xFF0F131C),
diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.json
index 975e362ac4..46fe8a32af 100644
--- a/frontend/resources/translations/en.json
+++ b/frontend/resources/translations/en.json
@@ -1829,6 +1829,7 @@
},
"board": {
"column": {
+ "label": "Column",
"createNewCard": "New",
"renameGroupTooltip": "Press to rename group",
"createNewColumn": "Add a new group",
@@ -1838,7 +1839,7 @@
"hideColumn": "Hide",
"newGroup": "New group",
"deleteColumn": "Delete",
- "deleteColumnConfirmation": "This will delete this group and all the cards in it.\nAre you sure you want to continue?"
+ "deleteColumnConfirmation": "This will delete this group and all the cards in it. Are you sure you want to continue?"
},
"hiddenGroupSection": {
"sectionTitle": "Hidden Groups",
diff --git a/frontend/rust-lib/event-integration-test/src/database_event.rs b/frontend/rust-lib/event-integration-test/src/database_event.rs
index b2e12aa67f..43ecb1c1ce 100644
--- a/frontend/rust-lib/event-integration-test/src/database_event.rs
+++ b/frontend/rust-lib/event-integration-test/src/database_event.rs
@@ -472,7 +472,6 @@ impl EventIntegrationTest {
&self,
view_id: &str,
group_id: &str,
- field_id: &str,
name: Option<String>,
visible: Option<bool>,
) -> Option<FlowyError> {
@@ -481,7 +480,6 @@ impl EventIntegrationTest {
.payload(UpdateGroupPB {
view_id: view_id.to_string(),
group_id: group_id.to_string(),
- field_id: field_id.to_string(),
name,
visible,
})
diff --git a/frontend/rust-lib/event-integration-test/tests/database/local_test/group_test.rs b/frontend/rust-lib/event-integration-test/tests/database/local_test/group_test.rs
index 8c97b3e7ce..7a54deebb9 100644
--- a/frontend/rust-lib/event-integration-test/tests/database/local_test/group_test.rs
+++ b/frontend/rust-lib/event-integration-test/tests/database/local_test/group_test.rs
@@ -94,7 +94,6 @@ async fn rename_group_event_test() {
.update_group(
&board_view.id,
&groups[1].group_id,
- &groups[1].field_id,
Some("new name".to_owned()),
None,
)
@@ -115,13 +114,7 @@ async fn hide_group_event_test() {
assert_eq!(groups.len(), 4);
let error = test
- .update_group(
- &board_view.id,
- &groups[0].group_id,
- &groups[0].field_id,
- None,
- Some(false),
- )
+ .update_group(&board_view.id, &groups[0].group_id, None, Some(false))
.await;
assert!(error.is_none());
@@ -145,7 +138,6 @@ async fn update_group_name_test() {
.update_group(
&board_view.id,
&groups[1].group_id,
- &groups[1].field_id,
Some("To Do?".to_string()),
None,
)
diff --git a/frontend/rust-lib/flowy-database2/src/entities/group_entities/group.rs b/frontend/rust-lib/flowy-database2/src/entities/group_entities/group.rs
index f33fd36708..5139fae482 100644
--- a/frontend/rust-lib/flowy-database2/src/entities/group_entities/group.rs
+++ b/frontend/rust-lib/flowy-database2/src/entities/group_entities/group.rs
@@ -152,14 +152,10 @@ pub struct UpdateGroupPB {
#[validate(custom = "lib_infra::validator_fn::required_not_empty_str")]
pub group_id: String,
- #[pb(index = 3)]
- #[validate(custom = "lib_infra::validator_fn::required_not_empty_str")]
- pub field_id: String,
-
- #[pb(index = 4, one_of)]
+ #[pb(index = 3, one_of)]
pub name: Option<String>,
- #[pb(index = 5, one_of)]
+ #[pb(index = 4, one_of)]
pub visible: Option<bool>,
}
@@ -173,14 +169,10 @@ impl TryInto<UpdateGroupParams> for UpdateGroupPB {
let group_id = NotEmptyStr::parse(self.group_id)
.map_err(|_| ErrorCode::GroupIdIsEmpty)?
.0;
- let field_id = NotEmptyStr::parse(self.field_id)
- .map_err(|_| ErrorCode::FieldIdIsEmpty)?
- .0;
Ok(UpdateGroupParams {
view_id,
group_id,
- field_id,
name: self.name,
visible: self.visible,
})
@@ -190,7 +182,6 @@ impl TryInto<UpdateGroupParams> for UpdateGroupPB {
pub struct UpdateGroupParams {
pub view_id: String,
pub group_id: String,
- pub field_id: String,
pub name: Option<String>,
pub visible: Option<bool>,
}
@@ -199,7 +190,6 @@ impl From<UpdateGroupParams> for GroupChangeset {
fn from(params: UpdateGroupParams) -> Self {
Self {
group_id: params.group_id,
- field_id: params.field_id,
name: params.name,
visible: params.visible,
}
@@ -267,66 +257,3 @@ impl TryFrom<DeleteGroupPayloadPB> for DeleteGroupParams {
Ok(Self { view_id, group_id })
}
}
-
-#[derive(Eq, PartialEq, ProtoBuf, Debug, Default, Clone, Validate)]
-pub struct RenameGroupPB {
- #[pb(index = 1)]
- #[validate(custom = "lib_infra::validator_fn::required_not_empty_str")]
- pub view_id: String,
-
- #[pb(index = 2)]
- #[validate(custom = "lib_infra::validator_fn::required_not_empty_str")]
- pub group_id: String,
-
- #[pb(index = 3)]
- #[validate(custom = "lib_infra::validator_fn::required_not_empty_str")]
- pub field_id: String,
-
- #[pb(index = 4)]
- #[validate(custom = "lib_infra::validator_fn::required_not_empty_str")]
- pub name: String,
-}
-
-pub struct RenameGroupParams {
- pub view_id: String,
- pub group_id: String,
- pub field_id: String,
- pub name: String,
-}
-
-impl TryFrom<RenameGroupPB> for RenameGroupParams {
- type Error = ErrorCode;
-
- fn try_from(value: RenameGroupPB) -> Result<Self, Self::Error> {
- let view_id = NotEmptyStr::parse(value.view_id)
- .map_err(|_| ErrorCode::ViewIdIsInvalid)?
- .0;
- let group_id = NotEmptyStr::parse(value.group_id)
- .map_err(|_| ErrorCode::GroupIdIsEmpty)?
- .0;
- let field_id = NotEmptyStr::parse(value.field_id)
- .map_err(|_| ErrorCode::FieldIdIsEmpty)?
- .0;
- let name = NotEmptyStr::parse(value.name)
- .map_err(|_| ErrorCode::GroupNameIsEmpty)?
- .0;
-
- Ok(Self {
- view_id,
- group_id,
- field_id,
- name,
- })
- }
-}
-
-impl From<RenameGroupParams> for GroupChangeset {
- fn from(params: RenameGroupParams) -> Self {
- Self {
- group_id: params.group_id,
- field_id: params.field_id,
- name: Some(params.name),
- visible: None,
- }
- }
-}
diff --git a/frontend/rust-lib/flowy-database2/src/entities/group_entities/group_changeset.rs b/frontend/rust-lib/flowy-database2/src/entities/group_entities/group_changeset.rs
index 4ae78f0533..f002e93bd2 100644
--- a/frontend/rust-lib/flowy-database2/src/entities/group_entities/group_changeset.rs
+++ b/frontend/rust-lib/flowy-database2/src/entities/group_entities/group_changeset.rs
@@ -149,12 +149,3 @@ pub struct InsertedGroupPB {
#[pb(index = 2)]
pub index: i32,
}
-
-#[derive(Debug, Default, ProtoBuf)]
-pub struct GroupRenameNotificationPB {
- #[pb(index = 1)]
- pub view_id: String,
-
- #[pb(index = 2)]
- pub group_id: String,
-}
diff --git a/frontend/rust-lib/flowy-database2/src/event_handler.rs b/frontend/rust-lib/flowy-database2/src/event_handler.rs
index 4d15310629..cd278734c2 100644
--- a/frontend/rust-lib/flowy-database2/src/event_handler.rs
+++ b/frontend/rust-lib/flowy-database2/src/event_handler.rs
@@ -797,22 +797,6 @@ pub(crate) async fn update_group_handler(
Ok(())
}
-#[tracing::instrument(level = "trace", skip_all, err)]
-pub(crate) async fn rename_group_handler(
- data: AFPluginData<RenameGroupPB>,
- manager: AFPluginState<Weak<DatabaseManager>>,
-) -> FlowyResult<()> {
- let manager = upgrade_manager(manager)?;
- let params: RenameGroupParams = data.into_inner().try_into()?;
- let view_id = params.view_id.clone();
- let database_editor = manager.get_database_editor_with_view_id(&view_id).await?;
- let group_changeset = GroupChangeset::from(params);
- database_editor
- .rename_group(&view_id, group_changeset)
- .await?;
- Ok(())
-}
-
#[tracing::instrument(level = "debug", skip(data, manager), err)]
pub(crate) async fn move_group_handler(
data: AFPluginData<MoveGroupPayloadPB>,
diff --git a/frontend/rust-lib/flowy-database2/src/event_map.rs b/frontend/rust-lib/flowy-database2/src/event_map.rs
index e668052a73..5bd9cf6f33 100644
--- a/frontend/rust-lib/flowy-database2/src/event_map.rs
+++ b/frontend/rust-lib/flowy-database2/src/event_map.rs
@@ -62,7 +62,6 @@ pub fn init(database_manager: Weak<DatabaseManager>) -> AFPlugin {
.event(DatabaseEvent::UpdateGroup, update_group_handler)
.event(DatabaseEvent::CreateGroup, create_group_handler)
.event(DatabaseEvent::DeleteGroup, delete_group_handler)
- .event(DatabaseEvent::RenameGroup, rename_group_handler)
// Database
.event(DatabaseEvent::GetDatabaseMeta, get_database_meta_handler)
.event(DatabaseEvent::GetDatabases, get_databases_handler)
@@ -302,9 +301,6 @@ pub enum DatabaseEvent {
#[event(input = "DeleteGroupPayloadPB")]
DeleteGroup = 115,
- #[event(input = "RenameGroupPB")]
- RenameGroup = 116,
-
#[event(input = "DatabaseIdPB", output = "DatabaseMetaPB")]
GetDatabaseMeta = 119,
diff --git a/frontend/rust-lib/flowy-database2/src/notification.rs b/frontend/rust-lib/flowy-database2/src/notification.rs
index 327bf4c2ce..71f3c43d96 100644
--- a/frontend/rust-lib/flowy-database2/src/notification.rs
+++ b/frontend/rust-lib/flowy-database2/src/notification.rs
@@ -38,8 +38,6 @@ pub enum DatabaseNotification {
DidUpdateRowMeta = 67,
/// Trigger when the settings of the database are changed
DidUpdateSettings = 70,
- /// Trigger after a group is renamed
- DidRenameGroup = 71,
// Trigger when the layout setting of the database is updated
DidUpdateLayoutSettings = 80,
// Trigger when the layout of the database is changed
@@ -80,7 +78,6 @@ impl std::convert::From<i32> for DatabaseNotification {
66 => DatabaseNotification::DidReorderSingleRow,
67 => DatabaseNotification::DidUpdateRowMeta,
70 => DatabaseNotification::DidUpdateSettings,
- 71 => DatabaseNotification::DidRenameGroup,
80 => DatabaseNotification::DidUpdateLayoutSettings,
82 => DatabaseNotification::DidUpdateDatabaseLayout,
83 => DatabaseNotification::DidDeleteDatabaseView,
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 ad12983938..de3db8e2e8 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
@@ -259,12 +259,6 @@ impl DatabaseEditor {
Ok(())
}
- pub async fn rename_group(&self, view_id: &str, changeset: GroupChangeset) -> FlowyResult<()> {
- let view_editor = self.database_views.get_or_init_view_editor(view_id).await?;
- view_editor.v_rename_group(changeset).await?;
- Ok(())
- }
-
pub async fn modify_view_filters(
&self,
view_id: &str,
diff --git a/frontend/rust-lib/flowy-database2/src/services/database_view/notifier.rs b/frontend/rust-lib/flowy-database2/src/services/database_view/notifier.rs
index 0a7442cc61..99c3efa45d 100644
--- a/frontend/rust-lib/flowy-database2/src/services/database_view/notifier.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/database_view/notifier.rs
@@ -1,9 +1,8 @@
#![allow(clippy::while_let_loop)]
use crate::entities::{
CalculationChangesetNotificationPB, DatabaseViewSettingPB, FilterChangesetNotificationPB,
- GroupChangesPB, GroupRenameNotificationPB, GroupRowsNotificationPB, InsertedRowPB,
- ReorderAllRowsPB, ReorderSingleRowPB, RowMetaPB, RowsChangePB, RowsVisibilityChangePB,
- SortChangesetNotificationPB,
+ GroupChangesPB, GroupRowsNotificationPB, InsertedRowPB, ReorderAllRowsPB, ReorderSingleRowPB,
+ RowMetaPB, RowsChangePB, RowsVisibilityChangePB, SortChangesetNotificationPB,
};
use crate::notification::{send_notification, DatabaseNotification};
use crate::services::filter::FilterResultNotification;
@@ -138,15 +137,6 @@ pub(crate) async fn notify_did_update_num_of_groups(view_id: &str, changeset: Gr
.send();
}
-pub(crate) async fn notify_did_rename_group(
- view_id: &str,
- notification: GroupRenameNotificationPB,
-) {
- send_notification(view_id, DatabaseNotification::DidRenameGroup)
- .payload(notification)
- .send();
-}
-
pub(crate) async fn notify_did_update_setting(view_id: &str, setting: DatabaseViewSettingPB) {
send_notification(view_id, DatabaseNotification::DidUpdateSettings)
.payload(setting)
diff --git a/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs b/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs
index de51b61d1f..ac958535f6 100644
--- a/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs
@@ -2,11 +2,11 @@ use std::borrow::Cow;
use std::collections::HashMap;
use std::sync::Arc;
-use super::{notify_did_rename_group, notify_did_update_calculation};
+use super::notify_did_update_calculation;
use crate::entities::{
CalendarEventPB, CreateRowParams, CreateRowPayloadPB, DatabaseLayoutMetaPB,
DatabaseLayoutSettingPB, DeleteSortPayloadPB, FieldSettingsChangesetPB, FieldType,
- GroupChangesPB, GroupPB, GroupRenameNotificationPB, LayoutSettingChangeset, LayoutSettingParams,
+ GroupChangesPB, GroupPB, LayoutSettingChangeset, LayoutSettingParams,
RemoveCalculationChangesetPB, ReorderSortPayloadPB, RowMetaPB, RowsChangePB,
SortChangesetNotificationPB, SortPB, UpdateCalculationChangesetPB, UpdateSortPayloadPB,
};
@@ -534,43 +534,6 @@ impl DatabaseViewEditor {
Ok(())
}
- pub async fn v_rename_group(&self, changeset: GroupChangeset) -> FlowyResult<()> {
- let mut type_option_data = None;
- let (old_field, updated_group) =
- if let Some(controller) = self.group_controller.write().await.as_mut() {
- let old_field = self
- .delegate
- .get_field(controller.get_grouping_field_id())
- .await;
- let (updated_group, new_type_option) = controller.apply_group_rename(&changeset).await?;
-
- if new_type_option.is_some() {
- type_option_data = new_type_option;
- }
-
- (old_field, Some(updated_group))
- } else {
- (None, None)
- };
-
- if let (Some(old_field), Some(updated_group)) = (old_field, updated_group) {
- if let Some(type_option_data) = type_option_data {
- self
- .delegate
- .update_field(type_option_data, old_field)
- .await?;
- }
-
- let notification = GroupRenameNotificationPB {
- view_id: self.view_id.clone(),
- group_id: updated_group.group_id.clone(),
- };
- notify_did_rename_group(&self.view_id, notification).await;
- }
-
- Ok(())
- }
-
pub async fn v_get_all_sorts(&self) -> Vec<Sort> {
self.delegate.get_all_sorts(&self.view_id).await
}
diff --git a/frontend/rust-lib/flowy-database2/src/services/group/action.rs b/frontend/rust-lib/flowy-database2/src/services/group/action.rs
index 98a2b0730a..3e3fafde10 100644
--- a/frontend/rust-lib/flowy-database2/src/services/group/action.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/group/action.rs
@@ -192,16 +192,6 @@ pub trait GroupController: Send + Sync {
changesets: &[GroupChangeset],
) -> FlowyResult<(Vec<GroupPB>, Option<TypeOptionData>)>;
- /// Updates the name of a group.
- ///
- /// Returns a non-empty `TypeOptionData` when the change require a change
- /// in the field type option data.
- ///
- async fn apply_group_rename(
- &mut self,
- changeset: &GroupChangeset,
- ) -> FlowyResult<(GroupPB, Option<TypeOptionData>)>;
-
/// Called before the row was created.
fn will_create_row(&self, cells: &mut Cells, field: &Field, group_id: &str);
}
diff --git a/frontend/rust-lib/flowy-database2/src/services/group/controller.rs b/frontend/rust-lib/flowy-database2/src/services/group/controller.rs
index 8cf06ae389..aa10055e02 100644
--- a/frontend/rust-lib/flowy-database2/src/services/group/controller.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/group/controller.rs
@@ -430,31 +430,6 @@ where
))
}
- async fn apply_group_rename(
- &mut self,
- changeset: &GroupChangeset,
- ) -> FlowyResult<(GroupPB, Option<TypeOptionData>)> {
- let type_option = self.get_grouping_field_type_option().await.ok_or_else(|| {
- FlowyError::internal().with_context("Failed to get grouping field type option")
- })?;
-
- let mut updated_type_option = None;
-
- if let Some(type_option) = self.update_type_option_when_update_group(changeset, &type_option) {
- updated_type_option = Some(type_option);
- }
-
- let updated_group = self
- .get_group(&changeset.group_id)
- .map(|(_, group)| GroupPB::from(group))
- .ok_or_else(|| FlowyError::internal().with_context("Failed to get group"))?;
-
- Ok((
- updated_group,
- updated_type_option.map(|type_option| type_option.into()),
- ))
- }
-
fn will_create_row(&self, cells: &mut Cells, field: &Field, group_id: &str) {
<Self as GroupCustomize>::will_create_row(self, cells, field, group_id);
}
diff --git a/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/default_controller.rs b/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/default_controller.rs
index a9b9dde4ba..5e879692f4 100644
--- a/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/default_controller.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/group/controller_impls/default_controller.rs
@@ -137,12 +137,5 @@ impl GroupController for DefaultGroupController {
Ok((Vec::new(), None))
}
- async fn apply_group_rename(
- &mut self,
- _changeset: &GroupChangeset,
- ) -> FlowyResult<(GroupPB, Option<TypeOptionData>)> {
- Ok((GroupPB::default(), None))
- }
-
fn will_create_row(&self, _cells: &mut Cells, _field: &Field, _group_id: &str) {}
}
diff --git a/frontend/rust-lib/flowy-database2/src/services/group/entities.rs b/frontend/rust-lib/flowy-database2/src/services/group/entities.rs
index 5e8bf3b0c9..b27c947e7d 100644
--- a/frontend/rust-lib/flowy-database2/src/services/group/entities.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/group/entities.rs
@@ -21,7 +21,6 @@ pub struct GroupSetting {
#[derive(Clone, Default, Debug)]
pub struct GroupChangeset {
pub group_id: String,
- pub field_id: String,
pub name: Option<String>,
pub visible: Option<bool>,
}