mensa 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd1d2a591fc88aa9498cf300d61b0c490f648c72ca8a9b827ae8e2c2c54bd8a1
-  data.tar.gz: b332b0aed27c3d6589083ad09032a3b7e326e2e17c54848024ce97628854b76d
+  metadata.gz: 56a69b51d2f62c342f16b42fc0c0d77fc69101e493486eafea8c89cc358bfd9a
+  data.tar.gz: 072b02f3d2ebff3ebcd310643b7be1ccb199024771bdb346fd92be4faa9b6ab0
 SHA512:
-  metadata.gz: 51543cc8be3d7ef4afd908b2130398ec4e35da6555d96d011c7046c054dedc08ab0d4c4460222c1058ef39268665169ccab8d5db9860c4ab2dffb1ab3e672d72
-  data.tar.gz: 4f26ad72658d38d06b7806ce6012982ba0392acdb7567f8beeb61f6201b6f6bdd86e1ed9a374bb92f6faa9318f3b5bf3b8565730e46627eefcfaf3b54edff851
+  metadata.gz: 4a32e5e1ed6b6a195d8ad4913d6497082e7ac72721bd18410b3135ad502eeef74ae7cf0e91bee2dcc0fae41f3be85018e181bad3f16382d5d2b6bf8698fda70a
+  data.tar.gz: a6e26eeecd788492da78499a985fc107697bc7916d6562708aa32b3c58a1c681ed2478ee91070db5df5372628d5f1c77d27a0b482a1f9076187b8e4e66e5431d

data/Gemfile

@@ -7,7 +7,6 @@ gemspec
 
 gem "puma"
 gem "sprockets-rails"
-gem "satis", "~> 2"
 gem "pry"
 gem "capybara", "~> 3.40"
 gem "selenium-webdriver", "~> 4.17"

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    mensa (0.3.0)
+    mensa (0.3.1)
       csv
       importmap-rails
       pagy (>= 43)
+      pg (>= 1.6)
       rails (>= 7.1)
       rubyzip (>= 1.2.2)
       slim
@@ -96,7 +97,6 @@ GEM
     ast (2.4.3)
     base64 (0.3.0)
     bigdecimal (4.1.2)
-    browser (6.2.0)
     builder (3.3.0)
     capybara (3.40.0)
       addressable
@@ -116,7 +116,6 @@ GEM
     debug (1.11.1)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    diffy (3.4.4)
     drb (2.2.3)
     erb (6.0.4)
     erubi (1.13.1)
@@ -135,10 +134,6 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.19.8)
-    jsonb_accessor (1.4.2)
-      activerecord (>= 6.1)
-      activesupport (>= 6.1)
-      pg (>= 0.18.1)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -305,16 +300,6 @@ GEM
       ruby-lsp (>= 0.26.0, < 0.27.0)
     ruby-progressbar (1.13.0)
     rubyzip (3.3.1)
-    satis (2.3.5)
-      browser
-      diffy
-      importmap-rails
-      jsonb_accessor (~> 1.4)
-      rails (>= 6)
-      stimulus-rails
-      tailwindcss-rails
-      turbo-rails
-      view_component
     securerandom (0.4.1)
     selenium-webdriver (4.44.0)
       base64 (~> 0.2)
@@ -418,7 +403,6 @@ DEPENDENCIES
   rubocop-rails
   ruby-lsp
   ruby-lsp-rails
-  satis (~> 2)
   selenium-webdriver (~> 4.17)
   slim (~> 5.2)
   sprockets-rails

data/README.md

@@ -1,6 +1,6 @@
 # Mensa
 
-Fast and awesome tables, with pagination, sorting, filtering and custom views.
+Fast and awesome tables, with pagination, sorting, filtering, batch processing, column hiding, column ordering and custom views.
 
 ![table](./docs/table.png)
 ![filters](./docs/filters.png)
@@ -12,13 +12,13 @@ Features:
 - [x] very fast
 - [x] row-links
 - [x] sorting
-- [x] tables without headers (and without most of the above)
 - [x] filtering of multiple columns
 - [X] Hide filter icon in case there are no filters
 - [X] column ordering
 - [X] editing of existing filters
 - [X] view selection and exports per view
 - [X] multiple selection of rows and batch processing
+- [x] tables without headers (and without most of the above)
 
 Todo/Fixme:
 - [ ] exports can be mailed - daily/weekly/monthly/quarterly/bi-yearly/yearly (time configurable)

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

@@ -1,5 +1,4 @@
 import ApplicationController from "mensa/controllers/application_controller";
-// import { debounce } from '@entdec/satis'
 import { get } from "@rails/request.js";
 
 // Survives the turbo-stream re-render that destroys both the filter-pill-list

data/app/components/mensa/application_component.rb

@@ -4,7 +4,6 @@ module Mensa
   class ApplicationComponent < ViewComponent::Base
     include ViewComponent::Slotable
     include ActionView::Helpers::TranslationHelper
-    include Satis::Concerns::ContextualTranslations
     include Mensa::ApplicationHelper
 
     attr_accessor :original_view_context

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

@@ -60,7 +60,7 @@ export default class SelectionController extends ApplicationController {
         this.updateSelectionState();
     }
 
-    // Stops click events from bubbling up to the row's satis-link handler,
+    // Stops click events from bubbling up to the row's mensa-link handler,
     // preventing accidental navigation when the user clicks a checkbox cell.
     stopPropagation(event) {
         event.stopPropagation();

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/lib/mensa/engine.rb

@@ -1,11 +1,11 @@
 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.2"
 end

data/mensa.gemspec

@@ -33,6 +33,7 @@ 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"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mensa
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Tom de Grunt
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '43'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: textacular
   requirement: !ruby/object:Gem::Requirement
@@ -272,6 +286,7 @@ files:
 - app/javascript/mensa/controllers/application.js
 - app/javascript/mensa/controllers/application_controller.js
 - app/javascript/mensa/controllers/index.js
+- app/javascript/mensa/controllers/link_controller.js
 - app/jobs/mensa/application_job.rb
 - app/jobs/mensa/export_job.rb
 - app/models/concerns/.keep