mensa 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ad9a06fc13439d733db95cc8d3c0142247291057d8a5c84fce0f090f8c96a63
-  data.tar.gz: fef0dcdcaf8b21e038af8baa90f3509016372f30998a7bdd0cb94c3050a19444
+  metadata.gz: 95766fa259330a818f92429d4b361853af00fee5e519d44bac2cf9c251bf4206
+  data.tar.gz: b58a0063b5e7331a26ebc3da30516fa901237b6f2a4901354a18929c0a83a51c
 SHA512:
-  metadata.gz: e86a46aab67adf045e5939e9d307732e7752ccc50f3bae26b67dc9176ecb00508405b9b8c9c146fd7f0eb88a71f2aeba7f9f49fc943e3b8bb6910cbd1858e2d9
-  data.tar.gz: 89e4d11db3e400215fdbce8cd5b031577a8c254cb92fc37f99c7ebbb726609c7d5e70c7bfb143a529f7ae6e9d5290d1bf4df314b6ca4e65384ebb20198f038dd
+  metadata.gz: 5c2d502c10e92c897a7ef313667772afb3e823f87ea2efd804543706b9380416b2238dbd06bd98c39d67086576d6ba4422be343c01db2afa79b6e5bee1f435bd
+  data.tar.gz: 70a4ac1c22e048d6a38f02e6da520bb8ffa48b2b5ca94b336aa7ee3b09a556b59c085e10b75edfc59a09c8aade640f636b89017d7868fb135420aac9df34b457

data/Gemfile

@@ -14,6 +14,7 @@ gem "selenium-webdriver", "~> 4.17"
 gem "debug"
 gem "overmind", require: false
 gem "rack-mini-profiler"
+gem "rails-i18n"
 
 group :development, :test do
   gem "standard", require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mensa (0.4.0)
+    mensa (0.5.0)
       csv
       importmap-rails
       pagy (>= 43)
@@ -131,7 +131,7 @@ GEM
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.19.8)
+    json (2.19.9)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -186,7 +186,7 @@ GEM
       json
       uri
       yaml
-    parallel (1.28.0)
+    parallel (2.1.0)
     parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
@@ -243,6 +243,9 @@ GEM
     rails-html-sanitizer (1.7.0)
       loofah (~> 2.25)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    rails-i18n (8.1.0)
+      i18n (>= 0.7, < 2)
+      railties (>= 8.0.0, < 9)
     railties (8.1.3)
       actionpack (= 8.1.3)
       activesupport (= 8.1.3)
@@ -266,11 +269,11 @@ GEM
     reline (0.6.3)
       io-console (~> 0.5)
     rexml (3.4.4)
-    rubocop (1.84.2)
+    rubocop (1.87.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
@@ -284,7 +287,7 @@ GEM
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.47.1, < 2.0)
-    rubocop-rails (2.35.3)
+    rubocop-rails (2.35.4)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -313,10 +316,10 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    standard (1.54.0)
+    standard (1.55.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.84.0)
+      rubocop (~> 1.87.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.8)
     standard-custom (1.0.2)
@@ -383,6 +386,7 @@ DEPENDENCIES
   pry
   puma
   rack-mini-profiler
+  rails-i18n
   rubocop-rails
   ruby-lsp
   ruby-lsp-rails

data/README.md

@@ -23,6 +23,9 @@ Features:
 - [X] Exports can be scheduled to run recurring (daily/weekly/monthly/quarterly/bi-yearly/yearly)
       You will have to bring your own mailer, see configuration for details.
 
+TODO:
+- [ ] ...
+
 Nice to haves:
 
 - [ ] group by
@@ -70,7 +73,7 @@ class UserTable < ApplicationTable
   end
 
   link { |user| edit_user_path(user) }
-  supports_views true # This table supports custom views
+
   show_header true
   view_columns_ordering false # Disabled for now
 

data/app/components/mensa/add_filter/component.css

@@ -64,15 +64,17 @@
             }
 
             &__clear {
-                @apply block mt-3 text-gray-500 dark:text-gray-400 no-underline hover:text-gray-700 dark:hover:text-gray-200 cursor-pointer;
+                @apply flex items-center gap-2 mt-3 text-gray-500 dark:text-gray-400 no-underline hover:text-gray-700 dark:hover:text-gray-200 cursor-pointer;
             }
         }
     }
 }
 
-/* Show enter hint on hover or keyboard highlight — covers column list and value popover */
+/* Show key hint on hover or keyboard highlight — covers column list and value popover */
 .mensa-table__add_filter li:hover .mensa-table__add_filter__enter-hint,
-.mensa-table__add_filter li.highlighted .mensa-table__add_filter__enter-hint {
+.mensa-table__add_filter li.highlighted .mensa-table__add_filter__enter-hint,
+.mensa-table__add_filter__popover_container__clear:hover
+    .mensa-table__add_filter__enter-hint {
     display: inline-flex;
 }
 

data/app/components/mensa/add_filter/component.html.erb

@@ -6,7 +6,7 @@
           type="button"
           title="<%= t("mensa.add_filter.add") %>"
           data-action="mensa-add-filter#openAllColumns">
-    <i class="fa-solid fa-circle-plus"></i>
+    <i class="<%= Mensa.config.icons[:add_filter_trigger] %>"></i>
   </button>
 
   <ul class="hidden fixed z-50 max-h-96 overflow-auto rounded-lg bg-white p-2 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none dark:bg-gray-800 sm:text-sm"
@@ -18,7 +18,7 @@
           data-filter-column-name="<%= column.name %>">
         <div class="label block flex-1 truncate font-normal"><%= column.human_name %></div>
         <div class="check hidden flex items-center text-primary-600">
-          <div class="fal fa-check"></div>
+          <div class="<%= Mensa.config.icons[:add_filter_selected] %>"></div>
         </div>
         <span class="mensa-table__add_filter__enter-hint">↵ Enter</span>
       </li>

data/app/components/mensa/add_filter/component_controller.js

@@ -77,6 +77,7 @@ export default class AddFilterComponentController extends ApplicationController
 
     // Called by the + button — always shows all columns regardless of current filter
     openAllColumns(event) {
+        this._closePopover();
         this.filterColumns("");
         this.showList(event?.currentTarget);
     }

data/app/components/mensa/column_customizer/component.css

@@ -28,12 +28,12 @@
             @apply flex-none text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer;
         }
 
-        /* Show the correct eye icon based on the row's data-visible attribute.
-           Works with both FA CSS (i elements) and FA SVG mode (svg elements). */
-        &__row[data-visible="true"] .fa-eye-slash {
+        /* Show the correct visibility icon based on the row's data-visible attribute
+           without depending on specific Font Awesome class names. */
+        &__row[data-visible="true"] [data-icon-role="hidden"] {
             display: none;
         }
-        &__row[data-visible="false"] .fa-eye {
+        &__row[data-visible="false"] [data-icon-role="visible"] {
             display: none;
         }
     }

data/app/components/mensa/column_customizer/component.html.erb

@@ -4,7 +4,7 @@
      data-mensa-column-customizer-turbo-frame-id-value="<%= table.table_id %>"
      data-mensa-column-customizer-mensa-table-outlet="#table-<%= table.table_id %>">
   <button class="mensa-table__control_bar__button" type="button" data-action="click->mensa-column-customizer#toggle">
-    <i class="<%= Mensa.config.icons[:control_bar_edit] %>"></i>
+    <i class="<%= Mensa.config.icons[:column_customizer_toggle] %>"></i>
   </button>
   <div class="mensa-table__column_customizer__popover hidden" data-mensa-column-customizer-target="popover">
     <p class="mensa-table__column_customizer__heading">Columns</p>
@@ -16,13 +16,13 @@
             data-visible="<%= column.visible?.to_s %>"
             draggable="true"
             data-action="dragstart->mensa-column-customizer#dragStart dragover->mensa-column-customizer#dragOver drop->mensa-column-customizer#drop dragend->mensa-column-customizer#dragEnd">
-          <i class="mensa-table__column_customizer__handle fa-solid fa-grip-vertical"></i>
+          <i class="mensa-table__column_customizer__handle <%= Mensa.config.icons[:column_customizer_handle] %>"></i>
           <span class="mensa-table__column_customizer__name<%= !column.visible? ? " mensa-table__column_customizer__name--hidden" : "" %>">
             <%= column.human_name %>
           </span>
           <button class="mensa-table__column_customizer__visibility" type="button" data-action="click->mensa-column-customizer#toggleVisibility">
-            <i class="fa-solid fa-eye"></i>
-            <i class="fa-solid fa-eye-slash"></i>
+            <i data-icon-role="visible" class="<%= Mensa.config.icons[:column_customizer_visibility_on] %>"></i>
+            <i data-icon-role="hidden" class="<%= Mensa.config.icons[:column_customizer_visibility_off] %>"></i>
           </button>
         </li>
       <% end %>

data/app/components/mensa/control_bar/component.html.erb

@@ -6,7 +6,7 @@
 
     <div class="mensa-table__save-reset hidden" data-mensa-table-target="saveResetButtons">
       <button class="mensa-table__control_bar__button" type="button" title="<%= t(".reset", default: "Reset") %>" data-action="mensa-table#cancelFiltersAndSearch">
-        <i class="fa-solid fa-rotate-left"></i>
+        <i class="<%= Mensa.config.icons[:control_bar_reset] %>"></i>
       </button>
       <% if table.current_user && table.supports_custom_views? %>
         <div class="relative">
@@ -15,7 +15,7 @@
           </button>
           <button class="mensa-table__control_bar__button hidden" type="button" data-mensa-table-target="saveSplit" data-action="mensa-table#toggleSaveDropdown">
             <%= t("mensa.save") %>
-            <i class="fa-solid fa-chevron-down text-xs"></i>
+            <i class="<%= Mensa.config.icons[:control_bar_save_dropdown] %> text-xs"></i>
           </button>
           <ul class="mensa-table__control_bar__save-dropdown hidden" data-mensa-table-target="saveDropdown">
             <li>
@@ -30,15 +30,16 @@
             </li>
           </ul>
         </div>
-      <% else %>
-        <button class="mensa-table__control_bar__button" type="button" data-action="mensa-table#saveAsNewView">
-          <%= t("mensa.save") %>
-        </button>
       <% end %>
     </div>
 
-    <button class="mensa-table__control_bar__button hidden" type="button" data-mensa-table-target="eyeButton" data-action="click->mensa-table#toggleViewFilters">
-      <i class="fa-solid fa-eye"></i>
+    <button class="mensa-table__control_bar__button hidden"
+            type="button"
+            data-mensa-table-target="eyeButton"
+            data-action="click->mensa-table#toggleViewFilters"
+            data-icon-visible-class="<%= Mensa.config.icons[:control_bar_view_filters_show] %>"
+            data-icon-hidden-class="<%= Mensa.config.icons[:control_bar_view_filters_hide] %>">
+      <i class="<%= Mensa.config.icons[:control_bar_view_filters_show] %>"></i>
     </button>
 
     <% if table.exportable? %>

data/app/components/mensa/empty_state/component.html.erb

@@ -1,6 +1,6 @@
 <div class="mensa-empty-state">
   <div class="mensa-empty-state__icon">
-    <i class="<%= Mensa.config.icons[:search] %>"></i>
+    <i class="<%= Mensa.config.icons[:empty_state_icon] %>"></i>
   </div>
   <h3 class="mensa-empty-state__title"><%= t("mensa.empty_state.title", model: model_name_plural) %></h3>
   <p class="mensa-empty-state__subtitle"><%= t("mensa.empty_state.subtitle") %></p>

data/app/components/mensa/filter_pill/component.html.erb

@@ -1,4 +1,4 @@
-<% formatted_value = filter.value.is_a?(Array) ? filter.value.join(", ") : filter.value %>
+<% formatted_value = filter.formatted_value %>
 <div class="mensa-filter-pill"
      data-controller="mensa-filter-pill"
      data-mensa-filter-pill-mensa-filter-pill-list-outlet="#mensa-filter-pill-list-<%= filter.table.table_id %>"
@@ -15,6 +15,6 @@
     <% end %>
   </button>
   <button class="mensa-filter-pill__remove" type="button" title="Remove filter" data-action="click->mensa-filter-pill#remove">
-    <i class="fa-solid fa-xmark"></i>
+    <i class="<%= Mensa.config.icons[:filter_pill_remove] %>"></i>
   </button>
 </div>

data/app/components/mensa/filter_pill_list/component.html.erb

@@ -21,10 +21,10 @@
              data-mensa-filter-pill-list-target="searchInput"
              data-action="input->mensa-filter-pill-list#monitorSearch keydown.enter->mensa-filter-pill-list#search keydown.esc->mensa-filter-pill-list#resetSearch focus->mensa-filter-pill-list#searchFocused keydown.down->mensa-filter-pill-list#navigateDown keydown.up->mensa-filter-pill-list#navigateUp"
              value="<%= params[:query] %>">
-      <i class="mensa-table__search-bar__search-icon <%= Mensa.config.icons[:search] %>"></i>
+      <i class="mensa-table__search-bar__search-icon <%= Mensa.config.icons[:filter_pill_list_search] %>"></i>
     </div>
   </div>
   <button class="mensa-table__search-bar__clear hidden" type="button" data-mensa-filter-pill-list-target="resetSearchButton" data-action="mensa-filter-pill-list#resetSearch">
-    <i class="fas fa-xmark"></i>
+    <i class="<%= Mensa.config.icons[:filter_pill_list_clear] %>"></i>
   </button>
 </div>

data/app/components/mensa/header/component.html.erb

@@ -2,7 +2,7 @@
   <% if column.sortable? %>
     <%= link_to table.path(order: {column.name => column.next_sort_direction}, turbo_frame_id: table.table_id), "data-turbo-frame": "_self", class: "order cursor-pointer" do %>
       <span><%= column.human_name %></span>
-      <i class="<%= Mensa.config.icons["order_indicator#{column.sort_direction.to_s.present? ? "_#{column.sort_direction}" : ""}".to_sym] %>"></i>
+      <i class="<%= Mensa.config.icons["header_order_indicator#{column.sort_direction.to_s.present? ? "_#{column.sort_direction}" : ""}".to_sym] %>"></i>
     <% end %>
   <% else %>
     <div class="container">

data/app/components/mensa/table/component.html.erb

@@ -1,6 +1,6 @@
 <div class="mensa-table"
      id="table-<%= table.table_id %>"
-     data-mensa-table-supports-views-value="<%= table.supports_views? %>"
+     data-mensa-table-supports-views-value="<%= table.views? %>"
      data-mensa-table-table-url-value="<%= table.path(turbo_frame_id: table.table_id, user_params: params) %>"
      data-mensa-table-save-view-url-value="<%= helpers.mensa.table_views_path(table.name) %>"
      data-mensa-table-views-url-value="<%= helpers.mensa.table_views_path(table.name) %>"
@@ -11,8 +11,12 @@
      data-mensa-table-mensa-column-customizer-outlet="[data-controller='mensa-column-customizer']">
   <div class="mensa-table__toolbar">
     <div class="mensa-table__search-container">
-      <% if table.supports_views? && table.show_header? %>
-        <%= render Mensa::Views::Component.new(table: table) %>
+      <% if table.show_header? %>
+        <% if table.views? %>
+          <%= render Mensa::Views::Component.new(table: table) %>
+        <% else %>
+          <div id="mensa-views-<%= table.table_id %>"></div>
+        <% end %>
       <% end %>
       <div class="flex min-w-0 flex-1" id="filters-<%= table.table_id %>">
         <%= render Mensa::FilterPillList::Component.new(table: table) %>

data/app/components/mensa/table/component_controller.js

@@ -375,10 +375,15 @@ export default class TableComponentController extends ApplicationController {
             const hidden = this.element.classList.contains(
                 "mensa-table--view-filters-hidden",
             );
+            const visibleIconClass =
+                this.eyeButtonTarget.dataset.iconVisibleClass || "";
+            const hiddenIconClass =
+                this.eyeButtonTarget.dataset.iconHiddenClass || "";
+
             // Replace innerHTML so FontAwesome's MutationObserver re-processes the new <i>
             this.eyeButtonTarget.innerHTML = hidden
-                ? '<i class="fa-solid fa-eye"></i>'
-                : '<i class="fa-solid fa-eye-slash"></i>';
+                ? `<i class="${visibleIconClass}"></i>`
+                : `<i class="${hiddenIconClass}"></i>`;
         }
     }
 

data/app/components/mensa/views/component.html.erb

@@ -11,26 +11,26 @@
      data-mensa-views-views-url-value="<%= helpers.mensa.table_views_path(table.name) %>">
   <button class="mensa-table__views__trigger" type="button" data-action="mensa-views#toggleDropdown" data-mensa-views-target="trigger" aria-haspopup="listbox">
     <span class="mensa-table__views__trigger-label" data-mensa-views-target="triggerLabel"><%= current_view_name %></span>
-    <i class="fa-solid fa-sort mensa-table__views__trigger-icon"></i>
+    <i class="<%= Mensa.config.icons[:views_trigger] %> mensa-table__views__trigger-icon"></i>
   </button>
 
   <div class="mensa-table__views__dropdown hidden" data-mensa-views-target="dropdown">
     <ul role="listbox">
       <% table.all_views.each do |view| %>
         <% is_selected = view.id == table.table_view&.id || (view.id == :default && table.table_view.blank?) %>
-        <% is_user_view = view.id.is_a?(String) && view.id.match?(/\A[0-9a-f-]{32,}\z/i) %>
+        <% is_user_view = view.is_a?(Mensa::TableView) %>
         <li class="mensa-table__views__option" role="option" data-view-id="<%= view.id %>" data-view-name="<%= view.name %>" data-mensa-views-target="view">
           <button class="mensa-table__views__option-btn" type="button" data-action="mensa-views#select" data-view-id="<%= view.id %>">
-            <i class="mensa-table__views__option-check fa-solid fa-check<%= " invisible" unless is_selected %>"></i>
+            <i class="mensa-table__views__option-check <%= Mensa.config.icons[:views_option_selected] %><%= " invisible" unless is_selected %>"></i>
             <span><%= view.name %></span>
           </button>
           <% if is_user_view %>
             <button class="mensa-table__views__option-menu" type="button" data-action="mensa-views#toggleSubmenu" data-view-id="<%= view.id %>" title="View options">
-              <i class="fa-solid fa-ellipsis"></i>
+              <i class="<%= Mensa.config.icons[:views_option_menu] %>"></i>
             </button>
           <% else %>
             <div class="mensa-table__views__option-system">
-              <i class="fa-solid fa-ban"></i>
+              <i class="<%= Mensa.config.icons[:views_option_system] %>"></i>
             </div>
           <% end %>
         </li>
@@ -39,15 +39,15 @@
 
     <div class="mensa-table__views__submenu hidden" data-mensa-views-target="submenu">
       <button class="mensa-table__views__submenu-item" type="button" data-action="mensa-views#renameView">
-        <i class="fa-solid fa-pencil"></i>
+        <i class="<%= Mensa.config.icons[:views_rename] %>"></i>
         <%= t(".rename_view", default: "Rename view") %>
       </button>
       <button class="mensa-table__views__submenu-item" type="button" data-action="mensa-views#duplicateView">
-        <i class="fa-solid fa-copy"></i>
+        <i class="<%= Mensa.config.icons[:views_duplicate] %>"></i>
         <%= t(".duplicate_view", default: "Duplicate view") %>
       </button>
       <button class="mensa-table__views__submenu-item mensa-table__views__submenu-item--danger" type="button" data-action="mensa-views#deleteView">
-        <i class="fa-solid fa-trash"></i>
+        <i class="<%= Mensa.config.icons[:views_delete] %>"></i>
         <%= t(".delete_view", default: "Delete view") %>
       </button>
     </div>

data/app/controllers/mensa/tables_controller.rb

@@ -2,7 +2,7 @@ module Mensa
   class TablesController < ApplicationController
     def show
       config = params.permit(:format, :query, :id, :page, :table_view_id, :turbo_frame_id, order: {}, column_order: [], hidden_columns: [], params: {}).to_h
-      config[:filters] = params[:filters]&.to_unsafe_h || {}
+      config[:filters] = params[:filters].to_unsafe_h if params.key?(:filters)
       config[:params] = params[:params]&.to_unsafe_h || {}
 
       if params[:table_view_id]

data/app/tables/mensa/base.rb

@@ -13,9 +13,7 @@ module Mensa
     config_reader :model
     config_reader :scope
     config_reader :link, call: false
-    config_reader :supports_views?
     config_reader :supports_custom_views?
-    config_reader :supports_filters?
     config_reader :view_columns_ordering?
     config_reader :show_header?
     config_reader :exportable?
@@ -143,6 +141,10 @@ module Mensa
       views
     end
 
+    def views?
+      all_views.reject{_1.id == :default}.present?
+    end
+
     # The user that owns custom views. Returns nil when the host application has
     # no current user, in which case views cannot be saved.
     def current_user

data/app/tables/mensa/cell.rb

@@ -38,10 +38,14 @@ module Mensa
         content_tag(:i, "", class: "fa-solid fa-check")
       when FalseClass
         content_tag(:i, "", class: "fa-solid fa-xmark")
+      when Array
+        value.to_fs(:db)
       when Date
-        respond_to?(:dt) ? dt(value) : value.strftime("%d.%m.%Y")
+        I18n.l(value.in_time_zone(column.format.time_zone), format: column.format.format)
+        # value.in_time_zone(column.format.time_zone).to_fs(column.format.format)
       when Time, DateTime
-        respond_to?(:ln) ? ln(value) : value.strftime("%d-%m-%Y %H:%M:%S")
+        I18n.l(value.in_time_zone(column.format.time_zone), format: column.format.format)
+        # value.in_time_zone(column.format.time_zone).to_fs(column.format.format)
       else
         column.sanitize? ? sanitize(value.to_s) : value.to_s.html_safe
       end
@@ -54,9 +58,9 @@ module Mensa
       when TrueClass, FalseClass
         value.to_s
       when Date
-        respond_to?(:dt) ? dt(value) : value.strftime("%d.%m.%Y")
+        I18n.l(value.in_time_zone(column.format.time_zone), format: column.format.format)
       when Time, DateTime
-        respond_to?(:ln) ? ln(value) : value.strftime("%d-%m-%Y %H:%M:%S")
+        value.in_time_zone(column.format.time_zone).to_fs(column.format.format)
       else
         strip_tags(value.to_s)
       end

data/app/tables/mensa/column.rb

@@ -19,6 +19,7 @@ module Mensa
     config_reader :visible?
     config_reader :internal?
     config_reader :method # When a method needs to be called on the model, slow!
+    config_reader :format
 
     def sort_direction
       value = table.config.dig(:order, name)
@@ -88,6 +89,10 @@ module Mensa
       @filter ||= Mensa::Filter.new(column: self, config: table.config.dig(:columns, name, :filter) || {}, table: table)
     end
 
+    def format
+      @format ||= Mensa::Format.new(config: config.dig(:format).presence || {}, column: self)
+    end
+
     def human_name
       if table.model < ActiveRecord::Base
         table.model.human_attribute_name name

data/app/tables/mensa/config/column_dsl.rb

@@ -16,6 +16,7 @@ module Mensa::Config
     option :internal, default: false
     option :method
     option :type
+    option :format, default: :long, dsl_single_hash: Mensa::Config::FormatDsl, name_attribute: :format
 
     option :visible, default: true
     option :render, dsl: Mensa::Config::RenderDsl

data/app/tables/mensa/config/dsl_logic.rb

@@ -17,11 +17,13 @@ module Mensa::Config
     class_methods do
       attr_reader :default_config
 
-      def option(name, default: nil, config_name: nil, dsl: nil, dsl_hash: nil, dsl_array: nil)
+      def option(name, default: nil, config_name: nil, name_attribute: nil, dsl: nil, dsl_hash: nil, dsl_array: nil, dsl_single_hash: nil)
         if dsl
           dsl_option(name, dsl)
         elsif dsl_hash
           dsl_hash(name, dsl_hash, config_name: config_name)
+        elsif dsl_single_hash
+          dsl_single_hash(name, dsl_single_hash, name_attribute:, default: default)
         elsif dsl_array
           dsl_array(name, dsl_array, config_name: config_name)
         else
@@ -80,6 +82,22 @@ module Mensa::Config
         end
       end
 
+      ###
+      # Define a DSL that builds a single hash
+      # by calling option :action, dsl_single_hash: Mensa::ActionDsl
+      #
+      def dsl_single_hash(option_name, klass, name_attribute: :name, default: nil)
+        config_name ||= option_name.to_s.to_sym
+
+        @default_config ||= {}
+        @default_config[option_name.to_sym] = default.nil? ? {} : {name_attribute => default}
+
+        define_method(option_name) do |name = nil, &block|
+          config[config_name] = {name_attribute => name}
+          config[config_name].merge!(klass.new(nil, &block).config.compact)
+        end
+      end
+
       ###
       # Define a DSL that builds an array
       # by calling option :action, dsl_array: Mensa::ActionDsl

data/app/tables/mensa/config/format_dsl.rb

@@ -0,0 +1,7 @@
+module Mensa::Config
+  class FormatDsl
+    include DslLogic
+
+    option :time_zone, default: -> { Time.zone }
+  end
+end

data/app/tables/mensa/config/table_dsl.rb

@@ -30,8 +30,6 @@
 #     order last_name: :asc
 #     link { |user| edit_user_path(user) }
 #
-#     supports_views true
-#     supports_filters true
 #
 #     action :activate do
 #       link { |user| edit_user_path(user) }
@@ -76,9 +74,7 @@ module Mensa::Config
 
     option :render, dsl: Mensa::Config::RenderDsl
 
-    option :supports_views, default: false
-    option :supports_custom_views, default: false
-    option :supports_filters, default: true
+    option :supports_custom_views, default: true
     option :show_header, default: true
     # Whether the table allows to change column ordering
     option :view_columns_ordering, default: true

data/app/tables/mensa/filter.rb

@@ -60,11 +60,20 @@ module Mensa
 
     def to_s
       parts = [column.human_name, operator_label]
-      formatted_value = value.is_a?(Array) ? value.join(", ") : value
       parts << formatted_value if formatted_value.present? && operator_with_value?
       parts.join(" ")
     end
 
+    def formatted_value
+      options = collection_options
+
+      if value.is_a?(Array)
+        value.map { |entry| label_for_value(entry, options) }.join(", ")
+      else
+        label_for_value(value, options)
+      end
+    end
+
     def filter_scope(record_scope)
       if scope
         record_scope.instance_exec(normalize(value), &scope)
@@ -140,6 +149,20 @@ module Mensa
 
     private
 
+    def label_for_value(selected_value, options)
+      option = options.find { |_label, value| value.to_s == selected_value.to_s }
+      option ? option.first : selected_value
+    end
+
+    def collection_options
+      collection = column.filter&.collection
+      return [] if collection.blank?
+
+      collection.map do |item|
+        item.is_a?(Array) ? [item.first.to_s, item.last.to_s] : [item.to_s, item.to_s]
+      end
+    end
+
     # Unused at the moment
     def normalize(query)
       query # .to_s.gsub(/\s(?![&!|])/, '\\\\ ')

data/app/tables/mensa/format.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Mensa
+  # Represents a batch action that can be applied to multiple selected records.
+  #
+  # batch :archive do
+  #   title "Archive"
+  #   process { |records| records.update_all(archived: true) }
+  # end
+  class Format
+    include ConfigReaders
+
+    defined_by Mensa::Config::FormatDsl
+
+    config_reader :format
+    config_reader :time_zone
+
+    def initialize(config:, column:)
+      @column = column
+      @config = self.class.definition.merge(config || {})
+    end
+  end
+end

data/app/views/mensa/exports/_dialog.html.erb

@@ -5,7 +5,7 @@
     <header class="mensa-table__export-dialog__header">
       <h2 class="mensa-table__export-dialog__title"><%= t("mensa.exports.title", default: "Export %{table}", table: table.name.to_s.humanize) %></h2>
       <button class="mensa-table__export-dialog__close" type="button" data-action="mensa-table#cancelExport" aria-label="<%= t("mensa.exports.close", default: "Close") %>">
-        <i class="fa-solid fa-xmark"></i>
+        <i class="<%= Mensa.config.icons[:exports_dialog_close] %>"></i>
       </button>
     </header>
 
@@ -65,7 +65,7 @@
             <%= t("mensa.exports.cancel", default: "Cancel") %>
           </button>
           <button class="mensa-table__export-dialog__button mensa-table__export-dialog__button--primary" type="submit">
-            <i class="fa-solid fa-file-export"></i>
+            <i class="<%= Mensa.config.icons[:exports_dialog_submit] %>"></i>
             <%= t("mensa.exports.submit", default: "Export") %>
           </button>
         </div>

data/app/views/mensa/exports/_list.html.erb

@@ -11,7 +11,7 @@
             class: "mensa-table__export-dialog__delete",
             form_class: "mensa-table__export-dialog__delete-form",
             aria: {label: t("mensa.exports.delete", default: "Delete export") } do %>
-            <i class="fa-solid fa-trash"></i>
+            <i class="<%= Mensa.config.icons[:exports_list_delete] %>"></i>
           <% end %>
 
           <div class="mensa-table__export-dialog__item-info">
@@ -24,7 +24,7 @@
           <div class="mensa-table__export-dialog__item-action">
             <% if export.downloadable? %>
               <%= link_to mensa.download_table_export_path(export.table_name, export), class: "mensa-table__export-dialog__download", data: {turbo: false} do %>
-                <i class="fa-solid fa-download"></i>
+                <i class="<%= Mensa.config.icons[:exports_list_download] %>"></i>
                 <%= t("mensa.exports.download", default: "Download") %>
               <% end %>
             <% elsif export.failed? %>
@@ -33,7 +33,7 @@
               <span class="mensa-table__export-dialog__status mensa-table__export-dialog__status--pending"><%= t("mensa.exports.waiting", default: "Waiting") %></span>
             <% else %>
               <span class="mensa-table__export-dialog__status mensa-table__export-dialog__status--pending">
-                <i class="fa-solid fa-spinner fa-spin"></i>
+                <i class="<%= Mensa.config.icons[:exports_list_processing] %>"></i>
                 <%= t("mensa.exports.processing", default: "Preparing…") %>
               </span>
             <% end %>

data/app/views/mensa/tables/filters/show.turbo_stream.erb

@@ -54,5 +54,8 @@
     <% end %>
   </ul>
   <hr class="mensa-table__add_filter__popover_container__separator">
-  <a class="mensa-table__add_filter__popover_container__clear" href="#" data-action="click->mensa-add-filter#reset">Clear</a>
+  <a class="mensa-table__add_filter__popover_container__clear" href="#" data-action="click->mensa-add-filter#reset">
+    <span class="flex-1"><%= t('mensa.tables.filters.show.clear') %></span>
+    <span class="mensa-table__add_filter__enter-hint">⎋ Esc</span>
+  </a>
 <% end %>

data/app/views/mensa/tables/views/destroy.turbo_stream.erb

@@ -1,5 +1,9 @@
 <%= turbo_stream.replace "mensa-views-#{@table.table_id}" do %>
-  <%= render Mensa::Views::Component.new(table: @table) %>
+  <% if @table.views? %>
+    <%= render Mensa::Views::Component.new(table: @table) %>
+  <% else %>
+    <div id="mensa-views-<%= @table.table_id %>"></div>
+  <% end %>
 <% end %>
 
 <%= turbo_stream.update "filters-#{@table.table_id}" do %>

data/config/locales/en.yml

@@ -1,5 +1,9 @@
 en:
   mensa:
+    tables:
+      filters:
+        show:
+          clear: Cancel
     actions: Actions
     save: Save
     update_view: Update view

data/config/locales/nl.yml

@@ -1,5 +1,9 @@
 nl:
   mensa:
+    tables:
+      filters:
+        show:
+          clear: Annuleren
     actions: Acties
     save: Bewaar
     update_view: Bewaar weergave

data/lib/generators/mensa/templates/config/initializers/mensa.rb

@@ -9,14 +9,35 @@ Mensa.setup do |config|
 
   # Override icons in use
   config.icons = {
-    order_indicator_asc: "fa-solid fa-arrow-up",
-    order_indicator_desc: "fa-solid fa-arrow-down",
-    control_bar_search: "fa-solid fa-magnifying-glass",
-    control_bar_filter: "fa-solid fa-filter",
-    control_bar_edit: "fa-solid fa-table-columns",
-    control_bar_compress: "fa-solid fa-compress",
+    add_filter_trigger: "fa-solid fa-circle-plus",
+    add_filter_selected: "fal fa-check",
+    column_customizer_toggle: "fa-solid fa-table-columns",
+    column_customizer_handle: "fa-solid fa-grip-vertical",
+    column_customizer_visibility_on: "fa-solid fa-eye",
+    column_customizer_visibility_off: "fa-solid fa-eye-slash",
+    control_bar_reset: "fa-solid fa-rotate-left",
+    control_bar_save_dropdown: "fa-solid fa-chevron-down",
+    control_bar_view_filters_show: "fa-solid fa-eye",
+    control_bar_view_filters_hide: "fa-solid fa-eye-slash",
     control_bar_export: "fa-solid fa-file-export",
-    search: "fa-solid fa-magnifying-glass",
-    filters_add_filter: "fa-solid fa-plus"
+    empty_state_icon: "fa-solid fa-magnifying-glass",
+    filter_pill_remove: "fa-solid fa-xmark",
+    filter_pill_list_search: "fa-solid fa-magnifying-glass",
+    filter_pill_list_clear: "fa-solid fa-xmark",
+    header_order_indicator_asc: "fa-solid fa-arrow-up",
+    header_order_indicator_desc: "fa-solid fa-arrow-down",
+    views_trigger: "fa-solid fa-sort",
+    views_option_selected: "fa-solid fa-check",
+    views_option_menu: "fa-solid fa-ellipsis",
+    views_option_system: "fa-solid fa-ban",
+    views_rename: "fa-solid fa-pencil",
+    views_duplicate: "fa-solid fa-copy",
+    views_delete: "fa-solid fa-trash",
+    exports_dialog_close: "fa-solid fa-xmark",
+    exports_dialog_submit: "fa-solid fa-file-export",
+    exports_list_delete: "fa-solid fa-trash",
+    exports_list_download: "fa-solid fa-download",
+    exports_list_processing: "fa-solid fa-spinner fa-spin",
+    tables_standard_error: "fa-solid fa-circle-exclamation"
   }
 end

data/lib/mensa/configuration.rb

@@ -41,29 +41,70 @@ module Mensa
     option :logger, default: Rails.logger
     option :base_controller, default: "::ApplicationController"
 
-    # TODO: add all icons below
     option :icons, default: {
-      order_indicator_asc: "fa-solid fa-arrow-up",
-      order_indicator_desc: "fa-solid fa-arrow-down",
-      control_bar_search: "fa-solid fa-magnifying-glass",
-      control_bar_filter: "fa-solid fa-filter",
-      control_bar_edit: "fa-solid fa-table-columns",
-      control_bar_compress: "fa-solid fa-compress",
+      add_filter_trigger: "fa-solid fa-circle-plus",
+      add_filter_selected: "fa-solid fa-check",
+      column_customizer_toggle: "fa-solid fa-table-columns",
+      column_customizer_handle: "fa-solid fa-grip-vertical",
+      column_customizer_visibility_on: "fa-solid fa-eye",
+      column_customizer_visibility_off: "fa-solid fa-eye-slash",
+      control_bar_reset: "fa-solid fa-rotate-left",
+      control_bar_save_dropdown: "fa-solid fa-chevron-down",
+      control_bar_view_filters_show: "fa-solid fa-eye",
+      control_bar_view_filters_hide: "fa-solid fa-eye-slash",
       control_bar_export: "fa-solid fa-file-export",
-      search: "fa-solid fa-magnifying-glass",
-      filters_add_filter: "fa-solid fa-plus"
+      empty_state_icon: "fa-solid fa-magnifying-glass",
+      filter_pill_remove: "fa-solid fa-xmark",
+      filter_pill_list_search: "fa-solid fa-magnifying-glass",
+      filter_pill_list_clear: "fa-solid fa-xmark",
+      header_order_indicator_asc: "fa-solid fa-arrow-up",
+      header_order_indicator_desc: "fa-solid fa-arrow-down",
+      views_trigger: "fa-solid fa-sort",
+      views_option_selected: "fa-solid fa-check",
+      views_option_menu: "fa-solid fa-ellipsis",
+      views_option_system: "fa-solid fa-ban",
+      views_rename: "fa-solid fa-pencil",
+      views_duplicate: "fa-solid fa-copy",
+      views_delete: "fa-solid fa-trash",
+      exports_dialog_close: "fa-solid fa-xmark",
+      exports_dialog_submit: "fa-solid fa-file-export",
+      exports_list_delete: "fa-solid fa-trash",
+      exports_list_download: "fa-solid fa-download",
+      exports_list_processing: "fa-solid fa-spinner fa-spin",
+      tables_standard_error: "fa-solid fa-circle-exclamation"
     }
     # PRO
     # option :icons, default: {
-    #   order_indicator_asc: "fa-regular fa-arrow-up-short-wide",
-    #   order_indicator_desc: "fa-regular fa-arrow-down-wide-short",
-    #   order_indicator: "fa-regular fa-arrow-down-arrow-up",
-    #   control_bar_search: "fa-light fa-magnifying-glass",
-    #   control_bar_filter: "fa-light fa-bars-filter",
-    #   control_bar_edit: "fa-light fa-columns-3",
-    #   control_bar_compress: "fa-light fa-compress",
+    #   add_filter_trigger: "fa-light fa-circle-plus",
+    #   add_filter_selected: "fa-light fa-check",
+    #   column_customizer_toggle: "fa-light fa-columns-3",
+    #   column_customizer_handle: "fa-light fa-grip-vertical",
+    #   column_customizer_visibility_on: "fa-light fa-eye",
+    #   column_customizer_visibility_off: "fa-light fa-eye-slash",
+    #   control_bar_reset: "fa-light fa-rotate-left",
+    #   control_bar_save_dropdown: "fa-light fa-chevron-down",
+    #   control_bar_view_filters_show: "fa-light fa-eye",
+    #   control_bar_view_filters_hide: "fa-light fa-eye-slash",
     #   control_bar_export: "fa-light fa-file-export",
-    #   search: "fa-light fa-magnifying-glass"
+    #   empty_state_icon: "fa-light fa-magnifying-glass",
+    #   filter_pill_remove: "fa-light fa-xmark",
+    #   filter_pill_list_search: "fa-light fa-magnifying-glass",
+    #   filter_pill_list_clear: "fa-light fa-xmark",
+    #   header_order_indicator_asc: "fa-regular fa-arrow-up-short-wide",
+    #   header_order_indicator_desc: "fa-regular fa-arrow-down-wide-short",
+    #   views_trigger: "fa-light fa-sort",
+    #   views_option_selected: "fa-light fa-check",
+    #   views_option_menu: "fa-light fa-ellipsis",
+    #   views_option_system: "fa-light fa-ban",
+    #   views_rename: "fa-light fa-pencil",
+    #   views_duplicate: "fa-light fa-copy",
+    #   views_delete: "fa-light fa-trash",
+    #   exports_dialog_close: "fa-light fa-xmark",
+    #   exports_dialog_submit: "fa-light fa-file-export",
+    #   exports_list_delete: "fa-light fa-trash",
+    #   exports_list_download: "fa-light fa-download",
+    #   exports_list_processing: "fa-light fa-spinner fa-spin",
+    #   tables_standard_error: "fa-light fa-circle-exclamation"
     # }
 
     option :callbacks, default: {
@@ -81,6 +122,7 @@ module Mensa
       end
     }
 
+    # :front or :back (default)
     option :row_actions_position, default: :back
     # It's either :basic or :fuzzy, for fuzzy search you need to have `pg_trgm` extension installed
     option :search, default: :basic

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mensa
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-12 00:00:00.000000000 Z
+date: 2026-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -262,11 +262,13 @@ files:
 - app/tables/mensa/config/column_dsl.rb
 - app/tables/mensa/config/dsl_logic.rb
 - app/tables/mensa/config/filter_dsl.rb
+- app/tables/mensa/config/format_dsl.rb
 - app/tables/mensa/config/render_dsl.rb
 - app/tables/mensa/config/table_dsl.rb
 - app/tables/mensa/config/view_dsl.rb
 - app/tables/mensa/config_readers.rb
 - app/tables/mensa/filter.rb
+- app/tables/mensa/format.rb
 - app/tables/mensa/row.rb
 - app/tables/mensa/scope.rb
 - app/tables/mensa/search.rb
@@ -277,7 +279,6 @@ files:
 - app/views/mensa/tables/filters/show.turbo_stream.erb
 - app/views/mensa/tables/show.html.erb
 - app/views/mensa/tables/show.turbo_stream.erb
-- app/views/mensa/tables/standard_error.html.erb
 - app/views/mensa/tables/views/create.turbo_stream.erb
 - app/views/mensa/tables/views/destroy.turbo_stream.erb
 - app/views/mensa/tables/views/update.turbo_stream.erb

data/app/views/mensa/tables/standard_error.html.erb

@@ -1,9 +0,0 @@
-<turbo-frame id="<%= @frame_id %>">
-  <div class="mensa-empty-state">
-    <div class="mensa-empty-state__icon">
-      <i class="fa-solid fa-circle-exclamation"></i>
-    </div>
-    <h3 class="mensa-empty-state__title">Could not load table</h3>
-    <p class="mensa-empty-state__subtitle"><%= @error_message %></p>
-  </div>
-</turbo-frame>