mensa 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63364b3ef1004b6f44cb7188209c0924553d7e141f52062df2c4e06bf55cca41
-  data.tar.gz: d213f088d9a5f07af9f3502318f23095a0654fb7ea0738a7012c520b0fe5ad21
+  metadata.gz: 486efef62711b15401ec2a9704476bcd3768a7c856c2d21e050b478e23ada619
+  data.tar.gz: 710ba8aa3365038772f309bd74fd13c7271c1a67068615c13c33fac6700ae804
 SHA512:
-  metadata.gz: 7a0aa6a1675642a482b9d616370755f0cd46b315997d3082ac4ecf4d510116f32d235909cf28a3f7e123b427f88dc3f68c3ccd04a2a09dd5f8515fae7d4e4bca
-  data.tar.gz: c89e70746c216146cbaceb589e485dc43a63c37d98f92ad8c420e021eae40f2c04af90130bacd9c90a68b698b0cb57386ff993ce75285638b31361db5dbdb141
+  metadata.gz: cbb1d6a9a8a4bee3f1ef4ea7db1dddf44cee1d00432ab59bbed77be3ba506bcf5c586c3e33d799b54dce3cfc1275968b6f303346b62b5597867b94b888e3d042
+  data.tar.gz: 4e6818cc69caed0ffc36163b69aa604d1d593eb144c684c4e71866d73a79879809acb5ff0cd1a627efbcb0c4c8636b2a103f06dd410f2ef0a13460f0597b6465

data/.devcontainer/devcontainer.json

@@ -24,11 +24,16 @@
         "source=/run/host-services/ssh-auth.sock,target=/ssh-agent,type=bind,consistency=cached",
         "source=${localEnv:HOME}/.gitconfig,target=/home/vscode/.gitconfig,type=bind,consistency=cached"
     ],
+    "initializeCommand": ".devcontainer/initialize.sh",
     "postStartCommand": ".devcontainer/postStart.sh",
     "containerEnv": {
         "VISUAL": "vi",
         "SSH_AUTH_SOCK": "/ssh-agent"
     },
+    // Credentials for the GitHub Packages gem source in the Gemfile
+    "remoteEnv": {
+        "BUNDLE_RUBYGEMS__PKG__GITHUB__COM": "${localEnv:BUNDLE_RUBYGEMS__PKG__GITHUB__COM}"
+    },
     "customizations": {},
-    "workspaceFolder": "/workspaces/mensa"
+    "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}"
 }

data/.devcontainer/docker-compose.yml

@@ -1,11 +1,17 @@
-name: mensa
+name: ${COMPOSE_PROJECT_NAME:-mensa}
 
 services:
   app:
     image: ghcr.io/rails/devcontainer/images/ruby:4.0.5
 
     volumes:
-      - ../..:/workspaces
+      # .env is written by initialize.sh, the defaults are for the main checkout
+      - ${WORKSPACES_ROOT:-../..}:/workspaces
+      # A worktree's .git file points here by absolute path
+      - ${GIT_COMMON_DIR:-../.git}:${GIT_COMMON_DIR:-/workspaces/mensa/.git}
+
+    environment:
+      CAPYBARA_APP_HOST: http://app.${COMPOSE_PROJECT_NAME:-mensa}.orb.local
 
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity

data/.devcontainer/initialize.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# Runs on the host before the containers start, see initializeCommand.
+# Writes the .env docker compose reads, so a git worktree gets its own
+# containers and can use git inside them.
+set -e
+
+cd "$(dirname "$0")/.."
+checkout="$(pwd -P)"
+name="$(basename "$checkout")"
+
+if [ -f .git ]; then
+  # A worktree: its .git file points into the main checkout's .git directory
+  project="mensa-$(echo "$name" | tr '[:upper:]' '[:lower:]' | tr -c 'a-z0-9_-\n' '-')"
+else
+  project="mensa"
+fi
+
+cat > .devcontainer/.env <<EOF
+COMPOSE_PROJECT_NAME=$project
+WORKSPACES_ROOT=$(dirname "$checkout")
+GIT_COMMON_DIR=$(cd "$(git rev-parse --git-common-dir)" && pwd -P)
+EOF

data/.devcontainer/postStart.sh

@@ -11,3 +11,5 @@ sudo chmod 666 /ssh-agent
 "$MISE" exec -- bundle install
 "$MISE" exec --cd test/dummy -- rake db:prepare
 "$MISE" exec --cd test/dummy -- rake tailwindcss:config
+# Propshaft only serves app/assets/builds when it exists at boot
+"$MISE" exec --cd test/dummy -- rake tailwindcss:build

data/.gitignore

@@ -22,3 +22,6 @@ test/dummy/config/tailwind.config.js
 **/**/.DS_Store
 mise.toml
 todo.md
+
+# Written by .devcontainer/initialize.sh
+.devcontainer/.env

data/.shipkit.yml

@@ -1,2 +1,2 @@
 ---
-previous_version: 0.9.3
+previous_version: 0.9.4

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

@@ -7,6 +7,7 @@
      data-mensa-table-target="filterList"
      data-mensa-filter-pill-list-table-name-value="<%= table.name %>"
      data-mensa-filter-pill-list-storage-key-value="<%= table.storage_key %>"
+     data-mensa-filter-pill-list-filters-customized-value="<%= table.filters_customized? %>"
      data-mensa-filter-pill-list-mensa-table-outlet=".mensa-table#table-<%= table.table_id %>"
      data-mensa-filter-pill-list-mensa-filter-pill-outlet=".mensa-filter-pill"
      data-mensa-filter-pill-list-mensa-add-filter-outlet="[data-controller=mensa-add-filter]">

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

@@ -9,6 +9,7 @@ export default class FilterPillListComponentController extends ApplicationContro
         supportsViews: Boolean,
         tableName: String,
         storageKey: String,
+        filtersCustomized: Boolean,
     };
 
     connect() {
@@ -180,7 +181,10 @@ export default class FilterPillListComponentController extends ApplicationContro
             page: "",
         };
         this.persistState(state);
-        // The selected view brings its own grouping
+        // The selected view brings its own filters and grouping. Stored filters
+        // hold the previous view's pills (its defaults included), which would
+        // otherwise be replayed onto this view when the page is visited again.
+        this.writeStorage(this.filtersStorageKey, null);
         this.clearPersistedGrouping();
         this.setSearchField("");
         this.updateSearchPlaceholder();
@@ -210,9 +214,7 @@ export default class FilterPillListComponentController extends ApplicationContro
         const order = this.parseOrderParams(url.searchParams);
         this.persistOrder(order);
 
-        if (Object.keys(order).length > 0) {
-            this._notifyUnsavedState();
-        }
+        this._updateUnsavedState();
     }
 
     currentRequestState() {
@@ -286,21 +288,8 @@ export default class FilterPillListComponentController extends ApplicationContro
         const page = this.loadPage();
         const order = this.loadOrder();
         const columnOrder = this.loadColumnOrder();
-        const hiddenColumns = this.loadHiddenColumns();
 
-        // 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 ||
-            hiddenColumns.length > 0 ||
-            this.loadGroupBy() !== null ||
-            this.loadAggregates() !== null
-        ) {
-            this._notifyUnsavedState();
-        }
+        this._updateUnsavedState();
 
         const hasFilterOrSearch =
             Object.keys(filters).length > 0 ||
@@ -609,6 +598,21 @@ export default class FilterPillListComponentController extends ApplicationContro
         );
     }
 
+    // Whether the table differs from the selected view, so there's something
+    // to save or reset. The server tells whether the rendered filters differ,
+    // as stored filters can equal the view's own.
+    hasUnsavedState() {
+        return (
+            this.filtersCustomizedValue ||
+            this.loadQuery().length > 0 ||
+            Object.keys(this.loadOrder()).length > 0 ||
+            this.loadColumnOrder().length > 0 ||
+            this.loadHiddenColumns().length > 0 ||
+            this.loadGroupBy() !== null ||
+            this.loadAggregates() !== null
+        );
+    }
+
     // Clears all dirty-state localStorage keys so the view is clean after save.
     clearPersistedDirtyState() {
         this.writeStorage(this.filtersStorageKey, null);
@@ -831,6 +835,15 @@ export default class FilterPillListComponentController extends ApplicationContro
         }
     }
 
+    _updateUnsavedState() {
+        if (
+            this.hasMensaTableOutlet &&
+            typeof this.mensaTableOutlet.updateUnsavedState === "function"
+        ) {
+            this.mensaTableOutlet.updateUnsavedState();
+        }
+    }
+
     _notifyUnsavedState() {
         if (
             this.hasMensaTableOutlet &&

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

@@ -185,6 +185,17 @@ export default class TableComponentController extends ApplicationController {
         this.showSaveReset();
     }
 
+    // Shows the save/reset buttons only while something differs from the view,
+    // so they disappear again once a change is undone.
+    updateUnsavedState() {
+        if (!this.hasMensaFilterPillListOutlet) return;
+        if (this.mensaFilterPillListOutlet.hasUnsavedState()) {
+            this.notifyUnsavedState();
+        } else {
+            this.hideSaveReset();
+        }
+    }
+
     // --- Cancel / Reset ---
 
     // Resets all filters, search, and column customisation to the active view's clean state.
@@ -400,6 +411,8 @@ export default class TableComponentController extends ApplicationController {
     // Called when the filter-pill-list outlet connects (including after turbo-stream re-renders).
     // Re-applied on every connect so late-arriving pills (from restoreState) get the right state.
     mensaFilterPillListOutletConnected() {
+        // The pill list is rendered again after every change
+        this.updateUnsavedState();
         const hasViewFilters = this._hasViewFilterPills();
         if (hasViewFilters) {
             const visible = this._loadViewFiltersVisible();

data/app/tables/mensa/base.rb

@@ -106,17 +106,14 @@ module Mensa
     end
 
     def active_filters
-      (config[:filters] || {}).filter_map do |column_name, filter_config|
-        col = column(column_name)
-        # Columns without SQL can only be filtered with a custom scope, skip
-        # filters on them, e.g. from browser state saved earlier
-        next if col.nil? || !(col.sql? || col.filter?)
+      filters_for(config[:filters])
+    end
 
-        definition = config.dig(:columns, col.name, :filter)
-        definition = {} unless definition.is_a?(Hash)
-        requested = (filter_config || {}).to_h.symbolize_keys.slice(:value, :operator)
-        Mensa::Filter.new(column: col, config: definition.merge(requested), table: self)
-      end
+    # True when the filters differ from the selected view's, so there is
+    # something to save or reset
+    def filters_customized?
+      view_filters = (table_view&.config || {}).deep_symbolize_keys[:filters]
+      comparable_filters(active_filters) != comparable_filters(filters_for(view_filters))
     end
 
     def actions?
@@ -273,6 +270,28 @@ module Mensa
 
     private
 
+    def filters_for(filters)
+      (filters || {}).filter_map do |column_name, filter_config|
+        col = column(column_name)
+        # Columns without SQL can only be filtered with a custom scope, skip
+        # filters on them, e.g. from browser state saved earlier
+        next if col.nil? || !(col.sql? || col.filter?)
+
+        definition = config.dig(:columns, col.name, :filter)
+        definition = {} unless definition.is_a?(Hash)
+        requested = (filter_config || {}).to_h.symbolize_keys.slice(:value, :operator)
+        Mensa::Filter.new(column: col, config: definition.merge(requested), table: self)
+      end
+    end
+
+    # Operator and value per column, the value only when the operator takes one
+    def comparable_filters(filters)
+      filters.to_h do |filter|
+        value = Array(filter.value).map(&:to_s).reject(&:blank?).sort if filter.operator_with_value?
+        [filter.column.name, [filter.operator, value]]
+      end
+    end
+
     def ensure_internal_columns_for_joined_associations
       return if @internal_columns_ensured
 

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mensa
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Tom de Grunt
@@ -167,6 +167,7 @@ files:
 - ".devcontainer/devcontainer-lock.json"
 - ".devcontainer/devcontainer.json"
 - ".devcontainer/docker-compose.yml"
+- ".devcontainer/initialize.sh"
 - ".devcontainer/postStart.sh"
 - ".gem_release.yml"
 - ".github/workflows/gem-push.yml"