mensa 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90e14dc2718135075f46900d71242ac7630a141316fc90c48ce393079ecdf1b3
-  data.tar.gz: 2b41788482afea79c43b714cc0b428e9d270674c09285a3f04aae8457001094e
+  metadata.gz: 3a2b7ad58071b68c158f645d3df7547d90f57c27d97bdf3ed079f8f98b4f3c06
+  data.tar.gz: dab761020168bf26e4e2f057652564aaad35831480152e00ab5c4c7ebd629ed7
 SHA512:
-  metadata.gz: 4c1703c80843371867f4eca279df8c090d5c64947e5047fb910f959aee76781a1d3329c97b86f7d64ec9f58d96ad4ca1d4c333a9ea17935c50a3eac9177a68a1
-  data.tar.gz: 83a15ef32543cf462aeaac264f20bf2eb370ff2dab42e6252779a14968e3d364fefcc4d0285f20e176950e3fa07be91e2e0e7185a5a96af8e10ea7764af1da02
+  metadata.gz: aeb2f7ca363b1e966284137490a78b1af5cfc7c8afe6ecd9c2dec3a4c16f1fef118f91f9ef4d5bbcd7cb321561f092fea456333de23926a3ebfc1d6973566912
+  data.tar.gz: edcdb113d4447154c999bf75ca0c40ed9842cd811705831ec69423b3fe9ee461bb9649c7dcf6536454cb49ddbd572bec58438fa21a5c8841fc30014f70274021

data/README.md

@@ -1,21 +1,24 @@
 # Mensa
+
 Fast and awesome tables, with pagination, sorting, filtering and custom views.
 
 Wanted features:
-* [X] very fast
-* [X] row-links
-* [X] sorting
-* [X] tables without headers (and without most of the above)
-* [ ] column sorting
-* [ ] filtering (of multiple columns, single is done)
-* [ ] view selection and exports per view
-* [ ] group by
-* [ ] sum/max/min
-* [ ] tables backed by arrays (of ActiveModel)
+
+- [x] very fast
+- [x] row-links
+- [x] sorting
+- [x] tables without headers (and without most of the above)
+- [ ] column sorting
+- [ ] filtering (of multiple columns, single is done)
+- [ ] view selection and exports per view
+- [ ] group by
+- [ ] sum/max/min
+- [ ] tables backed by arrays (of ActiveModel)
 
 Todo:
-* [ ] Hide filter icon in case there are no filters
-* [ ] Search only works on table columns
+
+- [ ] Hide filter icon in case there are no filters
+- [ ] Search only works on table columns
 
 ## Usage
 
@@ -28,7 +31,7 @@ class UserTable < ApplicationTable
     model User # implicit from name
 
     order name: :desc
-    
+
     column(:name) do
       attribute :name # Optional, we can deduct this from the column name
       sortable true
@@ -49,7 +52,7 @@ class UserTable < ApplicationTable
     # You can add one or more actions to a row
     action :delete do
       link { |user| user_path(user) }
-      icon "fa fa-trash"
+      icon "fa-regular fa-trash"
       link_attributes data: {"turbo-confirm": "Are you sure you want to delete the user?", "turbo-method": :delete}
       show ->(user) { true }
     end
@@ -86,6 +89,7 @@ end
 ```
 
 ## Installation
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -93,21 +97,25 @@ gem "mensa"
 ```
 
 And then execute:
+
 ```bash
 $ bundle
 ```
 
 Or install it yourself as:
+
 ```bash
 $ gem install mensa
 ```
 
 Always use `bundle` to install the gem. Next use the install generator to install migrations, add an initializer and do other setup:
+
 ```bash
 $  bin/rails g mensa:install
 ```
 
 ## Contributing
+
 ```
 Contribution directions go here.
 
@@ -115,3 +123,4 @@ Contribution directions go here.
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+```

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

@@ -3,7 +3,8 @@
     button.flex.justify-right.cursor-pointer.py-1.5.h-full.text-gray-400 class="#{table.supports_views? ? 'w-8' : 'w-4'}" data-action="mensa-table#openFiltersAndSearch"
       - if table.supports_views?
         i class=Mensa.config.icons[:control_bar_search]
-      i class=Mensa.config.icons[:control_bar_filter]
+      - if table.supports_filters?
+        i class=Mensa.config.icons[:control_bar_filter]
     /- if view_columns_sorting?
       button.cursor-pointer.w-6.h-full.text-gray-400
         i class=Mensa.config.icons[:control_bar_edit]

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

@@ -1,62 +1,64 @@
-import ApplicationController from 'mensa/controllers/application_controller'
+import ApplicationController from "mensa/controllers/application_controller"
 
-import { get } from '@rails/request.js'
+import { get } from "@rails/request.js"
 
 export default class SearchComponentController extends ApplicationController {
-  static targets = [
-    'resetSearchButton',
-    'searchInput'
-  ]
-  static outlets = [
-    "mensa-table"
-  ]
-  connect () {
+  static targets = ["resetSearchButton", "searchInput"]
+  static outlets = ["mensa-table"]
+  connect() {
     super.connect()
     this.monitorSearch()
   }
 
-  monitorSearch (event) {
+  monitorSearch(event) {
+    event && event.preventDefault()
+
     if (this.searchInputTarget.value.length >= 1) {
-      this.resetSearchButtonTarget.classList.remove('hidden')
-      this.searchInputTarget.focus();
+      this.resetSearchButtonTarget.classList.remove("hidden")
+      this.searchInputTarget.focus()
     } else {
-      this.resetSearchButtonTarget.classList.add('hidden')
+      this.resetSearchButtonTarget.classList.add("hidden")
     }
   }
 
-  resetSearch (event) {
-    this.searchInputTarget.value = ''
+  resetSearch(event) {
+    event.preventDefault()
+
+    this.searchInputTarget.value = ""
     this.searchInputTarget.focus()
-    this.resetSearchButtonTarget.classList.add('hidden')
+    this.resetSearchButtonTarget.classList.add("hidden")
 
-    let turboFrame = this.element.closest('turbo-frame')
+    let turboFrame = this.element.closest("turbo-frame")
     let url = this.ourUrl
-    url.searchParams.delete('query')
+    url.searchParams.delete("query")
 
     get(url, {
-      responseKind: 'turbo-stream'
+      responseKind: "turbo-stream",
     })
   }
 
-  search (event) {
+  search(event) {
+    event.preventDefault()
+
     if (this.query.length < 3) {
       return
     }
 
     // FIXME: This doesn't prevent searching twice on enter, the turbo-frame URL doesn't change
     let url = this.ourUrl
-    if(url.searchParams.get('query') === this.query) {
+    if (url.searchParams.get("query") === this.query) {
       return
     }
 
-    url.searchParams.append('query', this.query)
+    url.searchParams.set("page", 1)
+    url.searchParams.set("query", this.query)
 
     get(url, {
-      responseKind: 'turbo-stream'
+      responseKind: "turbo-stream",
     })
   }
 
   get query() {
     return this.searchInputTarget.value
   }
-}
+}

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

@@ -1,72 +1,78 @@
-import ApplicationController from 'mensa/controllers/application_controller'
-import { get } from '@rails/request.js'
+import ApplicationController from "mensa/controllers/application_controller";
+import { get } from "@rails/request.js";
 
 export default class TableComponentController extends ApplicationController {
   static targets = [
-    'controlBar',           // Bar with buttons
-    'condenseExpandIcon',   // Icon
-    'filters',              // Tabs or list of filters
-    'views',                // Tabs or list of views
-    'viewButtons',          // Cancel and save buttons for views
-    'search',               // Search bar
-    'view',                 // View contains table element
-    'turboFrame'            // The turbo-frame
-  ]
+    "controlBar", // Bar with buttons
+    "condenseExpandIcon", // Icon
+    "filters", // Tabs or list of filters
+    "views", // Tabs or list of views
+    "viewButtons", // Cancel and save buttons for views
+    "search", // Search bar
+    "view", // View contains table element
+    "turboFrame", // The turbo-frame
+  ];
   static values = {
-    supportsViews: Boolean
-  }
+    supportsViews: Boolean,
+  };
 
-  connect () {
-    super.connect()
+  connect() {
+    super.connect();
   }
 
   openFiltersAndSearch(event) {
-    if(this.supportsViewsValue) {
-      this.viewButtonsTarget.classList.remove('hidden')
-      this.searchTarget.classList.remove('hidden')
-      this.viewsTarget.classList.add('hidden')
-      this.filtersTarget.classList.remove('hidden')
+    event.preventDefault();
+
+    if (this.supportsViewsValue) {
+      this.viewButtonsTarget.classList.remove("hidden");
+      this.searchTarget.classList.remove("hidden");
+      this.viewsTarget.classList.add("hidden");
+      this.filtersTarget.classList.remove("hidden");
     } else {
-      this.controlBarTarget.classList.add('hidden')
-      this.viewButtonsTarget.classList.remove('hidden')
-      this.filtersTarget.classList.remove('hidden')
+      this.controlBarTarget.classList.add("hidden");
+      this.viewButtonsTarget.classList.remove("hidden");
+      this.filtersTarget.classList.remove("hidden");
     }
   }
 
   cancelFiltersAndSearch(event) {
-    if(this.supportsViewsValue) {
-      this.searchTarget.classList.add('hidden')
-      this.viewButtonsTarget.classList.add('hidden')
-      this.filtersTarget.classList.add('hidden')
-      this.viewsTarget.classList.remove('hidden')
+    event.preventDefault();
+
+    if (this.supportsViewsValue) {
+      this.searchTarget.classList.add("hidden");
+      this.viewButtonsTarget.classList.add("hidden");
+      this.filtersTarget.classList.add("hidden");
+      this.viewsTarget.classList.remove("hidden");
     } else {
-      this.controlBarTarget.classList.remove('hidden')
-      this.viewButtonsTarget.classList.add('hidden')
-      this.filtersTarget.classList.add('hidden')
+      this.controlBarTarget.classList.remove("hidden");
+      this.viewButtonsTarget.classList.add("hidden");
+      this.filtersTarget.classList.add("hidden");
     }
   }
 
   saveFiltersAndSearch(event) {
-
+    event.preventDefault();
   }
 
-  condenseExpand (event) {
-    if (this.viewTarget.classList.contains('mensa-table__condensed')) {
-      this.viewTarget.classList.remove('mensa-table__condensed')
-      this.condenseExpandIconTarget.classList.add('fa-compress')
-      this.condenseExpandIconTarget.classList.remove('fa-expand')
+  condenseExpand(event) {
+    event.preventDefault();
+
+    if (this.viewTarget.classList.contains("mensa-table__condensed")) {
+      this.viewTarget.classList.remove("mensa-table__condensed");
+      this.condenseExpandIconTarget.classList.add("fa-compress");
+      this.condenseExpandIconTarget.classList.remove("fa-expand");
     } else {
-      this.viewTarget.classList.add('mensa-table__condensed')
-      this.condenseExpandIconTarget.classList.remove('fa-compress')
-      this.condenseExpandIconTarget.classList.add('fa-expand')
+      this.viewTarget.classList.add("mensa-table__condensed");
+      this.condenseExpandIconTarget.classList.remove("fa-compress");
+      this.condenseExpandIconTarget.classList.add("fa-expand");
     }
   }
 
   export(event) {
-    let url = this.ourUrl
-    url.pathname += ".xlsx"
-    get(url, {
-    }).then(() => {
-    })
+    event.preventDefault();
+
+    let url = this.ourUrl;
+    url.pathname += ".xlsx";
+    get(url, {}).then(() => {});
   }
-}
+}

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

@@ -14,4 +14,4 @@
     .paging
       == pagy_info(table.pagy_details)
       - if table.pagy_details&.pages > 1
-        == pagy_nav(table.pagy_details)
+        == pagy_nav(table.pagy_details, anchor_string: 'data-turbo-frame="_self"')

data/app/components/mensa/view/paging.css

@@ -3,10 +3,10 @@
     @apply flex items-center justify-between border-t border-gray-100 dark:border-gray-600 bg-white dark:bg-gray-800 px-4 py-3 sm:px-6;
 
     .pagy {
-      @apply isolate inline-flex -space-x-px shadow-sm;
+      @apply isolate inline-flex -space-x-px text-gray-500 dark:text-gray-400;
 
       a:not(.gap) {
-        @apply relative inline-flex items-center px-4 py-1.5 text-sm bg-gray-50 dark:bg-gray-800 font-semibold text-opacity-75 text-gray-700 dark:text-gray-400 ring-1 ring-inset ring-gray-300 dark:ring-gray-600 hover:bg-gray-50 dark:hover:bg-gray-700 focus:z-20 focus:outline-offset-0 rounded-none;
+        @apply relative inline-flex items-center px-4 py-1.5 text-gray-500 dark:text-gray-400 bg-gray-100 dark:bg-gray-700 hover:bg-gray-50 dark:hover:bg-gray-700 focus:z-20 no-underline;
 
         &:first-child {
           border-top-left-radius: 4px;
@@ -24,11 +24,11 @@
 
         &:not([href]) {
           /* disabled links */
-          @apply relative inline-flex items-center border border-gray-100 dark:border-gray-600 bg-white dark:bg-gray-800 dark:bg-opacity-75 px-4 py-1.5 text-sm font-medium text-gray-700 dark:text-gray-100 text-opacity-25 dark:text-opacity-50 hover:bg-gray-50 dark:hover:bg-gray-600;
+          @apply bg-gray-100 dark:bg-gray-600 hover:bg-gray-100 hover:dark:bg-gray-600 text-gray-700 dark:text-gray-100 text-opacity-25 dark:text-opacity-50 cursor-default;
         }
 
         &.current {
-          @apply z-10 bg-indigo-600 dark:bg-indigo-500 text-white border dark:text-white border-gray-100 dark:border-gray-600 focus-visible:outline hover:bg-indigo-500 dark:hover:bg-indigo-400 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 dark:focus-visible:outline-indigo-500;
+          @apply z-10 bg-primary-200 dark:bg-primary-800 hover:bg-primary-200 hover:dark:bg-primary-400 text-opacity-75 dark:text-opacity-75 border-none;
         }
       }
 

data/app/tables/mensa/base.rb

@@ -11,6 +11,7 @@ module Mensa
     config_reader :model
     config_reader :link
     config_reader :supports_views?
+    config_reader :supports_filters?
     config_reader :view_condensed?
     config_reader :view_condensed_toggle?
     config_reader :view_columns_sorting?

data/app/tables/mensa/cell.rb

@@ -35,9 +35,9 @@ module Mensa
       when NilClass
         ''
       when TrueClass
-        content_tag(:i, '', class: 'fa fa-check')
+        content_tag(:i, '', class: 'fa-regular fa-check')
       when FalseClass
-        content_tag(:i, '', class: 'fa fa-xmark')
+        content_tag(:i, '', class: 'fa-regular fa-xmark')
       when Date
         respond_to?(:dt) ? dt(value) : value.strftime('%d.%m.%Y')
       when Time, DateTime

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

@@ -31,6 +31,7 @@
 #     link { |user| edit_user_path(user) }
 #
 #     supports_views true
+#     supports_filters true
 #
 #     action :activate do
 #       link { |user| edit_user_path(user) }
@@ -63,6 +64,7 @@ module Mensa::Config
     dsl_option :render, Mensa::Config::RenderDsl
 
     option :supports_views, default: false
+    option :supports_filters, default: true
     option :show_header, default: true
     option :view_columns_sorting, default: true
     option :view_condensed, default: false

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mensa
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails