mensa 0.3.1 → 0.3.3

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

@@ -0,0 +1,74 @@
+<% current_view = table.all_views.find { |v| v.id == table.table_view&.id } || table.all_views.first %>
+<% current_view_name = current_view&.name || t(".all", default: "All") %>
+<% current_view_id = current_view&.id || "" %>
+
+<div class="mensa-table__views"
+     id="mensa-views-<%= table.table_id %>"
+     data-mensa-table-target="views"
+     data-controller="mensa-views"
+     data-mensa-views-mensa-filter-pill-list-outlet="#mensa-filter-pill-list-<%= table.table_id %>"
+     data-mensa-views-table-id-value="<%= table.table_id %>"
+     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>
+  </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) %>
+        <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>
+            <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>
+            </button>
+          <% else %>
+            <div class="mensa-table__views__option-system">
+              <i class="fa-solid fa-ban"></i>
+            </div>
+          <% end %>
+        </li>
+      <% end %>
+    </ul>
+
+    <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>
+        <%= 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>
+        <%= 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>
+        <%= t(".delete_view", default: "Delete view") %>
+      </button>
+    </div>
+  </div>
+
+  <dialog class="mensa-table__views__rename-dialog" data-mensa-views-target="renameDialog" data-action="click->mensa-views#renameDialogBackdrop">
+    <form class="mensa-table__views__rename-form" data-action="submit->mensa-views#confirmRename">
+      <input type="hidden" data-mensa-views-target="renameViewId">
+      <h3 class="mensa-table__views__rename-title"><%= t(".rename_view", default: "Rename view") %></h3>
+      <label class="mensa-table__views__rename-label">
+        <%= t(".view_name", default: "Name") %>
+        <input class="mensa-table__views__rename-input" type="text" required placeholder="<%= t(".view_name_placeholder", default: "View name") %>" data-mensa-views-target="renameInput">
+      </label>
+      <div class="mensa-table__views__rename-actions">
+        <button class="mensa-table__views__rename-btn mensa-table__views__rename-btn--secondary" type="button" data-action="mensa-views#cancelRename">
+          <%= t(".cancel", default: "Cancel") %>
+        </button>
+        <button class="mensa-table__views__rename-btn mensa-table__views__rename-btn--primary" type="submit">
+          <%= t(".rename", default: "Rename") %>
+        </button>
+      </div>
+    </form>
+  </dialog>
+</div>

data/app/helpers/mensa/application_helper.rb

@@ -1,8 +1,21 @@
 module Mensa
   module ApplicationHelper
     def table(name, config = {}, **options)
-      options[:original_view_context] = self
-      render(::Mensa::Table::Component.new(name, config, **options))
+      component = ::Mensa::Table::Component.new(name, config, **options)
+      component.original_view_context = self
+      render(component)
+    end
+
+    def respond_to_missing?(method, include_private = false)
+      if method.to_s.ends_with?("_url") || method.to_s.ends_with?("_path") && main_app.respond_to?(method)
+        true
+      else
+        super
+      end
+    end
+
+    def method_missing(method, *args, **kwargs, &block)
+      main_app.send(method, *args, **kwargs, &block)
     end
   end
 end

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

@@ -1,7 +1,7 @@
 import { application } from "mensa/controllers/application";
 
-// import AddFilterComponentController from 'components/add_filter/component_controller';
-// application.register('mensa-add-filter', AddFilterComponentController)
+import LinkController from "mensa/controllers/link_controller";
+application.register("mensa-link", LinkController);
 
 import AddFilterComponentController from "mensa/components/add_filter/component_controller";
 application.register("mensa-add-filter", AddFilterComponentController);

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

@@ -0,0 +1,44 @@
+import ApplicationController from "mensa/controllers/application_controller";
+
+/*
+ * Link controller
+ *
+ *   div data-controller="mensa-link" href="" data-turbo="false" target="_blank" data-action='click->mensa-link#follow'
+ *
+ */
+export default class LinkController extends ApplicationController {
+    connect() {
+        super.connect();
+    }
+
+    follow(event) {
+        if (
+            event.target.tagName != this.element.tagName &&
+            event.target.closest(this.element.tagName.toLowerCase()) !=
+                this.element
+        ) {
+            // Don't do this anymore when both tagNames are the same (the one you click and the element with the controller
+            // This is in to make sure row-links using mensa-link controller will not trigger when an A or an SVG in that A is triggered.
+            return;
+        }
+
+        if (
+            event.target != this.element &&
+            event.target.closest("a") != undefined
+        ) {
+            // There is an 'a' tag inside the 'mensa-link' tag, and we just clicked on it.
+            return;
+        }
+
+        if (event.metaKey || event.ctrlKey) {
+            window.open(this.element.getAttribute("href"), "_blank");
+        } else if (this.element.getAttribute("data-turbo") == "false") {
+            window.open(
+                this.element.getAttribute("href"),
+                this.element.getAttribute("target"),
+            );
+        } else {
+            Turbo.visit(this.element.getAttribute("href"));
+        }
+    }
+}

data/app/tables/mensa/base.rb

@@ -129,12 +129,6 @@ module Mensa
       )
     end
 
-    def menu
-      Satis::Menus::Builder.build([:table, :view_menu]) do |m|
-        m.item :export, icon: "fal fa-file-export", link: nil
-      end
-    end
-
     def all_views
       views = system_views
       views += TableView.where(table_name: name).where(user: [nil, current_user])

data/app/tables/mensa/column.rb

@@ -46,7 +46,7 @@ module Mensa
     end
 
     def active_record_column
-      @active_record_column ||= table.model&.columns&.find { _1.name == name.to_s }
+      @active_record_column ||= table.model&.columns&.find { it.name == name.to_s }
     end
 
     def active_record_column_type
@@ -85,14 +85,5 @@ module Mensa
         name.to_s.humanize
       end
     end
-
-    def menu
-      Satis::Menus::Builder.build(:filter_menu, event: "click") do |m|
-        if sortable?
-          m.item :sort_ascending, icon: "fa-solid fa-arrow-up-short-wide", link: table.path(order: {name => :asc}), link_attributes: {"data-turbo-frame": "_self"}
-          m.item :sort_descending, icon: "fa-solid fa-arrow-down-wide-short", link: table.path(order: {name => :desc}), link_attributes: {"data-turbo-frame": "_self"}
-        end
-      end
-    end
   end
 end

data/app/tables/mensa/row.rb

@@ -26,7 +26,7 @@ module Mensa
     def link_attributes
       return {} unless link
 
-      {href: link, data: {controller: "satis-link", action: "click->satis-link#follow tap->satis-link#follow"}}
+      {href: link, data: {controller: "mensa-link", action: "click->mensa-link#follow tap->mensa-link#follow"}}
     end
 
     def link

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

@@ -0,0 +1,6 @@
+<% count = Mensa::Export.completed_count(table_name, user) %>
+<span id="<%= Mensa::Export.badge_dom_id(table_name, user) %>"
+      class="mensa-table__control_bar__badge <%= 'hidden' unless count.positive? %>"
+      aria-hidden="<%= count.positive? ? 'false' : 'true' %>">
+  <%= count %>
+</span>

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

@@ -0,0 +1,52 @@
+<% user = table.current_user %>
+<% exports = Mensa::Export.for_table(table.name).for_user(user).recent %>
+<dialog class="mensa-table__export-dialog" data-mensa-table-target="exportDialog" data-action="click->mensa-table#exportDialogBackdrop">
+  <div class="mensa-table__export-dialog__panel">
+    <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>
+      </button>
+    </header>
+
+    <div class="mensa-table__export-dialog__body">
+      <%= render partial: "mensa/exports/list", locals: {table_name: table.name, user: user, exports: exports} %>
+
+      <form class="mensa-table__export-dialog__form" data-action="submit->mensa-table#confirmExport">
+        <fieldset class="mensa-table__export-dialog__fieldset">
+          <legend class="mensa-table__export-dialog__section-title"><%= t("mensa.exports.new_export", default: "New export") %></legend>
+          <label class="mensa-table__export-dialog__option">
+            <input type="radio" name="scope" value="all" checked>
+            <span><%= t("mensa.exports.scope_all", default: "All records (matching current filters)") %></span>
+          </label>
+          <label class="mensa-table__export-dialog__option">
+            <input type="radio" name="scope" value="current_page">
+            <span><%= t("mensa.exports.scope_current_page", default: "Current page") %></span>
+          </label>
+        </fieldset>
+
+        <fieldset class="mensa-table__export-dialog__fieldset">
+          <legend class="mensa-table__export-dialog__section-title"><%= t("mensa.exports.export_as", default: "Export as") %></legend>
+          <label class="mensa-table__export-dialog__option">
+            <input type="radio" name="export_format" value="csv_excel" checked>
+            <span><%= t("mensa.exports.format_excel", default: "CSV for Excel, Numbers, or other spreadsheet programs") %></span>
+          </label>
+          <label class="mensa-table__export-dialog__option">
+            <input type="radio" name="export_format" value="plain_csv">
+            <span><%= t("mensa.exports.format_plain", default: "Plain CSV file") %></span>
+          </label>
+        </fieldset>
+
+        <div class="mensa-table__export-dialog__actions">
+          <button class="mensa-table__export-dialog__button mensa-table__export-dialog__button--secondary" type="button" data-action="mensa-table#cancelExport">
+            <%= 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>
+            <%= t("mensa.exports.submit", default: "Export") %>
+          </button>
+        </div>
+      </form>
+    </div>
+  </div>
+</dialog>

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

@@ -0,0 +1,32 @@
+<div id="<%= Mensa::Export.list_dom_id(table_name, user) %>" class="mensa-table__export-dialog__downloads">
+  <h3 class="mensa-table__export-dialog__section-title"><%= t("mensa.exports.available_downloads", default: "Available downloads") %></h3>
+  <% if exports.blank? %>
+    <p class="mensa-table__export-dialog__empty"><%= t("mensa.exports.empty", default: "You have no downloads yet. Create one below.") %></p>
+  <% else %>
+    <ul class="mensa-table__export-dialog__list">
+      <% exports.each do |export| %>
+        <li class="mensa-table__export-dialog__item">
+          <div class="mensa-table__export-dialog__item-info">
+            <span class="mensa-table__export-dialog__item-name"><%= export.filename.presence || t("mensa.exports.item_name", default: "%{table} export", table: export.table_name.to_s.humanize) %></span>
+            <span class="mensa-table__export-dialog__item-meta"><%= export.created_at.strftime("%Y-%m-%d %H:%M") %></span>
+          </div>
+          <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>
+                <%= t("mensa.exports.download", default: "Download") %>
+              <% end %>
+            <% elsif export.failed? %>
+              <span class="mensa-table__export-dialog__status mensa-table__export-dialog__status--failed"><%= t("mensa.exports.failed", default: "Failed") %></span>
+            <% else %>
+              <span class="mensa-table__export-dialog__status mensa-table__export-dialog__status--pending">
+                <i class="fa-solid fa-spinner fa-spin"></i>
+                <%= t("mensa.exports.processing", default: "Preparing…") %>
+              </span>
+            <% end %>
+          </div>
+        </li>
+      <% end %>
+    </ul>
+  <% end %>
+</div>

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

@@ -0,0 +1,58 @@
+<%= turbo_stream.update params[:target] do %>
+  <div class="mensa-table__add_filter__popover_container__heading"><%= @column.human_name %></div>
+  <% if @column.filter.operator_with_value? %>
+    <% collection = @column.filter.collection %>
+    <% if collection.present? %>
+      <% unless @multiple %>
+        <input type="hidden" data-mensa-add-filter-target="value" value="<%= @values.first %>">
+      <% end %>
+      <ul class="mensa-table__add_filter__popover_container__values" data-multiple="<%= 'true' if @multiple %>">
+        <% collection.each do |item| %>
+          <% opt_label = item.is_a?(Array) ? item.first.to_s : item.to_s %>
+          <% opt_value = item.is_a?(Array) ? item.last.to_s : item.to_s %>
+          <% is_selected = @values.include?(opt_value) %>
+          <li class="mensa-table__add_filter__popover_container__value"
+              data-mensa-add-filter-target="valueOption"
+              data-value="<%= opt_value %>"
+              data-label="<%= opt_label %>"
+              data-selected="<%= 'true' if is_selected %>"
+              data-action="click->mensa-add-filter#selectValue mouseenter->mensa-add-filter#highlightItem">
+            <% if @multiple %>
+              <span class="mensa-table__add_filter__checkbox<%= ' mensa-table__add_filter__checkbox--checked' if is_selected %>"></span>
+            <% else %>
+              <i class="mensa-table__add_filter__popover_container__value__check fa-solid fa-check<%= ' invisible' unless is_selected %>"></i>
+            <% end %>
+            <span class="flex-1"><%= opt_label %></span>
+            <span class="mensa-table__add_filter__enter-hint">↵ Enter</span>
+          </li>
+        <% end %>
+      </ul>
+    <% else %>
+      <input class="mensa-table__add_filter__popover_container__input"
+             type="<%= @column.filter.input_type %>"
+             value="<%= @values.first %>"
+             autocomplete="off"
+             inputmode="<%= @column.type == :integer ? 'numeric' : nil %>"
+             step="<%= @column.type == :integer ? 1 : (@column.type == :datetime ? 1 : nil) %>"
+             data-mensa-add-filter-target="value"
+             data-action="input->mensa-add-filter#manualValueChanged keydown.enter->mensa-add-filter#applyManualValue">
+    <% end %>
+    <hr class="mensa-table__add_filter__popover_container__separator">
+  <% end %>
+  <ul class="mensa-table__add_filter__popover_container__operators">
+    <% @column.filter.operators.each do |operator_name, label, requires_value| %>
+      <li class="mensa-table__add_filter__popover_container__operator"
+          data-mensa-add-filter-target="operatorOption"
+          data-operator="<%= operator_name %>"
+          data-requires-value="<%= requires_value ? 'true' : 'false' %>"
+          data-selected="<%= 'true' if @operator == operator_name.to_s %>"
+          data-action="click->mensa-add-filter#selectOperator mouseenter->mensa-add-filter#highlightItem">
+        <i class="mensa-table__add_filter__popover_container__operator__check fa-solid fa-check<%= ' invisible' unless @operator == operator_name.to_s %>"></i>
+        <span class="flex-1"><%= label %></span>
+        <span class="mensa-table__add_filter__enter-hint">↵ Enter</span>
+      </li>
+    <% 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>
+<% end %>

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

@@ -0,0 +1,5 @@
+Test
+<button class="text-xs">Esc</button>
+<turbo-frame id="<%= @table.table_id %>" target="_top">
+  <%= render Mensa::View::Component.new(@table) %>
+</turbo-frame>

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

@@ -0,0 +1,7 @@
+<%= turbo_stream.update "filters-#{@table.table_id}" do %>
+  <%= render Mensa::FilterPillList::Component.new(table: @table) %>
+<% end %>
+
+<%= turbo_stream.update @table.table_id do %>
+  <%= render Mensa::View::Component.new(@table) %>
+<% end %>

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

@@ -0,0 +1,11 @@
+<%= turbo_stream.replace "mensa-views-#{@table.table_id}" do %>
+  <%= render Mensa::Views::Component.new(table: @table) %>
+<% end %>
+
+<%= turbo_stream.update "filters-#{@table.table_id}" do %>
+  <%= render Mensa::FilterPillList::Component.new(table: @table) %>
+<% end %>
+
+<%= turbo_stream.update @table.table_id do %>
+  <%= render Mensa::View::Component.new(@table) %>
+<% end %>

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

@@ -0,0 +1,11 @@
+<%= turbo_stream.replace "mensa-views-#{@table.table_id}" do %>
+  <%= render Mensa::Views::Component.new(table: @table) %>
+<% end %>
+
+<%= turbo_stream.update "filters-#{@table.table_id}" do %>
+  <%= render Mensa::FilterPillList::Component.new(table: @table) %>
+<% end %>
+
+<%= turbo_stream.update @table.table_id do %>
+  <%= render Mensa::View::Component.new(@table) %>
+<% end %>

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

@@ -0,0 +1,11 @@
+<%= turbo_stream.replace "mensa-views-#{@table.table_id}" do %>
+  <%= render Mensa::Views::Component.new(table: @table) %>
+<% end %>
+
+<%= turbo_stream.update "filters-#{@table.table_id}" do %>
+  <%= render Mensa::FilterPillList::Component.new(table: @table) %>
+<% end %>
+
+<%= turbo_stream.update @table.table_id do %>
+  <%= render Mensa::View::Component.new(@table) %>
+<% end %>

data/lib/generators/mensa/table_generator.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "rails/generators"
+
+module Mensa
+  class TableGenerator < ::Rails::Generators::NamedBase
+    desc "Generates a table"
+
+    source_root File.expand_path("templates", __dir__)
+
+    def copy_table_file
+      template "table.rb", "app/tables/#{name}_table.rb"
+    end
+  end
+end

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

@@ -1,17 +1,16 @@
 Mensa.setup do |config|
   # Callbacks for exporting of tables
   config.callbacks = {
-    export_started: lambda do |user_id, table_name|
+    export_started: lambda do |export|
     end,
-    export_completed: lambda do |user_id, table_name, context, attachment|
+    export_completed: lambda do |export|
     end
   }
 
   # Override icons in use
   config.icons = {
-    order_indicator_asc: "fa-solid fa-sort-up",
-    order_indicator_desc: "fa-solid fa-sort-down",
-    order_indicator: "fa-solid fa-sort",
+    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",

data/lib/generators/mensa/templates/table.rb.tt

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class <%= name.camelize %>Table < Mensa::Base
+  model <%= name.camelize %>
+
+  <%-
+  klass = class_name&.safe_constantize
+  if klass.present?
+  -%>
+  <%- klass.columns.each do |column| -%>
+  column(:<%= column.name %>)
+    <%- end -%>
+  <%- end -%>
+
+  scope do
+    <%= class_name %>.all
+  end
+end

data/lib/mensa/engine.rb

@@ -1,11 +1,10 @@
 require "pagy"
-require "satis"
 require "textacular"
-require "slim"
 require "tailwindcss-rails"
 require "importmap-rails"
 require "turbo-rails"
 require "stimulus-rails"
+require "view_component"
 
 module Mensa
   class Engine < ::Rails::Engine

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

data/mensa.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
     Mensa requires additional setup. Please run the following
     command to install the necessary files:
 
-    bin/rails mensa:install:migrations
+    rails g mensa:install
+    rails mensa:install:migrations
   MESSAGE
 
   spec.metadata["homepage_uri"] = spec.homepage
@@ -33,14 +34,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "csv"
   spec.add_dependency "rubyzip", ">= 1.2.2"
   spec.add_dependency "pagy", ">=43"
+  spec.add_dependency "pg", ">= 1.6"
   spec.add_dependency "textacular", ">=5"
   spec.add_dependency "view_component", "~> 3.11"
 
-  spec.add_dependency "slim"
   spec.add_dependency "tailwindcss-rails", "~> 3.3"
   spec.add_dependency "importmap-rails"
   spec.add_dependency "turbo-rails"
   spec.add_dependency "stimulus-rails"
-
-  spec.add_development_dependency "sqlite3", "~> 2.8"
 end