mensa 0.6.13 → 0.6.14

data/app/tables/mensa/scope.rb

@@ -5,6 +5,7 @@ module Mensa
   module Scope
     extend ActiveSupport::Concern
     include Search
+    include Grouping
 
     included do
     end
@@ -28,16 +29,17 @@ module Mensa
     def ordered_scope
       return @ordered_scope if @ordered_scope
 
-      @ordered_scope = filtered_scope
-      @ordered_scope = if effective_order.present?
-        @ordered_scope.reorder(effective_order)
-      elsif search_order_clause.present?
-        @ordered_scope.reorder(Arel.sql(search_order_clause))
-      else
-        @ordered_scope.reorder(nil)
-      end
+      # Builds the search order clause too, so do this first
+      relation = filtered_scope
+
+      # Grouped rows are sorted by the group first, so groups stay together
+      clauses = []
+      clauses << group_order_clause if grouped?
+      clauses << effective_order(except: group_column&.name)
+      clauses << search_order_clause if clauses.last.blank?
+      clause = clauses.compact_blank.join(", ")
 
-      @ordered_scope
+      @ordered_scope = relation.reorder(clause.presence && Arel.sql(clause))
     end
 
     # Return the ordered_scope, but with only the columns selected
@@ -48,6 +50,7 @@ module Mensa
 
       @selected_scope = ordered_scope
       @selected_scope = @selected_scope.select((id_column? ? [:id] : []) + columns.filter_map(&:attribute))
+      @selected_scope = @selected_scope.select(group_select) if grouped?
 
       @selected_scope
     end
@@ -116,18 +119,23 @@ module Mensa
     # Effective ordering for SQL: when the request includes any order[] params
     # (even with blank values), use only those — blank means "explicitly no sort".
     # Falls back to the view/config default only when no order params were sent.
-    def effective_order
+    def effective_order(except: nil)
       result = current_order_provided? ? (current_order || {}) : (config[:order] || {})
-      result = result.symbolize_keys.compact_blank.transform_values(&:to_sym)
-      result.filter_map { |k, v|
+      result = result.symbolize_keys.compact_blank.transform_values { |v| v.to_s.downcase }
+      clause = result.filter_map { |k, v|
+        next if k == except
+
         col = column(k)
         # Skip orders on unknown names, e.g. from browser state saved for
         # different params.
         next unless col || model_attribute?(k)
+        next unless %w[asc desc].include?(v)
 
         attribute = col&.attribute_for_condition || k
         "#{attribute} #{v} NULLS LAST"
       }.join(", ")
+
+      clause.presence && Arel.sql(clause)
     end
 
     def model_attribute?(name)

data/config/locales/en.yml

@@ -2,6 +2,18 @@ en:
   mensa:
     column_customizer:
       heading: Columns
+    group_by:
+      heading: Group by
+      none: No grouping
+      aggregates: Calculations
+    groups:
+      empty: No %{column}
+    aggregates:
+      none: None
+      count: Count
+      sum: Sum
+      min: Min
+      max: Max
     tables:
       filters:
         show:

data/config/locales/nl.yml

@@ -2,6 +2,18 @@ nl:
   mensa:
     column_customizer:
       heading: Kolommen
+    group_by:
+      heading: Groeperen op
+      none: Niet groeperen
+      aggregates: Berekeningen
+    groups:
+      empty: Geen %{column}
+    aggregates:
+      none: Geen
+      count: Aantal
+      sum: Som
+      min: Min
+      max: Max
     tables:
       filters:
         show:

data/lib/mensa/configuration.rb

@@ -57,6 +57,9 @@ module Mensa
       filter_pill_remove: "fa-solid fa-xmark",
       filter_pill_list_search: "fa-solid fa-sm fa-magnifying-glass",
       filter_pill_list_clear: "fa-solid fa-xmark",
+      group_by_toggle: "fa-regular fa-rectangle-list",
+      group_by_selected: "fa-solid fa-check",
+      group_toggle: "fa-solid fa-chevron-down",
       header_order_indicator_asc: "fa-solid fa-sm fa-arrow-up",
       header_order_indicator_desc: "fa-solid fa-sm fa-arrow-down",
       header_order_indicator_numeric_asc: "fa-solid fa-sm fa-arrow-down-1-9",
@@ -97,6 +100,9 @@ module Mensa
     #   filter_pill_remove: "fa-light fa-xmark",
     #   filter_pill_list_search: "fa-light fa-sm fa-magnifying-glass",
     #   filter_pill_list_clear: "fa-light fa-xmark",
+    #   group_by_toggle: "fa-light fa-rectangle-list",
+    #   group_by_selected: "fa-light fa-check",
+    #   group_toggle: "fa-light fa-chevron-down",
     #   header_order_indicator_asc: "fa-regular fa-sm fa-arrow-up-short-wide",
     #   header_order_indicator_desc: "fa-regular fa-sm fa-arrow-down-wide-short",
     #   views_trigger: "fa-light fa-sort",

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.6.13"
+  VERSION = "0.6.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mensa
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.14
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-09 00:00:00.000000000 Z
+date: 2026-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -209,6 +209,14 @@ files:
 - app/components/mensa/filter_pill_list/component.html.erb
 - app/components/mensa/filter_pill_list/component.rb
 - app/components/mensa/filter_pill_list/component_controller.js
+- app/components/mensa/group_by/component.css
+- app/components/mensa/group_by/component.html.erb
+- app/components/mensa/group_by/component.rb
+- app/components/mensa/group_by/component_controller.js
+- app/components/mensa/group_header/component.css
+- app/components/mensa/group_header/component.html.erb
+- app/components/mensa/group_header/component.rb
+- app/components/mensa/group_header/component_controller.js
 - app/components/mensa/header/component.css
 - app/components/mensa/header/component.html.erb
 - app/components/mensa/header/component.rb
@@ -274,6 +282,8 @@ files:
 - app/tables/mensa/config_readers.rb
 - app/tables/mensa/filter.rb
 - app/tables/mensa/format.rb
+- app/tables/mensa/group.rb
+- app/tables/mensa/grouping.rb
 - app/tables/mensa/row.rb
 - app/tables/mensa/scope.rb
 - app/tables/mensa/search.rb