mensa 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7b9a5dec3359255923794b7bdfd7b0cec906b52748b716da89607b808fac351
-  data.tar.gz: 5551eb56bb39d24c96d266d3e18b5869066ea0128ae53f40818f579480b8f747
+  metadata.gz: fa2c03e8e00ac20aa0a68e6a19b43de5f4262bd7601bf32a51679d9b8bbe7541
+  data.tar.gz: b94c0a5f9a3242fde92cffd8ee19a3add4ef60f95cd594f80cc53c02f525e2f7
 SHA512:
-  metadata.gz: 44287cc7a421ce54a9a7ec8185fa5f73de4e16a69ce930cde7eb2fa72f6f13dc9f86d541851362752f3f45daf5872455775493129e18eef3c38ec5239feed169
-  data.tar.gz: c7f03bdcdb3dbe0640e83097d7f6fca629fe69fa3ec65d6b8315f498fbe0e9fc5e633ef99a94d699fc223fc576c58fb8512dd6ac0684655a43b31b282e5353f9
+  metadata.gz: 623466449dc736362fed892249981bb374b1f76b541272e65205bebbea1b2b20d2f4f0b94d700040849bc297f874a4f1041197b3fb09e69a147649b87920ae56
+  data.tar.gz: 872085623dfbde8c840a2c4fe03f0105c23c46c60c62b00af26c34373731008a163004fa24c668dd49682d93618e0b113c2686e2a138868d08dcdef49572cc60

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# Changelog
+
+## 0.2.4
+
+- Renames the data column on table_views to config
+- Adds descriptions to table view

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mensa (0.2.3)
+    mensa (0.2.4)
       caxlsx_rails (~> 0)
       importmap-rails
       pagy (>= 43)
@@ -122,7 +122,7 @@ GEM
       reline (>= 0.3.8)
     diffy (3.4.4)
     drb (2.2.3)
-    erb (5.1.3)
+    erb (6.0.0)
     erubi (1.13.1)
     globalid (1.3.0)
       activesupport (>= 6.1)
@@ -353,7 +353,7 @@ GEM
       rubocop-performance (~> 1.25.0)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
-    stringio (3.1.7)
+    stringio (3.1.8)
     tailwindcss-rails (3.3.2)
       railties (>= 7.0.0)
       tailwindcss-ruby (~> 3.0)

data/README.md

@@ -70,11 +70,13 @@ class UserTable < ApplicationTable
     link { |user| edit_user_path(user) }
     supports_views true # This table supports custom views
     show_header true
-    view_columns_sorting false # Disabled for now
+    view_columns_ordering false # Disabled for now
     view_condensed false # Default false
     view_condensed_toggle true # Whether to show the toggle, default true
 
     # Add system views
+    # Mensa will always create a systemview (:default) with name 'All' showing all records. 
+    # If you want to rename it, for example because you don't show all records in your default scope, add it and give it a name like below.
     view :concept do
       name "Concept"
       filter :state do
@@ -99,7 +101,7 @@ Custom views are views not defined by the developer (SystemViews) but by the end
 
 Initial support for custom-views is there, but pretty rudimentary:
 
-`Mensa::TableView.create(table: "users", name: "Guests", data: {filters: {role: {value: "guest"}}})`
+`Mensa::TableView.create(table: "users", name: "Guests", config: {filters: {role: {value: "guest"}}})`
 
 ### Fast
 
@@ -124,10 +126,16 @@ end
   export BUNDLE_RUBYGEMS__PKG__GITHUB__COM=ghp_xxxxxxw
   export RBENV_VERSION=$(cat .ruby-version)
   ```
+
 - Run `direnv allow`
+
+If you use devcontainers:
 - Open with Visual Studio Code (or with any other editor) and reopen in container.
 - Run `bin/overmind s`
 
+If you're not using devcontainers:
+- Run `bin/overmind s`
+
 ### Docs
 
 Using the following in your view will render Mensa::Table::Component
@@ -137,7 +145,9 @@ Using the following in your view will render Mensa::Table::Component
 
 The Mensa::Table::Component will render:
 - Mensa::Search::Component
-- Mensa::FilterList::Component
+- Mensa::FilterPillList::Component
+  - Mensa::FilterPill::Component
+  - Mensa::AddFilter::Component
 - Mensa::Views::Component
   - renders a views list
   - Mensa::ControlBar::Component

data/app/assets/stylesheets/mensa/application.css

@@ -1,7 +1,7 @@
 @import '../../../components/mensa/add_filter/component.css';
 @import '../../../components/mensa/cell/component.css';
 @import '../../../components/mensa/control_bar/component.css';
-@import '../../../components/mensa/filter_list/component.css';
+@import '../../../components/mensa/filter_pill_list/component.css';
 @import '../../../components/mensa/header/component.css';
 @import '../../../components/mensa/row_action/component.css';
 @import '../../../components/mensa/search/component.css';

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

@@ -1,4 +1,4 @@
-.sts-table__add_filter data-controller="mensa-add-filter" data-mensa-add-filter-mensa-table-outlet=".mensa-table#table-#{table.table_id}"
+.sts-table__add_filter data-controller="mensa-add-filter" data-mensa-add-filter-mensa-filter-pill-list-outlet="#mensa-filter-pill-list-#{table.table_id}" 
   button.relative.w-full.cursor-default.rounded-md.bg-white.dark:bg-gray-800.py-1.5.pl-3.pr-6.text-left.text-gray-400.dark:text-gray-400.shadow-sm.border.border-dashed.focus:outline-none.focus:ring-2.focus:ring-primary-600.sm:text-sm.sm:leading-6 type="button" data-action="mensa-add-filter#toggle"
     span.mr-2.block.truncate data-mensa-add-filter-target="description"
       = t('.add_filter')
@@ -13,4 +13,4 @@
         .check.hidden.text-primary-600.absolute.inset-y-0.left-0.flex.items-center.pl-3
           .fal.fa-check
 
-  div.hidden.sts-table__add_filter__popover_container data-mensa-add-filter-target="valuePopover" id="mensa-filter-value-#{SecureRandom.base36}"
+  div.hidden.sts-table__add_filter__popover_container data-mensa-add-filter-target="valuePopover" id="mensa-filter-pill-value-#{SecureRandom.base36}"

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

@@ -10,4 +10,4 @@ module Mensa
       end
     end
   end
-end
+end

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

@@ -4,13 +4,14 @@ import { get } from '@rails/request.js'
 
 export default class AddFilterComponentController extends ApplicationController {
   static outlets = [
-    "mensa-table"
+    "mensa-filter-pill-list"
   ]
   static targets = [
     'filterList',     // all filters
     'filterListItem', // individual filters
     'description',    // contains the filter description in the "tab"
-    'valuePopover'    // contains the filter-value
+    'valuePopover',   // contains the filter-value
+    'value'
   ]
   static values = {
     supportsViews: Boolean
@@ -21,7 +22,7 @@ export default class AddFilterComponentController extends ApplicationController
 
     // this.filterValueEntered = debounce(this.filterValueEntered, 500).bind(this)
     // this.filterValueEntered = this.filterValueEntered.bind(this)
-    this.selectedFilterColumn = null
+    this._selectedFilterColumn = null
   }
 
   // Called when you click add-filter
@@ -31,7 +32,7 @@ export default class AddFilterComponentController extends ApplicationController
 
   // Called when you selected a column
   openValuePopover(event) {
-    let url = this.ourUrl
+    let url = this.mensaFilterPillListOutlet.ourUrl
     url.pathname += `/filters/${this.selectedFilterColumn}`
     url.searchParams.append('target', this.valuePopoverTarget.id)
 
@@ -63,26 +64,23 @@ export default class AddFilterComponentController extends ApplicationController
   filterValueEntered(event) {
     this.valuePopoverTarget.classList.add('hidden')
 
-    let url = this.ourUrl
-
-    let filters = url.searchParams.get('filters') || {}
-    this.mensaTableOutlet.mensaFilterOutlets.forEach((filterOutlet) => {
-      url.searchParams.append(`filters[${filterOutlet.columnNameValue}][value]`, filterOutlet.valueValue)
-      url.searchParams.append(`filters[${filterOutlet.columnNameValue}][operator]`, filterOutlet.operatorValue)
-    })
-    // FIXME: Needs better way of getting value
-    url.searchParams.append(`filters[${this.selectedFilterColumn}][value]`, event.target.value)
-
-    get(url, {
-      responseKind: 'turbo-stream'
-    }).then(() => {
-      // FIXME: There should be a better way to do this, possibly using
-      // this.mensaTableOutlet.filterListTarget.addEventListener("turbo:after-stream-render", this.unhide.bind(this)) ?
-      setTimeout(() => {
-        this.mensaTableOutlet.filterListTarget.classList.remove('hidden')
-      }, 50)
-    })
+    this.mensaFilterPillListOutlet.refreshFilters()
     event.preventDefault()
     return false
   }
+
+  reset(event) {
+    this.descriptionTarget.innerText = 'Add filter'
+    this.selectedFilterColumn = null
+    this.valuePopoverTarget.classList.add('hidden')
+  }
+
+
+  get selectedFilterColumn() {
+    return this._selectedFilterColumn
+  }
+
+  set selectedFilterColumn(value) {
+    this._selectedFilterColumn = value
+  }
 }

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

@@ -5,7 +5,7 @@
         i class=Mensa.config.icons[:control_bar_search]
       - if table.supports_filters? && table.filters?
         i class=Mensa.config.icons[:control_bar_filter]
-    /- if view_columns_sorting?
+    /- if view_columns_ordering?
       button.cursor-pointer.w-6.h-full.text-gray-400
         i class=Mensa.config.icons[:control_bar_edit]
     - if view_condensed_toggle?

data/app/components/mensa/control_bar/component.rb

@@ -9,8 +9,8 @@ module Mensa
         @table = table
       end
 
-      def view_columns_sorting?
-        table.view_columns_sorting?
+      def view_columns_ordering?
+        table.view_columns_ordering?
       end
 
       def view_condensed_toggle?

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

@@ -0,0 +1,6 @@
+.relative.mensa-filter-pill data-controller="mensa-filter-pill" data-mensa-filter-pill-column-name-value=filter.column.name data-mensa-filter-pill-value-value=filter.value data-mensa-filter-pill-operator-value=filter.operator
+  button.relative.w-full.cursor-default.rounded-md.bg-white.dark:bg-gray-800.py-1.5.pl-3.text-left.text-gray-900.dark:text-gray-400.shadow-sm.ring-1.ring-inset.ring-gray-300.dark:ring-gray-600.focus:outline-none.focus:ring-2.focus:ring-primary-600.sm:text-sm.sm:leading-6[type="button" aria-haspopup="listbox" aria-expanded="true" aria-labelledby="listbox-label"]
+    span.block.truncate.pr-8
+      = filter
+    span.pointer-events-none.absolute.inset-y-0.right-0.flex.items-center.pr-2
+      .fa.fal.fa-xmark

data/app/components/mensa/filter_pill/component.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Mensa
+  module FilterPill
+    class Component < ::Mensa::ApplicationComponent
+      with_collection_parameter :filter
+
+      attr_reader :filter
+
+      def initialize(filter:)
+        @filter = filter
+      end
+    end
+  end
+end

data/app/components/mensa/{filter → filter_pill}/component_controller.js

@@ -1,6 +1,6 @@
 import ApplicationController from 'mensa/controllers/application_controller'
 
-export default class FilterComponentController extends ApplicationController {
+export default class FilterPillComponentController extends ApplicationController {
   static values = {
     columnName: String,
     operator: String,

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

@@ -0,0 +1,8 @@
+.mensa-table__filters.hidden id="mensa-filter-pill-list-#{table.table_id}" data-controller="mensa-filter-pill-list" data-mensa-table-target="filterList" data-mensa-filter-pill-list-mensa-table-outlet=".mensa-table#table-#{table.table_id}" data-mensa-filter-pill-list-mensa-filter-pill-outlet=".mensa-filter-pill" data-mensa-filter-pill-list-mensa-add-filter-outlet="[data-controller=mensa-add-filter]"
+  .block
+    nav
+      .flex.space-x-2.overflow-none.whitespace-nowrap.scroll-p-0[aria-label="Tabs"]
+        / existing filters first
+        = render Mensa::FilterPill::Component.with_collection(table.active_filters)
+
+        = render Mensa::AddFilter::Component.new(table: table)

data/app/components/mensa/{filter_list → filter_pill_list}/component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mensa
-  module FilterList
+  module FilterPillList
     class Component < ::Mensa::ApplicationComponent
       attr_reader :table
 

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

@@ -0,0 +1,50 @@
+import ApplicationController from 'mensa/controllers/application_controller'
+import { get } from '@rails/request.js'
+
+export default class FilterPillListComponentController extends ApplicationController {
+  static outlets = [
+    "mensa-table",
+    "mensa-filter-pill",
+    "mensa-add-filter"
+  ]
+
+  static targets = [
+  ]
+
+  static values = {
+    supportsViews: Boolean
+  }
+
+  connect() {
+    super.connect()
+  }
+
+  refreshFilters() {
+    let url = this.mensaTableOutlet.ourUrl
+
+    let filters = url.searchParams.get('filters') || {}
+    this.mensaFilterPillOutlets.forEach((filterOutlet) => {
+      url.searchParams.append(`filters[${filterOutlet.columnNameValue}][value]`, filterOutlet.valueValue)
+      url.searchParams.append(`filters[${filterOutlet.columnNameValue}][operator]`, filterOutlet.operatorValue)
+    })
+
+    url.searchParams.append(`filters[${this.mensaAddFilterOutlet.selectedFilterColumn}][value]`, this.mensaAddFilterOutlet.valueTarget.value)
+    url.searchParams.append(`filters[${this.mensaAddFilterOutlet.selectedFilterColumn}][operator]`, 'equals')
+
+
+    get(url, {
+      responseKind: 'turbo-stream'
+    }).then(() => {
+      // FIXME: There should be a better way to do this, possibly using
+      // this.mensaTableOutlet.filterListTarget.addEventListener("turbo:after-stream-render", this.unhide.bind(this)) ?
+      setTimeout(() => {
+        this.mensaTableOutlet.filterListTarget.classList.remove('hidden')
+      }, 50)
+    })
+  }
+
+  get ourUrl() {
+    let url = this.mensaTableOutlet.ourUrl
+    return url
+  }
+}

data/app/components/mensa/header/component.rb

@@ -16,4 +16,4 @@ module Mensa
       end
     end
   end
-end
+end

data/app/components/mensa/row_action/component.rb

@@ -16,4 +16,4 @@ module Mensa
       end
     end
   end
-end
+end

data/app/components/mensa/search/component.html.slim

@@ -1,4 +1,4 @@
-.mensa-table__search data-mensa-table-target="search" data-controller="mensa-search" data-mensa-search-target="search" class="#{table.supports_views? ? 'hidden' : ''}"  data-mensa-search-mensa-table-outlet=".mensa-table#table-#{table.table_id}"
+.mensa-table__search data-mensa-table-target="search" data-controller="mensa-search" data-mensa-search-target="search" class="#{table.supports_views? ? 'hidden' : ''}" data-mensa-search-mensa-table-outlet=".mensa-table#table-#{table.table_id}"
   .flex
     .flex-none.w-6.h-22.text-right.text-gray-500.dark:text-gray-400
       i.cursor-pointer class=Mensa.config.icons[:search]

data/app/components/mensa/search/component.rb

@@ -10,4 +10,4 @@ module Mensa
       end
     end
   end
-end
+end

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

@@ -29,7 +29,7 @@ export default class SearchComponentController extends ApplicationController {
     this.resetSearchButtonTarget.classList.add("hidden")
 
     let turboFrame = this.element.closest("turbo-frame")
-    let url = this.ourUrl
+    let url = this.mensaTableOutlet.ourUrl
     url.searchParams.delete("query")
 
     get(url, {
@@ -45,7 +45,7 @@ export default class SearchComponentController extends ApplicationController {
     }
 
     // FIXME: This doesn't prevent searching twice on enter, the turbo-frame URL doesn't change
-    let url = this.ourUrl
+    let url = this.mensaTableOutlet.ourUrl
     if (url.searchParams.get("query") === this.query) {
       return
     }

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

@@ -1,7 +1,7 @@
-.mensa-table id="table-#{table.table_id}" data-mensa-table-view-condensed-value="#{table.view_condensed?}" data-mensa-table-supports-views-value="#{table.supports_views?}" data-controller="mensa-table" data-mensa-table-mensa-filter-outlet="[data-controller='mensa-filter']"
+.mensa-table id="table-#{table.table_id}" data-mensa-table-view-condensed-value="#{table.view_condensed?}" data-mensa-table-supports-views-value="#{table.supports_views?}" data-controller="mensa-table" data-mensa-table-mensa-filter-pill-outlet="[data-controller='mensa-filter-pill']"
   = render Mensa::Search::Component.new(table: table)
   div id="filters-#{table.table_id}"
-    = render Mensa::FilterList::Component.new(table: table)
+    = render Mensa::FilterPillList::Component.new(table: table)
   - if table.supports_views? && table.show_header?
     = render Mensa::Views::Component.new(table: table)
-  turbo-frame id=table.table_id src=helpers.mensa.table_path(table.name, {turbo_frame_id: table.table_id}.merge(params)) target="_top" loading="lazy" data-mensa-table-target="turboFrame"
+  turbo-frame id=table.table_id src=helpers.mensa.table_url(table.name, {turbo_frame_id: table.table_id}.merge(params)) target="_top" loading="lazy" data-mensa-table-target="turboFrame" data-turbo-permanent=""

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

@@ -2,8 +2,6 @@ import ApplicationController from "mensa/controllers/application_controller";
 import { get } from "@rails/request.js";
 
 export default class TableComponentController extends ApplicationController {
-  static outlets = ["mensa-filter"]
-
   static targets = [
     "controlBar", // Bar with buttons
     "condenseExpandIcon", // Icon
@@ -20,6 +18,9 @@ export default class TableComponentController extends ApplicationController {
 
   connect() {
     super.connect();
+
+    // FIXME: Workaround for https://github.com/hotwired/turbo/issues/886
+    this.turboFrameTarget.removeAttribute('loading');
   }
 
   openFiltersAndSearch(event) {
@@ -77,4 +78,15 @@ export default class TableComponentController extends ApplicationController {
     url.pathname += ".xlsx";
     get(url, {}).then(() => { });
   }
+
+  get ourUrl() {
+    let url
+
+    if (this.turboFrameTarget?.getAttribute('src')) {
+      url = new URL(this.turboFrameTarget.getAttribute('src'))
+    } else {
+      url = new URL(window.location.href)
+    }
+    return url
+  }
 }

data/app/components/mensa/table_row/component.rb

@@ -16,4 +16,4 @@ module Mensa
       end
     end
   end
-end
+end

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

@@ -9,7 +9,7 @@
     nav.flex.justify-between[aria-label="Tabs"]
       .flex.space-x-2.overflow-x-auto.whitespace-nowrap.scroll-p-0
         - table.all_views.each.with_index do |view, index|
-          = link_to(table.path(table_view_id: view.id, turbo_frame_id: table.table_id), "data-turbo-frame": table.table_id, class: "view #{(view.id == table.table_view&.id || view.id == :all && table.table_view.blank?) ? 'selected' : ''}", data: {"mensa-views-target": "view", action: "mensa-views#select", "tippy-content": view.description}) do
+          = link_to(table.path(table_view_id: view.id, turbo_frame_id: table.table_id), "data-turbo-frame": table.table_id, class: "view #{(view.id == table.table_view&.id || view.id == :default && table.table_view.blank?) ? 'selected' : ''}", data: {"mensa-views-target": "view", action: "mensa-views#select", "tippy-content": view.description}) do
             = view.name
 
         - if table.supports_custom_views?

data/app/controllers/mensa/application_controller.rb

@@ -1,4 +1,4 @@
 module Mensa
-  class ApplicationController < ActionController::Base#::Mensa.config.base_controller.constantize
+  class ApplicationController < ::Mensa.config.base_controller.constantize
   end
 end

data/app/controllers/mensa/tables/filters_controller.rb

@@ -5,7 +5,8 @@ module Mensa
 
       class Filter
         include ActiveModel::Model
-        attr_accessor :value
+
+        attr_accessor :column, :value
       end
 
       def index

data/app/controllers/mensa/tables_controller.rb

@@ -1,7 +1,5 @@
 module Mensa
-  class TablesController < ::ApplicationController
-    layout :decide_layout
-
+  class TablesController < ApplicationController
     def show
       @table = Mensa.for_name(params[:id])
 
@@ -21,17 +19,13 @@ module Mensa
       @table.original_view_context = helpers
 
       respond_to do |format|
-        format.turbo_stream
+        format.turbo_stream # Used for filterering
         format.html
         format.xlsx do
           Mensa::ExportJob.perform_later(current_user, params[:id])
-          head 200
+          head :ok
         end
       end
     end
-
-    def decide_layout
-      false if params[:turbo_frame_id]
-    end
   end
 end

data/app/helpers/mensa/application_helper.rb

@@ -1,5 +1,4 @@
 module Mensa
   module ApplicationHelper
-
   end
 end

data/app/javascript/mensa/controllers/application_controller.js

@@ -2,15 +2,15 @@
 import { Controller } from '@hotwired/stimulus'
 
 export default class ApplicationController extends Controller {
-  connect () {
+  connect() {
     this.element[this.identifier] = this
   }
 
-  getController (element, identifier) {
+  getController(element, identifier) {
     return this.application.getControllerForElementAndIdentifier(element, identifier)
   }
 
-  triggerEvent (el, name, data) {
+  triggerEvent(el, name, data) {
     let event
     if (typeof window.CustomEvent === 'function') {
       event = new CustomEvent(name, { detail: data, cancelable: true, bubbles: true })
@@ -21,14 +21,14 @@ export default class ApplicationController extends Controller {
     el.dispatchEvent(event)
   }
 
-  elementScrolled (element) {
+  elementScrolled(element) {
     if (element.scrollHeight - Math.round(element.scrollTop) === element.clientHeight) {
       return true
     }
     return false
   }
 
-  debouncedHover (element, timeout, handler) {
+  debouncedHover(element, timeout, handler) {
     var timeoutId = null
     element.addEventListener(marker, 'mouseover', function () {
       timeoutId = setTimeout(handler, timeout)
@@ -38,20 +38,4 @@ export default class ApplicationController extends Controller {
       clearTimeout(timeoutId)
     })
   }
-
-  get ourUrl () {
-    // This requires the mensaTableOutlet
-    let turboFrame = this.mensaTableOutlet?.turboFrameTarget
-    if(!turboFrame) {
-      turboFrame = this.turboFrameTarget
-    }
-    let url
-
-    if (turboFrame && turboFrame.getAttribute('src')) {
-      url = new URL(turboFrame.getAttribute('src'))
-    } else {
-      url = new URL(window.location.href)
-    }
-    return url
-  }
 }

data/app/javascript/mensa/controllers/index.js

@@ -6,11 +6,11 @@ import { application } from "mensa/controllers/application"
 import AddFilterComponentController from "mensa/components/add_filter/component_controller";
 application.register("mensa-add-filter", AddFilterComponentController);
 
-import FilterComponentController from "mensa/components/filter/component_controller";
-application.register("mensa-filter", FilterComponentController);
+import FilterPillComponentController from "mensa/components/filter_pill/component_controller";
+application.register("mensa-filter-pill", FilterPillComponentController);
 
-import FilterListComponentController from "mensa/components/filter_list/component_controller";
-application.register("mensa-filter-list", FilterListComponentController);
+import FilterPillListComponentController from "mensa/components/filter_pill_list/component_controller";
+application.register("mensa-filter-pill-list", FilterPillListComponentController);
 
 import SearchComponentController from "mensa/components/search/component_controller";
 application.register("mensa-search", SearchComponentController);

data/app/jobs/mensa/export_job.rb

@@ -16,28 +16,27 @@ module Mensa
       context = Mensa.config.callbacks[:export_started].call(user, table_name)
 
       styles = []
-      default_style = { b: true, bg_color: '3B82F6', fg_color: 'FFFFFF', border: { style: :thin, color: '000000' }, sz: 8,
-                        alignment: { vertical: :bottom, horizontal: :left } }
+      default_style = {b: true, bg_color: "3B82F6", fg_color: "FFFFFF", border: {style: :thin, color: "000000"}, sz: 8,
+                       alignment: {vertical: :bottom, horizontal: :left}}
 
       p = Axlsx::Package.new
       p.use_shared_strings = true
 
       wb = p.workbook
 
-      wrap_text = wb.styles.add_style({ format_code: "@", alignment: { horizontal: :left, vertical: :top, wrap_text: true } })
-      nowrap_text = wb.styles.add_style({ format_code: "@", alignment: { horizontal: :left, vertical: :top, wrap_text: false } })
-      number_format = wb.styles.add_style format_code: '#'
-      datetime_format = wb.styles.add_style format_code: "dddd, d mmmm yyyy hh:mm:ss"
-      date_format = wb.styles.add_style format_code: "dddd, d mmmm yyyy"
+      wb.styles.add_style({format_code: "@", alignment: {horizontal: :left, vertical: :top, wrap_text: true}})
+      nowrap_text = wb.styles.add_style({format_code: "@", alignment: {horizontal: :left, vertical: :top, wrap_text: false}})
+      wb.styles.add_style format_code: "#"
+      wb.styles.add_style format_code: "dddd, d mmmm yyyy hh:mm:ss"
+      wb.styles.add_style format_code: "dddd, d mmmm yyyy"
 
       # custom_styles = ActionTable.config.format_config.each_with_object({}) { |(key, value), hash| hash[key] = value[:xlsx_style] if value.key?(:xlsx_style) }
-      custom_style = {}
 
       wb.add_worksheet(name: table_name.first(31)) do |sheet|
         column_widths = []
         # TODO: Separate display columns for export?
         table.display_columns.map.with_index do |column, index|
-          styles[index] = sheet.styles.add_style(default_style) #.merge(column.export_style || {}))
+          styles[index] = sheet.styles.add_style(default_style) # .merge(column.export_style || {}))
           # width = column.export_style.delete(:width)
           # column_widths[index] = width if width
         end
@@ -99,8 +98,8 @@ module Mensa
       end
       stringio.rewind
 
-      attachment = { io: stringio,
-                     content_type: 'application/zip', filename: "#{base_filename}.zip" }
+      attachment = {io: stringio,
+                    content_type: "application/zip", filename: "#{base_filename}.zip"}
       if password.present?
         attachment[:password] = password
       end

data/app/tables/mensa/action.rb

@@ -11,7 +11,9 @@ module Mensa
   class Action
     include ConfigReaders
 
-    attr_reader :name, :table, :config
+    defined_by Mensa::Config::ActionDsl
+
+    attr_reader :name, :table
 
     def initialize(name, config:, table:)
       @name = name