mensa 0.6.8 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cc6a4c7a0cbea3b05559bad2910becc5458e74137015835b0d8a753d1e8012e
-  data.tar.gz: 65afa4de844a8741a342bbd38e8e717eaa59c35650eef0b4297e8420cd380821
+  metadata.gz: 14b28a5dcb74e6d3bfccaa9180f0ba2299b1c5bff0adc6e9bbd2a17ff2d91c19
+  data.tar.gz: 552b80421e290566218fe4e7e495785f7208ffa8f397fd88859b4e4ad20d6a21
 SHA512:
-  metadata.gz: 3282238437abbc28f4896ff086241eb5a8ff6fb12202691bb7f3f8c85c5cda4677a28406c6f367c582660335853a496c7c7f42ab0ef98518512350d6ef2ff479
-  data.tar.gz: 82374fe57fdf48bae11d6c784bbcc7f4ad2380fc739565500b70a6df49bfbc2392bb1cfde5dba69e23222a85bf3d33a0c38cd1e35dcd4d5d3b33ba47ba65ccaf
+  metadata.gz: 4848da1b5f33354d6dc79a8b6f76ed68e43744706ce34b808910186de399ae19d49e85409a561d11d74376c3a067f411697432664d2274c28a869e83136fdde9
+  data.tar.gz: 400e3c6400043dea964f3958a27704ae1b56dd7c475de8ba4f20a16b3b3b4682582e3229589d285b3f62377db326ff56b0ac17160544aa38369a11f6f4cc92ca

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mensa (0.6.7)
+    mensa (0.6.9)
       csv
       importmap-rails
       pagy (>= 43)

data/README.md

@@ -79,7 +79,7 @@ class UserTable < ApplicationTable
 
   # 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.
+  # If you want to rename it, for example because you don't show all records in your default scope, or override it with filters, add it and give it a name like below.
   view :default do
     name "Default"
     description "Some descriptive text"

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

@@ -5,7 +5,7 @@
         }
 
         &__heading {
-            @apply px-4 pt-2 pb-1 text-xs font-semibold uppercase tracking-wider text-gray-400 dark:text-gray-500;
+            @apply px-4 pt-2 pb-1 text-sm font-semibold tracking-wider text-gray-900 dark:text-gray-500;
         }
 
         &__row {

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

@@ -7,7 +7,7 @@
     <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>
+    <p class="mensa-table__column_customizer__heading"><%= t("mensa.column_customizer.heading") %></p>
     <ul>
       <% table.columns.reject(&:internal?).each do |column| %>
         <li class="mensa-table__column_customizer__row"

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

@@ -19,6 +19,7 @@
         &__input {
             @apply w-full bg-transparent text-xs text-gray-700 dark:text-gray-200 placeholder:text-gray-400;
             /* Override @tailwindcss/forms — direct CSS beats attribute selector specificity */
+            background-color: transparent !important;
             border: none !important;
             outline: none !important;
             box-shadow: none !important;

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

@@ -160,19 +160,19 @@ export default class FilterPillListComponentController extends ApplicationContro
     // Called by the search controller when the query is submitted or reset.
     setQuery(query) {
         if (query && query.length > 0) this._notifyUnsavedState();
-        this.applyState({
-            filters: this.collectFilters(),
+        const state = {
             query,
             view: this.loadView(),
             order: this.loadOrder(),
             page: "",
-        });
+        };
+        if (this.hasPersistedFilters()) state.filters = this.loadFilters();
+        this.applyState(state);
     }
 
     // Called by the views controller when a view tab is selected.
     viewSelected(view) {
         const state = {
-            filters: {},
             query: "",
             view,
             order: this.loadOrder(),
@@ -267,7 +267,6 @@ export default class FilterPillListComponentController extends ApplicationContro
         // buildUrl reads column_order/hidden_columns from localStorage — now empty,
         // so the server receives a completely clean request for the current view.
         this.requestState({
-            filters: {},
             query: "",
             view,
             order: {},
@@ -278,6 +277,7 @@ export default class FilterPillListComponentController extends ApplicationContro
     restoreState() {
         const table = this.mensaTableOutlet;
         const filters = this.loadFilters();
+        const filtersProvided = this.hasPersistedFilters();
         const query = this.loadQuery();
         const view = this.loadView();
         const page = this.loadPage();
@@ -288,6 +288,7 @@ export default class FilterPillListComponentController extends ApplicationContro
         // Show save/reset if any persistent state exists (order, column layout, filters, search)
         if (
             Object.keys(filters).length > 0 ||
+            filtersProvided ||
             query.length > 0 ||
             Object.keys(order).length > 0 ||
             columnOrder.length > 0 ||
@@ -297,7 +298,9 @@ export default class FilterPillListComponentController extends ApplicationContro
         }
 
         const hasFilterOrSearch =
-            Object.keys(filters).length > 0 || query.length > 0;
+            Object.keys(filters).length > 0 ||
+            filtersProvided ||
+            query.length > 0;
         const hasState =
             hasFilterOrSearch ||
             view.length > 0 ||
@@ -319,7 +322,8 @@ export default class FilterPillListComponentController extends ApplicationContro
         this.setSearchField(query);
         this.setViewHighlight(view);
 
-        const state = { filters, query, view, page, order };
+        const state = { query, view, page, order };
+        if (filtersProvided) state.filters = filters;
 
         // No need to show/hide the filter bar — it's always visible.
         // Just apply state and load the frame.
@@ -377,6 +381,12 @@ export default class FilterPillListComponentController extends ApplicationContro
             url.searchParams.set(`order[${columnName}]`, direction);
         });
 
+        if (
+            Object.prototype.hasOwnProperty.call(state, "filters") &&
+            Object.keys(state.filters || {}).length === 0
+        ) {
+            url.searchParams.set("filters", "");
+        }
         if (state.query) url.searchParams.set("query", state.query);
         if (state.view) url.searchParams.set("table_view_id", state.view);
         if (state.page) url.searchParams.set("page", state.page);
@@ -576,7 +586,9 @@ export default class FilterPillListComponentController extends ApplicationContro
     // --- Persistence ---
 
     persistState(state) {
-        this.persistFilters(state.filters || {});
+        if (Object.prototype.hasOwnProperty.call(state, "filters")) {
+            this.persistFilters(state.filters || {});
+        }
         this.persistQuery(state.query || "");
         this.persistView(state.view || "");
         this.persistPage(state.page || "");
@@ -584,10 +596,7 @@ export default class FilterPillListComponentController extends ApplicationContro
     }
 
     persistFilters(filters) {
-        this.writeStorage(
-            this.filtersStorageKey,
-            Object.keys(filters).length > 0 ? JSON.stringify(filters) : null,
-        );
+        this.writeStorage(this.filtersStorageKey, JSON.stringify(filters));
     }
 
     loadFilters() {
@@ -600,6 +609,10 @@ export default class FilterPillListComponentController extends ApplicationContro
         }
     }
 
+    hasPersistedFilters() {
+        return this.readStorage(this.filtersStorageKey) !== null;
+    }
+
     persistQuery(query) {
         this.writeStorage(
             this.searchStorageKey,

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

@@ -8,7 +8,9 @@
    The controller and its column-list ul stay in the DOM so the search-input focus
    handler can still open the column list. */
 .mensa-table--view-filters-hidden
-    .mensa-table__search-bar__pills-area:not(:has(.mensa-filter-pill:not([data-view-filter="true"])))
+    .mensa-table__search-bar__pills-area:not(
+        :has(.mensa-filter-pill:not([data-view-filter="true"]))
+    )
     .mensa-table__add_filter__trigger {
     display: none;
 }
@@ -22,6 +24,24 @@
         @apply flex items-center gap-2 px-2 py-1 border-b border-gray-200 dark:border-gray-600 bg-white dark:bg-gray-800;
     }
 
+    turbo-frame {
+        @apply relative block;
+    }
+
+    turbo-frame[aria-busy] {
+        @apply cursor-wait;
+    }
+
+    turbo-frame[aria-busy] > * {
+        @apply opacity-50 grayscale pointer-events-none;
+    }
+
+    turbo-frame[aria-busy]::after {
+        content: "";
+        @apply absolute inset-0 z-10 bg-gray-50/30 dark:bg-gray-900/50;
+        pointer-events: all;
+    }
+
     &__search-container {
         @apply flex flex-1 min-w-0 items-stretch h-8 rounded-md bg-white dark:bg-gray-800;
     }

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

@@ -41,7 +41,6 @@ export default class TableComponentController extends ApplicationController {
             clearTimeout(this.frameLoadFallback);
             this.frameLoadFallback = null;
         }
-
     }
 
     saveDropdownOutsideHandler(event) {
@@ -149,12 +148,13 @@ export default class TableComponentController extends ApplicationController {
         if (this.hasMensaFilterPillListOutlet) {
             const outlet = this.mensaFilterPillListOutlet;
             const state = {
-                filters: outlet.loadFilters(),
                 query: outlet.loadQuery(),
                 view: outlet.loadView(),
                 order: outlet.loadOrder(),
                 page: outlet.loadPage(),
             };
+            if (outlet.hasPersistedFilters())
+                state.filters = outlet.loadFilters();
             this.turboFrameTarget.setAttribute(
                 "src",
                 outlet.buildUrl(state).toString(),

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

@@ -25,7 +25,7 @@
 }
 
 .mensa-table {
-    @apply bg-white dark:bg-gray-500 dark:border-gray-700;
+    @apply bg-white dark:bg-gray-800 dark:border-gray-800;
 
     .mensa-table__checkbox-col {
         @apply w-7 min-w-7 pl-1 pr-0 text-center;
@@ -84,7 +84,7 @@
         @apply min-w-full divide-y divide-gray-50 dark:divide-gray-800 border-0;
 
         thead {
-            @apply bg-gray-100 top-0 dark:bg-gray-700 dark:font-medium dark:text-gray-400 dark:lowercase;
+            @apply bg-gray-100 top-0 dark:bg-gray-700 dark:font-medium dark:text-gray-400;
 
             /* tr and th moved to header */
         }

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

@@ -1,12 +1,12 @@
 .mensa-table {
   .paging {
-    @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 text-sm;
+    @apply flex items-center justify-between border-t border-gray-100 dark:border-gray-700 bg-white dark:bg-gray-800 px-4 py-3 sm:px-6 text-sm;
 
     .pagy {
       @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-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;
+        @apply relative inline-flex items-center px-4 py-1.5 text-gray-500 dark:text-gray-400 bg-gray-100 dark:bg-gray-800 hover:bg-gray-50 dark:hover:bg-gray-700 focus:z-20 no-underline;
 
         &:first-child {
           border-top-left-radius: 4px;
@@ -24,7 +24,7 @@
 
         &:not([href]) {
           /* disabled links */
-          @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;
+          @apply bg-gray-100 dark:bg-gray-800 hover:bg-gray-100 hover:dark:bg-gray-800 text-gray-700 dark:text-gray-100 text-opacity-25 dark:text-opacity-50 cursor-default;
         }
 
         &.current {

data/app/controllers/mensa/tables_controller.rb

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

data/config/locales/en.yml

@@ -1,5 +1,7 @@
 en:
   mensa:
+    column_customizer:
+      heading: Columns
     tables:
       filters:
         show:

data/config/locales/nl.yml

@@ -1,5 +1,7 @@
 nl:
   mensa:
+    column_customizer:
+      heading: Kolommen
     tables:
       filters:
         show:

data/lib/mensa/configuration.rb

@@ -55,7 +55,7 @@ module Mensa
       control_bar_export: "fa-solid fa-file-export",
       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_search: "fa-solid fa-sm fa-magnifying-glass",
       filter_pill_list_clear: "fa-solid fa-xmark",
       header_order_indicator_asc: "fa-solid fa-sm fa-arrow-up",
       header_order_indicator_desc: "fa-solid fa-sm fa-arrow-down",
@@ -89,7 +89,7 @@ module Mensa
     #   control_bar_export: "fa-light fa-file-export",
     #   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_search: "fa-light fa-sm fa-magnifying-glass",
     #   filter_pill_list_clear: "fa-light fa-xmark",
     #   header_order_indicator_asc: "fa-regular fa-sm fa-arrow-up-short-wide",
     #   header_order_indicator_desc: "fa-regular fa-sm fa-arrow-down-wide-short",

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.6.8"
+  VERSION = "0.6.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mensa
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.10
 platform: ruby
 authors:
 - Tom de Grunt