Merge pull request #934 from AppFlowy-IO/feat/board_default_column

feat: support board no status column

Author: appflowy

frontend/app_flowy/assets/translations/en.json

@@ -221,5 +221,10 @@
       "timeHintTextInTwelveHour": "12:00 AM",
       "timeHintTextInTwentyFourHour": "12:00"
     }
+  },
+  "board": {
+    "column": {
+      "create_new_card": "New"
+    }
   }
-}
+}

frontend/app_flowy/lib/plugins/board/presentation/board_page.dart

@@ -2,19 +2,22 @@
 
 import 'dart:collection';
 
+import 'package:app_flowy/generated/locale_keys.g.dart';
 import 'package:app_flowy/plugins/board/application/card/card_data_controller.dart';
 import 'package:app_flowy/plugins/grid/application/row/row_cache.dart';
 import 'package:app_flowy/plugins/grid/application/field/field_cache.dart';
 import 'package:app_flowy/plugins/grid/application/row/row_data_controller.dart';
 import 'package:app_flowy/plugins/grid/presentation/widgets/cell/cell_builder.dart';
 import 'package:app_flowy/plugins/grid/presentation/widgets/row/row_detail.dart';
 import 'package:appflowy_board/appflowy_board.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra/image.dart';
 import 'package:flowy_infra/theme.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
 import 'package:flowy_infra_ui/widget/error_page.dart';
 import 'package:flowy_sdk/protobuf/flowy-folder/view.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-grid/block_entities.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-grid/group.pbserver.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import '../../grid/application/row/row_cache.dart';
@@ -109,7 +112,7 @@ class _BoardContentState extends State<BoardContent> {
                   column,
                   columnItem,
                 ),
-                columnConstraints: const BoxConstraints.tightFor(width: 240),
+                columnConstraints: const BoxConstraints.tightFor(width: 300),
                 config: AFBoardConfig(
                   columnBackgroundColor: HexColor.fromHex('#F7F8FC'),
                 ),
@@ -154,7 +157,11 @@ class _BoardContentState extends State<BoardContent> {
   }
 
   Widget _buildFooter(BuildContext context, AFBoardColumnData columnData) {
-    return AppFlowyColumnFooter(
+    final group = columnData.customData as GroupPB;
+    if (group.isDefault) {
+      return const SizedBox();
+    } else {
+      return AppFlowyColumnFooter(
         icon: SizedBox(
           height: 20,
           width: 20,
@@ -164,15 +171,17 @@ class _BoardContentState extends State<BoardContent> {
           ),
         ),
         title: FlowyText.medium(
-          "New",
+          LocaleKeys.board_column_create_new_card.tr(),
           fontSize: 14,
           color: context.read<AppTheme>().textColor,
         ),
         height: 50,
         margin: config.footerPadding,
         onAddButtonClick: () {
           context.read<BoardBloc>().add(BoardEvent.createRow(columnData.id));
-        });
+        },
+      );
+    }
   }
 
   Widget _buildCard(

frontend/app_flowy/lib/plugins/board/presentation/card/card_container.dart

@@ -93,14 +93,15 @@ BoxDecoration _makeBoxDecoration(BuildContext context) {
   final theme = context.read<AppTheme>();
   final borderSide = BorderSide(color: theme.shader6, width: 1.0);
   return BoxDecoration(
-    color: theme.surface,
+    color: Colors.transparent,
     border: Border.fromBorderSide(borderSide),
-    boxShadow: [
+    boxShadow: const [
       BoxShadow(
-          color: theme.shader6,
-          spreadRadius: 0,
-          blurRadius: 2,
-          offset: Offset.zero)
+        color: Colors.transparent,
+        spreadRadius: 0,
+        blurRadius: 2,
+        offset: Offset.zero,
+      )
     ],
     borderRadius: const BorderRadius.all(Radius.circular(6)),
   );
@@ -120,8 +121,9 @@ class _CardEnterRegion extends StatelessWidget {
       builder: (context, onEnter, _) {
         List<Widget> children = [child];
         if (onEnter) {
-          children.add(CardAccessoryContainer(accessories: accessories)
-              .positioned(right: 0));
+          children.add(CardAccessoryContainer(
+            accessories: accessories,
+          ).positioned(right: 0));
         }
 
         return MouseRegion(

frontend/rust-lib/flowy-grid/src/entities/group_entities/group.rs

@@ -81,6 +81,9 @@ pub struct GroupPB {
 
     #[pb(index = 4)]
     pub rows: Vec<RowPB>,
+
+    #[pb(index = 5)]
+    pub is_default: bool,
 }
 
 impl std::convert::From<Group> for GroupPB {
@@ -90,6 +93,7 @@ impl std::convert::From<Group> for GroupPB {
             group_id: group.id,
             desc: group.name,
             rows: group.rows,
+            is_default: group.is_default,
         }
     }
 }

frontend/rust-lib/flowy-grid/src/services/cell/cell_operation.rs

@@ -176,6 +176,12 @@ pub fn insert_select_option_cell(option_id: String, field_rev: &FieldRevision) -
     CellRevision::new(data)
 }
 
+pub fn delete_select_option_cell(option_id: String, field_rev: &FieldRevision) -> CellRevision {
+    let cell_data = SelectOptionCellChangeset::from_delete(&option_id).to_str();
+    let data = apply_cell_data_changeset(cell_data, None, field_rev).unwrap();
+    CellRevision::new(data)
+}
+
 /// If the cell data is not String type, it should impl this trait.
 /// Deserialize the String into cell specific data type.  
 pub trait FromCellString {

frontend/rust-lib/flowy-grid/src/services/grid_view_manager.rs

@@ -142,7 +142,7 @@ impl GridViewManager {
             .move_group_row(&row_rev, &mut row_changeset, &to_group_id, to_row_id.clone())
             .await;
 
-        if row_changeset.is_empty() == false {
+        if !row_changeset.is_empty() {
             with_row_changeset(row_changeset).await;
         }
 

frontend/rust-lib/flowy-grid/src/services/group/configuration.rs

@@ -31,6 +31,10 @@ impl<T> std::fmt::Display for GenericGroupConfiguration<T> {
         self.groups_map.iter().for_each(|(_, group)| {
             let _ = f.write_fmt(format_args!("Group:{} has {} rows \n", group.id, group.rows.len()));
         });
+        let _ = f.write_fmt(format_args!(
+            "Default group has {} rows \n",
+            self.default_group.rows.len()
+        ));
         Ok(())
     }
 }
@@ -41,6 +45,8 @@ pub struct GenericGroupConfiguration<C> {
     configuration_content: PhantomData<C>,
     field_rev: Arc<FieldRevision>,
     groups_map: IndexMap<String, Group>,
+    /// default_group is used to store the rows that don't belong to any groups.
+    default_group: Group,
     writer: Arc<dyn GroupConfigurationWriter>,
 }
 
@@ -55,6 +61,15 @@ where
         reader: Arc<dyn GroupConfigurationReader>,
         writer: Arc<dyn GroupConfigurationWriter>,
     ) -> FlowyResult<Self> {
+        let default_group_id = format!("{}_default_group", view_id);
+        let default_group = Group {
+            id: default_group_id,
+            field_id: field_rev.id.clone(),
+            name: format!("No {}", field_rev.name),
+            is_default: true,
+            rows: vec![],
+            content: "".to_string(),
+        };
         let configuration = match reader.get_group_configuration(field_rev.clone()).await {
             None => {
                 let default_group_configuration = default_group_configuration(&field_rev);
@@ -71,6 +86,7 @@ where
             view_id,
             field_rev,
             groups_map: IndexMap::new(),
+            default_group,
             writer,
             configuration,
             configuration_content: PhantomData,
@@ -82,7 +98,9 @@ where
     }
 
     pub(crate) fn clone_groups(&self) -> Vec<Group> {
-        self.groups_map.values().cloned().collect()
+        let mut groups: Vec<Group> = self.groups_map.values().cloned().collect();
+        groups.push(self.default_group.clone());
+        groups
     }
 
     pub(crate) fn merge_groups(&mut self, groups: Vec<Group>) -> FlowyResult<Option<GroupViewChangesetPB>> {
@@ -160,6 +178,10 @@ where
         self.groups_map.get_mut(group_id)
     }
 
+    pub(crate) fn get_mut_default_group(&mut self) -> &mut Group {
+        &mut self.default_group
+    }
+
     pub(crate) fn move_group(&mut self, from_id: &str, to_id: &str) -> FlowyResult<()> {
         let from_index = self.groups_map.get_index_of(from_id);
         let to_index = self.groups_map.get_index_of(to_id);
@@ -263,7 +285,7 @@ fn merge_groups(old_groups: &[GroupRevision], groups: Vec<Group>) -> MergeGroupR
     }
 
     // Find out the new groups
-    let new_groups = group_map.into_values().collect::<Vec<Group>>();
+    let new_groups = group_map.into_values();
     for (index, group) in new_groups.into_iter().enumerate() {
         merge_result.add_insert_group(index, group);
     }
@@ -291,7 +313,7 @@ impl MergeGroupResult {
     }
 
     fn add_group(&mut self, group: Group) {
-        self.groups.push(group.clone());
+        self.groups.push(group);
     }
 
     fn add_insert_group(&mut self, index: usize, group: Group) {
@@ -309,11 +331,10 @@ fn make_group_view_changeset(
     inserted_groups: Vec<InsertedGroupPB>,
     updated_group: Vec<Group>,
 ) -> GroupViewChangesetPB {
-    let changeset = GroupViewChangesetPB {
+    GroupViewChangesetPB {
         view_id,
         inserted_groups,
         deleted_groups: vec![],
         update_groups: updated_group.into_iter().map(GroupPB::from).collect(),
-    };
-    changeset
+    }
 }