feat: add columns layout to grouped grid views (baserow#6022)

* feat: add columns layout to grouped grid views

* test: strengthen Columns layout coverage

* fix: remove doubled vertical border on group column spans

The group-by divider already draws a full-height line at each level
boundary, so the span's own border-right rendered a second adjacent
line in the body but not in the header.

* chore: renumber group_by_layout migration after rebase

Develop added 0221 and 0222 in the meantime, so the branch migration
forked the graph into two leaf nodes.

* refactor: rename banner group layout to section

Author: silvestrid

backend/src/baserow/contrib/database/migrations/0223_gridview_group_by_layout.py

@@ -0,0 +1,22 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("database", "0222_button_field_start_workflow_action"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="gridview",
+            name="group_by_layout",
+            field=models.CharField(
+                choices=[("section", "Section"), ("column", "Column")],
+                db_default="section",
+                default="section",
+                max_length=10,
+                help_text="How grouped rows are presented: sections with a header above "
+                "each group, or one column per group-by level beside the rows.",
+            ),
+        ),
+    ]

backend/src/baserow/contrib/database/views/models.py

@@ -610,6 +610,10 @@ class RowHeightSizes(models.TextChoices):
         medium = "medium"
         large = "large"
 
+    class GroupByLayouts(models.TextChoices):
+        section = "section"
+        column = "column"
+
     # `field_options` is a very misleading name
     # it should probably be more like `fields_with_field_options`
     # since this field will return instances of `Field` not of
@@ -628,6 +632,14 @@ class RowHeightSizes(models.TextChoices):
     # Number of frozen (pinned) columns including the primary field. Max defined in
     # the serializer.
     frozen_column_count = models.PositiveSmallIntegerField(default=1, db_default=1)
+    group_by_layout = models.CharField(
+        choices=GroupByLayouts.choices,
+        default=GroupByLayouts.section,
+        db_default=GroupByLayouts.section,
+        max_length=10,
+        help_text="How grouped rows are presented: sections with a header above each "
+        "group, or one column per group-by level beside the rows.",
+    )
 
 
 class GridViewFieldOptionsManager(models.Manager):

backend/src/baserow/contrib/database/views/view_types.py

@@ -85,11 +85,17 @@ class GridViewType(ViewType):
     has_public_info = True
     can_group_by = True
     when_shared_publicly_requires_realtime_events = True
-    allowed_fields = ["row_identifier_type", "row_height_size", "frozen_column_count"]
+    allowed_fields = [
+        "row_identifier_type",
+        "row_height_size",
+        "frozen_column_count",
+        "group_by_layout",
+    ]
     copyable_view_attributes = [
         "row_height_size",
         "frozen_column_count",
         "row_identifier_type",
+        "group_by_layout",
     ]
     field_options_allowed_fields = [
         "width",
@@ -102,6 +108,7 @@ class GridViewType(ViewType):
         "row_identifier_type",
         "row_height_size",
         "frozen_column_count",
+        "group_by_layout",
     ]
     serializer_field_overrides = {
         "frozen_column_count": serializers.IntegerField(
@@ -142,6 +149,7 @@ def export_serialized(
         serialized["row_identifier_type"] = grid.row_identifier_type
         serialized["row_height_size"] = grid.row_height_size
         serialized["frozen_column_count"] = grid.frozen_column_count
+        serialized["group_by_layout"] = grid.group_by_layout
 
         serialized_field_options = []
         for field_option in grid.get_field_options():

backend/tests/baserow/contrib/database/airtable/test_airtable_handler.py

@@ -641,6 +641,7 @@ def test_to_baserow_database_export():
             "row_identifier_type": "count",
             "row_height_size": "small",
             "frozen_column_count": 1,
+            "group_by_layout": "section",
             "filter_type": "AND",
             "filters_disabled": False,
             "filters": [],

backend/tests/baserow/contrib/database/airtable/test_airtable_view_types.py

@@ -263,6 +263,7 @@ def test_import_grid_view():
         "public": False,
         "row_height_size": "medium",
         "frozen_column_count": 1,
+        "group_by_layout": "section",
         "row_identifier_type": "count",
         "sortings": [],
         "type": "grid",

backend/tests/baserow/contrib/database/api/views/grid/test_grid_view_views.py

@@ -3482,6 +3482,7 @@ def test_get_public_grid_view(api_client, data_fixture):
             "row_identifier_type": grid_view.row_identifier_type,
             "row_height_size": grid_view.row_height_size,
             "frozen_column_count": 1,
+            "group_by_layout": grid_view.group_by_layout,
             "show_logo": True,
             "allow_public_export": False,
             "ownership_type": "collaborative",
@@ -5820,3 +5821,36 @@ def test_list_rows_group_by_alone_applies_ordering(api_client, data_fixture):
     results = response.json()["results"]
     result_ids = [r["id"] for r in results]
     assert result_ids == [row_a.id, row_b.id, row_c.id]
+
+
+@pytest.mark.django_db
+def test_update_grid_view_group_by_layout(api_client, data_fixture):
+    user, token = data_fixture.create_user_and_token()
+    table = data_fixture.create_database_table(user=user)
+    grid_view = data_fixture.create_grid_view(table=table)
+    url = reverse("api:database:views:item", kwargs={"view_id": grid_view.id})
+
+    response = api_client.get(url, format="json", HTTP_AUTHORIZATION=f"JWT {token}")
+    assert response.status_code == HTTP_200_OK
+    assert response.json()["group_by_layout"] == "section"
+
+    for group_by_layout in ("column", "section"):
+        response = api_client.patch(
+            url,
+            {"group_by_layout": group_by_layout},
+            format="json",
+            HTTP_AUTHORIZATION=f"JWT {token}",
+        )
+        assert response.status_code == HTTP_200_OK
+        assert response.json()["group_by_layout"] == group_by_layout
+        grid_view.refresh_from_db()
+        assert grid_view.group_by_layout == group_by_layout
+
+    response = api_client.patch(
+        url,
+        {"group_by_layout": "vertical"},
+        format="json",
+        HTTP_AUTHORIZATION=f"JWT {token}",
+    )
+    assert response.status_code == HTTP_400_BAD_REQUEST
+    assert response.json()["error"] == "ERROR_REQUEST_BODY_VALIDATION"

backend/tests/baserow/contrib/database/api/views/test_view_copy_configuration.py

@@ -22,6 +22,7 @@ def test_copy_view_configuration(api_client, data_fixture):
         filter_type="OR",
         row_height_size="large",
         frozen_column_count=2,
+        group_by_layout="column",
     )
     dest_view = data_fixture.create_grid_view(table=table)
 
@@ -58,6 +59,7 @@ def test_copy_view_configuration(api_client, data_fixture):
     assert response_json["filter_type"] == "OR"
     assert response_json["row_height_size"] == "large"
     assert response_json["frozen_column_count"] == 2
+    assert response_json["group_by_layout"] == "column"
     assert len(response_json["filters"]) == 1
     assert response_json["filters"][0]["value"] == "a"
     assert len(response_json["filter_groups"]) == 1

backend/tests/baserow/contrib/database/api/views/test_view_views.py

@@ -1019,6 +1019,7 @@ def test_user_with_password_can_get_info_about_a_public_password_protected_view(
             "row_identifier_type": grid_view.row_identifier_type,
             "row_height_size": grid_view.row_height_size,
             "frozen_column_count": 1,
+            "group_by_layout": grid_view.group_by_layout,
             "show_logo": grid_view.show_logo,
             "allow_public_export": grid_view.allow_public_export,
             "ownership_type": "collaborative",
@@ -1051,6 +1052,7 @@ def test_user_with_password_can_get_info_about_a_public_password_protected_view(
             "row_identifier_type": grid_view.row_identifier_type,
             "row_height_size": grid_view.row_height_size,
             "frozen_column_count": 1,
+            "group_by_layout": grid_view.group_by_layout,
             "show_logo": grid_view.show_logo,
             "allow_public_export": grid_view.allow_public_export,
             "ownership_type": "collaborative",

backend/tests/baserow/contrib/database/view/test_view_configuration_copy.py

@@ -163,6 +163,7 @@ def test_copy_view_configuration_field_options_and_row_height(data_fixture):
         row_height_size="large",
         frozen_column_count=3,
         row_identifier_type="count",
+        group_by_layout="column",
     )
     dest_view = data_fixture.create_grid_view(table=table, row_height_size="small")
 
@@ -184,6 +185,7 @@ def test_copy_view_configuration_field_options_and_row_height(data_fixture):
     assert dest_view.row_height_size == "large"
     assert dest_view.frozen_column_count == 3
     assert dest_view.row_identifier_type == "count"
+    assert dest_view.group_by_layout == "column"
     dest_options = dest_view.gridviewfieldoptions_set.get(field=field)
     assert dest_options.hidden is True
     assert dest_options.width == 300

backend/tests/baserow/contrib/database/view/test_view_types.py

@@ -39,6 +39,7 @@ def test_import_export_grid_view(data_fixture):
         filter_type="AND",
         filters_disabled=False,
         row_identifier_type="count",
+        group_by_layout="column",
     )
     field = data_fixture.create_text_field(table=grid_view.table)
     imported_field = data_fixture.create_text_field(table=grid_view.table)
@@ -85,6 +86,7 @@ def test_import_export_grid_view(data_fixture):
     assert grid_view.filter_type == imported_grid_view.filter_type
     assert grid_view.filters_disabled == imported_grid_view.filters_disabled
     assert grid_view.row_identifier_type == imported_grid_view.row_identifier_type
+    assert imported_grid_view.group_by_layout == "column"
     assert imported_grid_view.viewfilter_set.all().count() == 1
     assert imported_grid_view.viewsort_set.all().count() == 1