mensa 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cc6a4c7a0cbea3b05559bad2910becc5458e74137015835b0d8a753d1e8012e
-  data.tar.gz: 65afa4de844a8741a342bbd38e8e717eaa59c35650eef0b4297e8420cd380821
+  metadata.gz: f67c16d331466d5a35135268bbf062b7727c81a7c64c4f583bd52de51789665e
+  data.tar.gz: bbf9bf9d3d632d8dff57ac7705d8bbf9c24655bd15988b5867184d85dd0be4a3
 SHA512:
-  metadata.gz: 3282238437abbc28f4896ff086241eb5a8ff6fb12202691bb7f3f8c85c5cda4677a28406c6f367c582660335853a496c7c7f42ab0ef98518512350d6ef2ff479
-  data.tar.gz: 82374fe57fdf48bae11d6c784bbcc7f4ad2380fc739565500b70a6df49bfbc2392bb1cfde5dba69e23222a85bf3d33a0c38cd1e35dcd4d5d3b33ba47ba65ccaf
+  metadata.gz: 1bd546e773170582c0d0ca268648452b19bfc3e046bffcffebddc12f9c93437addcfa8b6ff784e5028abfaeef5a85ac27b4d5869b4a389af12919a8e22377ad9
+  data.tar.gz: aca9e53dc7448a6c041bbd658812f17cecd16fc322f969eb5a7d1426edeaf0b126d3470a2e4688ce7f8327f38d7168aa0b5bfd085ac21556186aac9fb00adab6

data/Gemfile.lock

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

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

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

metadata

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