mensa 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43d7fc2be92ed19588de7ea2ea168ae560e8ac5c5b09fd5e13600a561ad8dc0a
-  data.tar.gz: bb86cb4e8403f99dfbd9aa1ea2acfe596c2764430be5bc64a0951795c14a7059
+  metadata.gz: 26fd935a365687d3697fba9e5e06f75c3a155d6e9422a747ef7d6b766833d411
+  data.tar.gz: 9032b4e163d6c5134ea150eded49257f6f2961d42ec86eeb75cddb19e6d23a1a
 SHA512:
-  metadata.gz: 6c6abafca7fd4e75772c146277e1623ad2acc4947914d6cf7158232500dc6f07480e2a8b725ac1e041b896ebfbd60fde468392b6ebfa7892eb74a593b1af2d57
-  data.tar.gz: ad3b6c8c7d2e9844e51959f7bc2365094d17a07cdf996945fc002569a134f64382c5cd136cea1306d61f3b9697fb9fa4377a763367935f62a69e1b8a7afbe8a4
+  metadata.gz: bd33a7ddc5b40a802400ea2502d7d8e92f8f4089db08916d44442c3aa58cc504cab655d91f4429899669184bf152a744d825f8b414a2463efc595ceb50699d8b
+  data.tar.gz: b471c31518be76619303f3e0ec763df42fba446b6ec0d2a2fa02c576ad941e050ad69a69569accd91bf13e7a98930a46e4576e155a84f9e998815ac7d86a4a2f

data/Gemfile.lock

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

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

@@ -25,7 +25,7 @@
         }
 
         &__popover_container {
-            @apply p-4 fixed z-50 w-72 rounded-lg bg-white dark:bg-gray-800 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm;
+            @apply p-4 fixed z-50 w-96 max-h-96 overflow-y-auto rounded-lg bg-white dark:bg-gray-800 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm;
 
             &__heading {
                 @apply font-semibold text-gray-900 dark:text-gray-100 mb-2;
@@ -40,7 +40,7 @@
             }
 
             &__values {
-                @apply mb-2 max-h-[20rem] overflow-y-scroll;
+                @apply mb-2;
             }
 
             &__value {

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

@@ -9,7 +9,7 @@
     <i class="<%= Mensa.config.icons[:add_filter_trigger] %>"></i>
   </button>
 
-  <ul class="hidden fixed z-50 max-h-96 overflow-auto rounded-lg bg-white p-2 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none dark:bg-gray-800 sm:text-sm"
+  <ul class="hidden fixed z-50 w-96 max-h-96 overflow-auto rounded-lg bg-white p-2 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none dark:bg-gray-800 sm:text-sm"
       data-mensa-add-filter-target="filterList">
     <% table.columns.select(&:filter?).each do |column| %>
       <li class="text-gray-900 hover:bg-gray-100 relative flex cursor-default select-none items-center gap-2 rounded-md px-3 py-2 dark:text-gray-300 dark:hover:bg-gray-700"

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

@@ -1,7 +1,7 @@
 .mensa-table {
     &__column_customizer {
         &__popover {
-            @apply fixed z-50 w-64 rounded-xl bg-white dark:bg-gray-800 shadow-lg ring-1 ring-black ring-opacity-5 py-2;
+            @apply fixed z-50 w-96 max-h-96  rounded-xl bg-white dark:bg-gray-800 shadow-lg ring-1 ring-black ring-opacity-5 py-2;
         }
 
         &__heading {

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

@@ -6,6 +6,7 @@
      data-mensa-table-views-url-value="<%= helpers.mensa.table_views_path(table.name) %>"
      data-mensa-table-exports-url-value="<%= helpers.mensa.table_exports_path(table.name) %>"
      data-controller="mensa-table"
+     data-action="click@document->mensa-table#saveDropdownOutsideHandler"
      data-mensa-table-mensa-filter-pill-outlet="[data-controller='mensa-filter-pill']"
      data-mensa-table-mensa-filter-pill-list-outlet="#mensa-filter-pill-list-<%= table.table_id %>"
      data-mensa-table-mensa-column-customizer-outlet="[data-controller='mensa-column-customizer']">
@@ -25,5 +26,9 @@
     <%= render Mensa::ControlBar::Component.new(table: table) %>
   </div>
   <%= render Mensa::Search::Component.new(table: table) %>
-  <turbo-frame id="<%= table.table_id %>" target="_top" data-mensa-table-target="turboFrame" data-turbo-permanent=""></turbo-frame>
+  <turbo-frame id="<%= table.table_id %>"
+               target="_top"
+               data-mensa-table-target="turboFrame"
+               data-action="turbo:frame-load->mensa-table#captureNavigation turbo:before-frame-render->mensa-table#beforeFrameRender turbo:before-fetch-request->mensa-table#captureScrollPosition click->mensa-table#captureScrollPosition:capture turbo:frame-load->mensa-table#restoreScrollPosition"
+               data-turbo-permanent></turbo-frame>
 </div>

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

@@ -7,6 +7,7 @@ export default class TableComponentController extends ApplicationController {
         "filterList",
         "views",
         "view",
+        "scrollContainer",
         "turboFrame",
         "saveViewDialog",
         "saveViewName",
@@ -32,28 +33,7 @@ export default class TableComponentController extends ApplicationController {
         super.connect();
 
         this.frameLoadFallback = setTimeout(() => this.loadFrame(), 100);
-
-        if (this.hasTurboFrameTarget) {
-            this.captureNavigationHandler = () => this.captureNavigation();
-            this.turboFrameTarget.addEventListener(
-                "turbo:frame-load",
-                this.captureNavigationHandler,
-            );
-        }
-
-        // Close save dropdown when clicking outside
-        this._saveDropdownOutsideHandler = (e) => {
-            if (
-                this.hasSaveDropdownTarget &&
-                !this.saveDropdownTarget.classList.contains("hidden")
-            ) {
-                const saveArea = this.saveDropdownTarget.closest(".relative");
-                if (saveArea && !saveArea.contains(e.target)) {
-                    this.saveDropdownTarget.classList.add("hidden");
-                }
-            }
-        };
-        document.addEventListener("click", this._saveDropdownOutsideHandler);
+        this.scrollLeft = 0;
     }
 
     disconnect() {
@@ -62,14 +42,20 @@ export default class TableComponentController extends ApplicationController {
             this.frameLoadFallback = null;
         }
 
-        if (this.hasTurboFrameTarget && this.captureNavigationHandler) {
-            this.turboFrameTarget.removeEventListener(
-                "turbo:frame-load",
-                this.captureNavigationHandler,
-            );
+    }
+
+    saveDropdownOutsideHandler(event) {
+        if (
+            !this.hasSaveDropdownTarget ||
+            this.saveDropdownTarget.classList.contains("hidden")
+        ) {
+            return;
         }
 
-        document.removeEventListener("click", this._saveDropdownOutsideHandler);
+        const saveArea = this.saveDropdownTarget.closest(".relative");
+        if (saveArea && !saveArea.contains(event.target)) {
+            this.saveDropdownTarget.classList.add("hidden");
+        }
     }
 
     captureNavigation() {
@@ -80,6 +66,69 @@ export default class TableComponentController extends ApplicationController {
         this.mensaFilterPillListOutlet.captureNavigation(src);
     }
 
+    beforeFrameRender() {
+        this.captureScrollPosition();
+        this.isReplacingFrame = true;
+    }
+
+    scrollContainerTargetConnected(element) {
+        this.scrollContainer = this.scrollableElementFor(element);
+        this.restoreScrollPosition();
+        this.scrollHandler = () => this.captureScrollPosition();
+        this.scrollContainer.addEventListener("scroll", this.scrollHandler);
+    }
+
+    scrollContainerTargetDisconnected(element) {
+        const scrollContainer =
+            this.scrollContainer || this.scrollableElementFor(element);
+        if (this.scrollHandler && scrollContainer) {
+            scrollContainer.removeEventListener("scroll", this.scrollHandler);
+        }
+        this.scrollContainer = null;
+    }
+
+    captureScrollPosition(source = null) {
+        if (this.isReplacingFrame || this.isRestoringScroll) return;
+        const scrollContainer = this.scrollContainerFrom(source);
+        if (!scrollContainer) return;
+        this.scrollLeft = scrollContainer.scrollLeft;
+    }
+
+    restoreScrollPosition() {
+        const scrollContainer = this.scrollContainerFrom();
+        if (!scrollContainer) return;
+
+        this.isRestoringScroll = true;
+        scrollContainer.scrollLeft = this.scrollLeft || 0;
+        requestAnimationFrame(() => {
+            this.isRestoringScroll = false;
+            this.isReplacingFrame = false;
+        });
+    }
+
+    scrollContainerFrom(source = null) {
+        if (source?.currentTarget) {
+            return this.scrollableElementFor(source.currentTarget);
+        }
+        if (source?.scrollLeft !== undefined) return source;
+        if (this.scrollContainer) return this.scrollContainer;
+        if (this.hasScrollContainerTarget) {
+            return this.scrollableElementFor(this.scrollContainerTarget);
+        }
+        return null;
+    }
+
+    scrollableElementFor(element) {
+        if (!element) return null;
+        if (element.scrollWidth > element.clientWidth) return element;
+
+        return (
+            Array.from(element.querySelectorAll("*")).find(
+                (candidate) => candidate.scrollWidth > candidate.clientWidth,
+            ) || element
+        );
+    }
+
     loadFrame() {
         if (this.frameLoadHandled) return;
         this.frameLoadHandled = true;
@@ -520,6 +569,8 @@ export default class TableComponentController extends ApplicationController {
                 query: state.query || nav.query,
                 filters: state.filters,
                 order: state.order,
+                column_order: state.column_order,
+                hidden_columns: state.hidden_columns,
             }),
             contentType: "application/json",
             responseKind: "turbo-stream",

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

@@ -1,5 +1,6 @@
 <div data-mensa-table-target="view">
   <div class="overflow-y-auto relative"
+       data-mensa-table-target="scrollContainer"
        data-controller="mensa-selection"
        data-mensa-selection-batch-url-value="<%= table.batch_actions? ? helpers.mensa.table_batch_actions_path(table.name) : "" %>">
     <% if table.batch_actions? %>

data/app/controllers/mensa/tables/exports_controller.rb

@@ -24,7 +24,7 @@ module Mensa
           format: params[:export_format].to_s.presence_in(Mensa::Export::FORMATS) || "csv_excel",
           scope: params[:scope].to_s.presence_in(Mensa::Export::SCOPES) || "all",
           repeat: params[:repeat].to_s.presence_in(Mensa::Export::REPEATS) || "",
-          config: params.permit(:query, :page, order: {}, filters: {}).to_h,
+          config: export_config,
           status: "pending"
         )
 
@@ -108,6 +108,18 @@ module Mensa
         {table_name: params[:table_id], user: current_mensa_user, exports: exports}
       end
 
+      def export_config
+        params.permit(
+          :query,
+          :page,
+          :table_view_id,
+          order: {},
+          filters: {},
+          column_order: [],
+          hidden_columns: []
+        ).to_h
+      end
+
       def current_mensa_user
         Current.user if defined?(Current) && Current.respond_to?(:user)
       end

data/app/tables/mensa/base.rb

@@ -120,7 +120,7 @@ module Mensa
     end
 
     # Returns the current path with configuration
-    def path(order: {}, turbo_frame_id: current_turbo_frame_id, table_view_id: current_table_view_id, column_order: current_column_order, hidden_columns: current_hidden_columns, user_params: nil)
+    def path(order: {}, turbo_frame_id: current_turbo_frame_id, table_view_id: current_table_view_id, page: current_page, column_order: current_column_order, hidden_columns: current_hidden_columns, user_params: nil)
       # FIXME: if someone doesn't use as: :mensa in the routes, it breaks
       path = original_view_context.mensa.table_path(name)
       query = {
@@ -128,6 +128,7 @@ module Mensa
         order: order_hash(order),
         turbo_frame_id: turbo_frame_id,
         table_view_id: table_view_id,
+        page: page,
         column_order: column_order,
         hidden_columns: hidden_columns
       }.compact.to_query
@@ -179,6 +180,10 @@ module Mensa
       config[:table_view_id]
     end
 
+    def current_page
+      config[:page]
+    end
+
     def current_column_order
       config[:column_order]
     end

data/app/tables/mensa/column.rb

@@ -72,7 +72,7 @@ module Mensa
       return @attribute_for_condition if @attribute_for_condition
 
       @attribute_for_condition = if config[:attribute].present?
-        raw_attribute
+        Arel.sql(raw_attribute)
       elsif table.model.column_names.include? name.to_s
         Arel.sql("\"#{table.model.table_name}\".\"#{name}\"")
       end

data/app/tables/mensa/filter.rb

@@ -79,43 +79,9 @@ module Mensa
       if scope
         record_scope.instance_exec(normalize(value), &scope)
       else
-        case operator
-        when :is_empty
-          if column.type == :string
-            record_scope.where("#{column.attribute_for_condition} IS NULL OR #{column.attribute_for_condition} = ''")
-          else
-            record_scope.where("#{column.attribute_for_condition} IS NULL")
-          end
-        when :isnt_empty
-          if column.type == :string
-            record_scope.where("#{column.attribute_for_condition} IS NOT NULL AND #{column.attribute_for_condition} != ''")
-          else
-            record_scope.where("#{column.attribute_for_condition} IS NOT NULL")
-          end
-        when :is_current
-          record_scope.where("#{column.attribute_for_condition} = ?", Current.send(column.name))
-        when :matches
-          record_scope.where("#{column.attribute_for_condition} LIKE ?", "%#{normalize(value)}%")
-        when :does_not_match
-          record_scope.where("#{column.attribute_for_condition} NOT LIKE ?", "%#{normalize(value)}%")
-        when :is
-          val = value.is_a?(Array) ? value : normalize(value)
-          record_scope.where(column.attribute_for_condition => val)
-        when :isnt
-          val = value.is_a?(Array) ? value : normalize(value)
-          record_scope.where.not(column.attribute_for_condition => val)
-        when :gt
-          record_scope.where(":column > :value", column: column.attribute_for_condition, value: normalize(value))
-        when :lt
-          record_scope.where(":column < :value", column: column.attribute_for_condition, value: normalize(value))
-        when :gteq
-          record_scope.where(":column >= :value", column: column.attribute_for_condition, value: normalize(value))
-        when :lteq
-          record_scope.where(":column <= :value", column: column.attribute_for_condition, value: normalize(value))
-        else
-          # Ignore unknown operators
-          record_scope
-        end
+        query, hash = query_and_hash_for_operator
+        record_scope = record_scope.where(query, hash) if query.present?
+        record_scope
       end
     end
 
@@ -133,6 +99,41 @@ module Mensa
       operators
     end
 
+    def query_and_hash_for_operator
+      hash = { column: column.attribute_for_condition, value: normalize(value) }
+
+      query = case operator
+      when :is_empty
+        column.type == :string ? ":column IS NULL OR :column = ''" : ":column IS NULL"
+      when :isnt_empty
+        column.type == :string ? ":column IS NOT NULL AND :column != ''" : ":column IS NOT NULL"
+      when :is_current
+        ":column = :value"
+      when :matches
+        ":column LIKE :value"
+      when :does_not_match
+        ":column NOT LIKE :value"
+      when :is
+        hash[:value] = value if hash[:value].is_a?(Array)
+        ":column = :value"
+      when :isnt
+        hash[:value] = value if hash[:value].is_a?(Array)
+        ":column != :value"
+      when :gt
+        ":column > :value"
+      when :lt
+        ":column < :value"
+      when :gteq
+        ":column >= :value"
+      when :lteq
+        ":column <= :value"
+      else
+        # Ignore unknown operators
+        nil
+      end
+      [query, hash]
+    end
+
     def operator_label
       Mensa::Filter.OPERATORS.find { |op| op[0] == operator }[1]
     end
@@ -172,7 +173,7 @@ module Mensa
 
     # Unused at the moment
     def normalize(query)
-      query # .to_s.gsub(/\s(?![&!|])/, '\\\\ ')
+      query
     end
   end
 end

data/app/tables/mensa/scope.rb

@@ -76,7 +76,7 @@ module Mensa
     def effective_order
       result = current_order_provided? ? (current_order || {}) : (config[:order] || {})
       result = result.symbolize_keys.compact_blank.transform_values(&:to_sym)
-      result.transform_keys { |column_name| column(column_name).attribute_for_condition }
+      result.map { |k,v| "#{k} #{v} NULLS LAST" }.join(", ")
     end
 
     # Builds an order hash for URL generation. Merges current order with overrides;

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

metadata

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