custom_table 0.1.0 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56a21b7978279adb93168f5879fbf85c9953cd90561b3eaffe12fb834039311c
-  data.tar.gz: 5ea82cf638892d34ed8c5dab7dd30c9b4c9d6ea5eacaf954acaa874131dd62dd
+  metadata.gz: 1c8f1b7e32b3824da237f2ece73cbbcfcc8c68ddad60f85be8181a3b8f94b10f
+  data.tar.gz: 8908567c65f9dd6bc0fff9ff5a7a49178027169a6102d0f1fa7199c9912947b2
 SHA512:
-  metadata.gz: f0bbd84de0dcd118e79935abf955dc93ddd3161a4871321945644bdf0ce04b14f5705f93e81e68f97f73d602f4ca0fad55dbabcacc06fa10c76501200d619d22
-  data.tar.gz: d3ce8670c0d36f426f129a44a541932210986438657c1eeaaf76c7fe2ebca5f389c2ae958d4b6eb9b5d1d3bfb8d3b75fd2dde19a4413006265ae40136292ca7a
+  metadata.gz: b02a3f91be2c8ce188f0a2fb761e86e8ac0d71491858ce2e80aec9677d79a4da0296dd8b9ac9aaaa241b66edcd2da337d3670e952a490764dad28f5f52c9b712
+  data.tar.gz: af112016401e8f59038bc3a20e684f96c94d4fd97d260a4c7726ad1c1aa5ed5319188c867bae62310de162bc1f1cc1c00291d8dfd010f01cc8ce50f3fc9065a9

data/README.md

@@ -4,7 +4,9 @@ Provides powerful set of functionality for showing tables of data:
 * Generated table and filter panel for any model
 * Declare fields that should be displayed, filtered or sorted
 * Customize visible fields for each user
-* Exporting table to XLSX
+* Exporting table to XLSX (helpers for CAXLSX, fast_excel and CSV)
+
+Requires and works only with Ransack, Kaminari, Bootstrap CSS, Rails, simple_form and Turbo gems.
 
 ## Setup
 
@@ -42,6 +44,7 @@ Use attribute name as key if possbile. Table will try to get most of options aut
 * ```search``` contains search parameters. Skip this if search is not available for this fields
 * * ```q``` ransack's "q" search marcher which is used to search by the field. For range use array of two elements, e.g. ```[:created_at_gteq, :created_at_lteq]```
 * * ```type``` type of search element to draw
+* * ```sm_visible``` set to true to make this field search always be visible in small screens (by default all fields collapsed)
 * ```appear``` controls visibility of the field. Default value is hidden if not specially selected
 * * ```default``` will appear by default
 * * ```always``` will always appear
@@ -99,6 +102,7 @@ Options available are:
 * ```tree``` set to true if you have parent-child relation and you want to show records grouped by parent. Be sure to disable pagination as it will only group current page records 
 * ```group_by``` set to helper name to group records by result of it. Be sure to disable pagination as it will only group current page records 
 * ```expanded``` expand grouped or trees by default
+* ```sortable``` set to true to allow to sort models. Model needs to have ```position``` attribute and use ```acts_as_list``` gem to be sorted. Gem uses ```stimulus-sortable``` JS package for sorting
 
 ## Rendering search panel
 
@@ -159,8 +163,20 @@ Then just pass variant to filter and data helpers.
 
 ## Table Stimulus helper
 
+## Batch Actions
+
+You can set ```batch``` option to field definition to enable batch editing
+
+You need to set following options to ```custom_table_data```:
 
+* ```batch_actions``` - shows batch actions. Set to helper name for custom actions
+* ```batch_activator``` - shows more compact batch selecting view. Enabled by default
 
+You have to declare the following routes for the resource:
+
+* ```batch_edit``` - POST with ```plural model name``` array will be requested to show form for mass editing
+* ```batch_update``` - POST with ```plural model name``` array will be requested to update records with params
+* ```batch_destroy``` - DELETE with ```plural model name``` array will be requested to delete records
 
 ## Downloading data as XLSX table
 
@@ -200,11 +216,16 @@ You can declare how each field is displayed. Just add it as block within field:
       = fs.field :name do
         = @instance.name.upcase
 
-## Testing
+## Testing hints for your app
 
 Use ```custom_table_use_all_fields``` GET param with any value to show all available fields in your feature tests
 
 ## Development
 
-Running tests: rspec
+Running tests: 
+
+* `bundle install`
+* `bundle exec rails db:migrate`
+* `RAILS_ENV=test bundle exec rspec`
+
 

data/app/assets/stylesheets/custom_table/table.scss

@@ -10,7 +10,7 @@ table.custom-table {
     white-space: nowrap;
   }
   td.selected {
-    border: 2px solid rgb(26, 179, 26) !important;
+    outline: 2px solid rgb(26, 179, 26) !important;
   }
 
   tr {
@@ -34,6 +34,10 @@ table.custom-table {
       }
     }
 
+    .checkbox-col {
+      width: 20px;
+    }
+
   }
 
 
@@ -82,8 +86,55 @@ table.custom-table {
 
 }
 
+.batch-hidden {
+  th.checkbox-col, td.checkbox-col {
+    display: none;
+  }
+  .batch-actions {
+    display: none;
+  }
+}
 
 .widget table.custom-table td {
   max-width: 120px;
   overflow: hidden;
 }
+
+@include media-breakpoint-down(md) {
+  .custom-table-filter {
+    > :not(.has-value, .btn-group, .sm-visible) {
+      display: none;
+    }
+    &.show-all {
+      > :not(.has-value, .btn-group, .sm-visible) {
+        display: block;
+      }
+    }
+  }
+
+}
+
+
+@include media-breakpoint-down(lg) {
+  .overflow-x-lg-scroll {
+    overflow-x: scroll;
+  }
+
+}
+
+@include media-breakpoint-up(sm) {
+  .custom-table-settings {
+    columns: 2
+  }
+}
+
+
+@include media-breakpoint-up(lg) {
+  .modal-lg, .modal-xl {
+    .custom-table-settings {
+      columns: 3
+    }
+  }
+}
+
+

data/app/controllers/custom_table/settings_controller.rb

@@ -41,6 +41,7 @@ module CustomTable
       if current_user.save_custom_table_settings(model, variant, fields: p[:fields])
         flash[:notice] = t("custom_table.customization_saved")
         respond_to do |format|
+          format.html { render nil, status: :ok }
           format.turbo_stream {render turbo_stream: turbo_stream.action(:refresh, nil)}
         end
       else
@@ -66,6 +67,7 @@ module CustomTable
       if current_user.destroy_custom_table_settings(model, variant)
         flash[:notice] = t("custom_table.customization_saved")
         respond_to do |format|
+          format.html { render nil, status: :ok }
           format.turbo_stream {render turbo_stream: turbo_stream.action(:refresh, nil)}
         end
       else

data/app/helpers/custom_table/application_helper.rb

@@ -14,15 +14,15 @@ module CustomTable
       options[:method] = :get
   
       options[:html] ||= {} 
-      options[:html][:class] = "row row-cols-md-auto g-3 align-items-center custom-table-filter"
-      options[:wrapper] = options[:wrapper] || :inline_form
+      options[:html][:class] = "row row-cols-sm-auto g-3 align-items-center custom-table-filter"
+      options[:wrapper] = options[:wrapper] || :ct_inline_form
   
       options[:wrapper_mappings] = {
-        boolean: :inline_boolean,
-        check_boxes: :vertical_collection,
-        radio_buttons: :vertical_collection,
-        date: :inline_element,
-        select: :inline_select
+        boolean: :ct_inline_boolean,
+        check_boxes: :ct_vertical_collection,
+        radio_buttons: :ct_vertical_collection,
+        date: :ct_inline_element,
+        select: :ct_inline_select
       }
 
       simple_form_for(record, options, &block)
@@ -80,10 +80,13 @@ module CustomTable
       end
   
       if !defs.nil? && defs[:amount]
+        val = item.send(field) rescue nil
+        return not_set if val.nil?
         if !item.class.columns_hash[field.to_s].nil? && item.class.columns_hash[field.to_s].type == :integer
-          return amount_value(item.send(field), 0) rescue ""
+          # Integer only
+          return amount_value(val, 0) rescue ""
         else
-          return amount(item.send(field)) rescue ""
+          return amount(val) rescue ""
         end
       else
         if item.class.reflect_on_association(field)
@@ -93,13 +96,21 @@ module CustomTable
           return boolean_icon(item.send(field)) rescue ""
         elsif item.class.defined_enums.has_key?(field.to_s)
           return (item.send("human_#{field}") rescue (item.send(field).presence || not_set)).to_s rescue ""
-        elsif item.class.columns_hash[field.to_s] && [:date, :datetime].include?(item.class.columns_hash[field.to_s].type)
-          return (item.send(field).blank? ? not_set : l(item.send(field), format: :short)) rescue ""
+        elsif item.class.columns_hash[field.to_s] && [:date].include?(item.class.columns_hash[field.to_s].type)
+          return (item.send(field).blank? ? not_set : l(item.send(field), format: CustomTable.configuration.date_format)) rescue ""
+        elsif item.class.columns_hash[field.to_s] && [:datetime].include?(item.class.columns_hash[field.to_s].type)
+          return (item.send(field).blank? ? not_set : l(item.send(field), format: CustomTable.configuration.datetime_format)) rescue ""
         elsif item.class.columns_hash[field.to_s] && [:integer, :float, :decimal].include?(item.class.columns_hash[field.to_s].type)
           return not_set if (item.send(field) rescue nil).nil?
+          return item.send(field) if !defs.nil? && defs[:amount] === false # Showing simple output if amount is false
           return amount(item.send(field)) rescue ""
         else
-          return (item.send(field).presence || not_set).to_s rescue ""
+          # Non-column attribute
+          v = (item.send(field).presence || not_set) rescue nil
+          if !defs.nil? && !defs[:type].nil?
+            return date_value(v) if [:date, :datetime].include?(defs[:type])
+          end
+          return v.to_s.presence || not_set
         end
       end
       
@@ -133,9 +144,9 @@ module CustomTable
               # We can try to sum value from database
 
               if fields[field][:total_scope].nil?
-                out[field] = collection.except(:limit, :offset, :order, :group).sum(field)
-              else 
-                out[field] = collection.except(:limit, :offset, :order, :group).send(fields[field][:total_scope])
+                out[field] = collection.except(:limit, :offset, :order, :group).distinct(false).sum(field)
+              else
+                out[field] = collection.except(:limit, :offset, :order, :group).distinct(false).send(fields[field][:total_scope])
               end
             else
               # Taking simple summed value because all data is shown
@@ -254,7 +265,7 @@ module CustomTable
   
     # Returns list of fields for customization form
     def custom_table_fields_settings_for(model, variant: nil)
-  
+ 
       model_fields = custom_table_fields_definition_for(model, variant)
       model_fields = model_fields.reject {|k,v| [:export, :never].include?(v[:appear]) }
 
@@ -282,7 +293,6 @@ module CustomTable
         return model_fields.each{|k,f| f[:selected] = [:always, :default].include?(f[:appear])}
       end
   
-    
     end
   
     # Prepares object of user fields customization
@@ -314,9 +324,15 @@ module CustomTable
   
     # Base definition for model
     def custom_table_fields_definition_for(model, variant = nil)
+
       helper_name = "#{model.model_name.singular}_custom_table_fields"
       if (! self.class.method_defined?(helper_name))
-        raise "#{helper_name} helper is not defined so we do not know how to render custom_table for #{model}"
+        helper_name = "#{model.model_name.element}_custom_table_fields"
+
+        # Removing namespace from model
+        if (! self.class.method_defined?(helper_name))
+          raise "#{helper_name} helper is not defined so we do not know how to render custom_table for #{model}"
+        end
       end
 
       if variant.nil? || method(helper_name).parameters.empty?
@@ -330,7 +346,9 @@ module CustomTable
   
     # Base definition for model
     def custom_table_fields_definition_for_field(model, field, variant = nil)
+
       helper_name = "#{model.model_name.singular}_custom_table_fields"
+
       if (! self.class.method_defined?(helper_name))
         raise "#{helper_name} helper is not defined so we do not know how to render custom_table for #{model}"
       end
@@ -340,6 +358,7 @@ module CustomTable
         defs = self.send("#{helper_name}", variant)
       end
       return nil if defs[field].nil?
+      defs = defs[field]
       defs[:label] = model.human_attribute_name(field) if defs[:label].nil?
       return defs
     end
@@ -358,9 +377,10 @@ module CustomTable
       params[:paginate] = true if params[:paginate]!=false
       params[:last_page] = true if params[:last_page]!=false
       params[:namespace] = (controller.class.module_parent == Object) ? nil : controller.class.module_parent.to_s.underscore.to_sym
-      params[:force_edit_button] = false if params[:force_edit_button].nil?
       params[:modal_edit] = true if params[:modal_edit].nil?
-      
+      params[:with_select] = true if params[:with_select].nil? && params[:batch_actions]
+      params[:batch_activator] = true if params[:batch_activator].nil? && params[:batch_actions] === true
+
       render "custom_table/table", params do
         yield
       end
@@ -478,6 +498,37 @@ module CustomTable
       return out
     end
 
+    def custom_table_batch_ids items
+      return if items.nil? || items.length == 0
+      capture do
+        items.each do |item|
+          concat hidden_field_tag("#{item.model_name.plural}[]", item.id)
+        end
+        concat content_tag(:p, t("custom_table.batch_selected_items_count", count: items.length))
+        concat content_tag(:p, t("custom_table.batch_action_description"))
+      end
+    end
+
+    def custom_table_batch_fields model
+      custom_table_fields_definition_for(model).select{|f, d| d[:batch] == true}.keys
+    end
+
+    def custom_table_batch_actions model
+
+      item = model.new
+      forms = []
+      forms.push (form_for(item, url: [:batch_edit, item.model_name.plural.to_sym], params: "ids[]", html: {class: "d-inline me-1"}, method: :post, "target": "remote-modal", data: {"turbo-frame": "remote-modal", "batch-actions-target": "form", "action": "batch-actions#submit"}) do |f|
+        concat(f.submit t("custom_table.batch_update"), class: "btn btn-success btn-sm my-1")
+      end)
+  
+      forms.push (form_for(item, url: [:batch_destroy, item.model_name.plural.to_sym], params: "ids[]", html: {class: "d-inline"}, method: :delete, data: {"turbo-confirm": t("are_you_sure"), "batch-actions-target": "form", "action": "batch-actions#submit"}) do |f|
+        concat(f.submit t("custom_table.batch_destroy"), class: "btn btn-danger btn-sm my-1")
+      end)
+  
+      forms.join("").html_safe
+  
+    end
+
   end
   
 end

data/app/helpers/custom_table/fieldset_helper.rb

@@ -16,7 +16,7 @@ module CustomTable
 
       def field column, **params, &block
 
-        defs = custom_table_fields_definition_for_field(@object.class, column) rescue nil
+        defs = @template.custom_table_fields_definition_for_field(@object.class, column) rescue nil
 
         params = {} if params.nil?
         params = params.deep_merge(@params)
@@ -25,12 +25,13 @@ module CustomTable
 
         if params[:label].nil?
           if !defs.nil? && !defs[:label].blank?
-            params[:label] = defs[:label].nil?
+            params[:label] = defs[:label]
           else
             params[:label] = @object.class.human_attribute_name(column) 
           end
         end
 
+
         params[:template] = "field" if params[:template].nil?
         params[:column] = column
         params[:object] = @object
@@ -48,14 +49,14 @@ module CustomTable
               if block_given?
                 yield
               else
-                @template.field_value_for(@object, column)
+                @template.field_value_for(@object, column, definitions: defs)
               end
             end
           else
             if block_given?
               yield
             else
-              @template.field_value_for(@object, column)
+              @template.field_value_for(@object, column, definitions: defs)
             end
           end
 

data/app/helpers/custom_table/icons_helper.rb

@@ -18,6 +18,11 @@ module CustomTable
       return "bi bi-arrow-down-up" if CustomTable.configuration.icons_framework == :bi
     end
 
+    def custom_table_search_icon_class
+      return "fa fa-search" if CustomTable.configuration.icons_framework == :fa
+      return "bi bi-search" if CustomTable.configuration.icons_framework == :bi
+    end
+
     def custom_table_tree_child_icon_class
       return "fa fa-arrow-right" if CustomTable.configuration.icons_framework == :fa
       return "bi bi-arrow-return-right" if CustomTable.configuration.icons_framework == :bi

data/app/javascript/controllers/batch_actions_controller.js

@@ -2,15 +2,27 @@ import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
 
-  static targets = [ "checkbox", "form" ]
+  static targets = [ "checkbox", "form", "activator" ]
 
   connect() {
     if (this.hasFormTarget && this.hasCheckboxTarget) {
       console.log("Batch actions form", this.formTarget)
+
+      if (this.hasActivatorTarget) {
+        this.element.classList.add("batch-hidden")
+        this.activatorTarget.indeterminate = true
+      }
+
       this.refresh();
     }
   }
 
+  activate() {
+    this.element.classList.remove("batch-hidden")
+    this.activatorTarget.classList.add("d-none")
+
+  }
+
   submit(event) {
 
     if (!this.hasCheckboxTarget) {
@@ -19,8 +31,11 @@ export default class extends Controller {
     }
 
     // Clearing any matching hidden fields from form
-    this.formTarget.querySelectorAll('input[name="'+this.checkboxTargets[0].getAttribute("name")+'"]').forEach((cb) => {
-      cb.parentNode.removeChild(cb)
+
+    this.formTargets.forEach((form) => {
+      form.querySelectorAll('input[name="'+this.checkboxTargets[0].getAttribute("name")+'"]').forEach((cb) => {
+        cb.parentNode.removeChild(cb)
+      });
     });
 
     // Adding selected fields to form as hiddens
@@ -28,12 +43,14 @@ export default class extends Controller {
 
       if (!cb.checked) return;
 
-      let input = document.createElement('input');
-      input.setAttribute('name', cb.getAttribute("name"));
-      input.setAttribute('value', cb.getAttribute("value"));
-      input.setAttribute('type', "hidden")
-  
-      this.formTarget.appendChild(input);//append the input to the form
+
+      this.formTargets.forEach((form) => {
+        let input = document.createElement('input');
+        input.setAttribute('name', cb.getAttribute("name"));
+        input.setAttribute('value', cb.getAttribute("value"));
+        input.setAttribute('type', "hidden")
+        form.appendChild(input);//append the input to the form
+      });
   
     })
 
@@ -43,11 +60,18 @@ export default class extends Controller {
   }
 
   refresh(){
+
+    if (!this.hasFormTarget) return;
+
     let v = false
     this.checkboxTargets.forEach((cb) => {
       if (cb.checked) v = true;
     });
-    this.formTarget.querySelector('input[type="submit"]').disabled = !v
+
+    this.formTargets.forEach((form) => {
+      form.querySelector('input[type="submit"]').disabled = !v
+    })
+
   }
 
 }

data/app/models/concerns/custom_table_settings.rb

@@ -3,7 +3,7 @@ module CustomTableSettings
   extend ActiveSupport::Concern
 
   included do
-    serialize :custom_table
+    serialize :custom_table, coder: YAML
   end
 
   def save_custom_table_settings model_class, variant = nil, fields: nil, sorts: nil, per_page: nil

data/app/views/custom_table/_filter.html.haml

@@ -1,6 +1,6 @@
-.card
+%div{class: CustomTable.configuration.filter_outer_wrapper_class}
 
-  .card-body.bg-light
+  %div{class: CustomTable.configuration.filter_inner_wrapper_class}
 
     - url = local_assigns[:url].presence
     - variant = local_assigns[:variant].presence
@@ -13,6 +13,10 @@
         = f.input :s, as: :hidden, input_html: {value: params[:q].try(:[], :s)}
 
       - fields = custom_table_fields_for(search_model, variant: variant, current_search: params[:q], predefined_fields: local_assigns[:fields]) if local_assigns[:fields].nil?
+      - has_unset_fields = false
+
+      - if CustomTable.configuration.show_search_icon
+        = custom_table_icon([custom_table_search_icon_class, "pe-0", "d-none", "d-md-inline"])
 
       - fields.each do |key, defs|
 
@@ -29,20 +33,24 @@
           - a[key].push field[:q]
           - label = field[:label] || defs[:label]
 
+          - has_value = params[:q] && field[:q] && params[:q][field[:q].to_s].present?
+          - hvh = {wrapper_html: {class: (has_value ? "has-value" : (field[:sm_visible]==true ? "sm-visible" : ""))}}
+          - has_unset_fields = true if !has_value
+
           - if field[:type] == :text
 
             - ih = {class: "form-control-sm"}
             - ih = ih.merge(defs[:input_html]) if !defs[:input_html].nil?
 
-            = f.input field[:q], input_html: ih, required: false, label: false, placeholder: label
+            = f.input field[:q], input_html: ih, required: false, label: false, placeholder: label, **hvh
 
           - if field[:type] == :boolean
 
-            = f.input field[:q], as: :boolean, input_html: {}, required: false, label: label, unchecked_value: ""
+            = f.input field[:q], as: :boolean, input_html: {}, required: false, label: label, unchecked_value: "", **hvh
 
           - if field[:type] == :switch
 
-            = f.input field[:q], as: :select, input_html: {:class => "form-select form-select-sm"}, required: false, label: false, :collection => [[t("yes")+" | #{label}", "true"], [t("no")+" | #{label}", "false"]], include_blank: label
+            = f.input field[:q], as: :select, input_html: {:class => "form-select form-select-sm"}, required: false, label: false, :collection => [[t("yes")+" | #{label}", "true"], [t("no")+" | #{label}", "false"]], include_blank: label, **hvh
 
           - if field[:type] == :select
 
@@ -53,7 +61,7 @@
               - collection = collection.accessible_by(current_ability) 
               - label_method = :to_s
 
-            = f.input field[:q], :as => :select, :input_html => {:class => "form-select form-select-sm"}, :required => false, :label => false, :collection => collection, label_method: label_method, include_blank: label, value_method: field[:value_method]
+            = f.input field[:q], :as => :select, :input_html => {:class => "form-select form-select-sm"}, :required => false, :label => false, :collection => collection, label_method: label_method, include_blank: label, value_method: field[:value_method], **hvh
 
           - if field[:type] == :grouped_select
 
@@ -61,7 +69,7 @@
 
             - collection = collection.accessible_by(current_ability) if collection.class.to_s =~ /ActiveRecord_Relation/i
 
-            = f.input field[:q], :as => :grouped_select, :input_html => {:class => "form-select form-select-sm"}, :required => false, :label => false, group_method: field[:group_method], :collection => collection, include_blank: label
+            = f.input field[:q], :as => :grouped_select, :input_html => {:class => "form-select form-select-sm"}, :required => false, :label => false, group_method: field[:group_method], value_method: field[:value_method], :collection => collection, include_blank: label, **hvh
 
           - if field[:type] == :autocomplete
 
@@ -69,7 +77,7 @@
 
             - collection = collection.accessible_by(current_ability) if collection.class.to_s =~ /ActiveRecord_Relation/i
 
-            = f.input field[:q], :as => :autocomplete, :input_html => {:class => "input-sm"}, :required => false, :label => false, :collection => collection, prompt: label
+            = f.input field[:q], :as => :autocomplete, :input_html => {:class => "input-sm"}, :required => false, :label => false, :collection => collection, url: field[:url], prompt: label, **hvh
 
           - if field[:type] == :enum
 
@@ -77,15 +85,15 @@
             - collection = [search_model, key.to_s.pluralize] if collection.nil?
             - coll = collection[0].send(collection[1]).keys.map { |w| [(collection[0].method_defined?(:human_enum_name) ? collection[0].human_enum_name(collection[1].to_s.singularize, w) : w), w] }
 
-            = f.input field[:q], :as => :select, :input_html => {:class => "form-select form-select-sm"}, :required => false, :label => false, :collection => coll, include_blank: label
+            = f.input field[:q], :as => :select, :input_html => {:class => "form-select form-select-sm"}, :required => false, :label => false, :collection => coll, include_blank: label, **hvh
 
           - if field[:type] == :dates
-            .col-12
+            .col-6{class: (has_value ? "has-value" : "")}
               .input-group.input-group-sm{"data-controller": "dates"}
                 = f.input_field field[:q][0], :as => :date_picker, :label => false, :class => "form-control", data: {"dates-target": "dateFrom"}, :placeholder => label+" ("+t("custom_table.date_from")+")"
                 = f.input_field field[:q][1], :as => :date_picker, :label => false, :class => "form-control", data: {"dates-target": "dateTo"}, :placeholder => label+" ("+t("custom_table.date_to")+")"
                 %button.btn.btn-outline-secondary.dropdown-toggle(type="button" data-bs-toggle="dropdown" aria-expanded="false")
-                %ul.dropdown-menu.dropdown-menu-end
+                %ul.dropdown-menu.dropdown-menu-end{style: "z-index: 1080"}
                   %button.dropdown-item{type: "button", "data-action": "dates#prevWeek"}= t("analytics.previos_week")
                   %button.dropdown-item{type: "button", "data-action": "dates#prevMonth"}= t("analytics.previos_month")
                   %button.dropdown-item{type: "button", "data-action": "dates#prevYear"}= t("analytics.previos_year")
@@ -94,6 +102,8 @@
 
       .btn-group
         = f.button :submit, t("search"), name: "", :class => "btn-sm btn-primary"
+        - if has_unset_fields
+          %button.d-md-none.btn.btn-sm.btn-outline-primary{onclick: "closest('form').classList.add('show-all'); return false"}= t("custom_table.show_all_filters")
         - if user_signed_in? && current_user_has_customizable_fields_for?(search_model, variant) && !local_assigns[:hide_customization] && !local_assigns[:fields]# && !(profile_path rescue nil).nil?
           = custom_table_settings_button search_model, variant
         - if params[:q].present? && !params[:q].except(:s).empty?

data/app/views/custom_table/_settings.html.haml

@@ -19,7 +19,7 @@
           - if !variant.nil?
             %small= "(#{variant})"
 
-        %button.btn-close(type="button" data-bs-dismiss="modal" aria-label="close")
+        %button.btn-close(type="button" data-action="remote-modal#close" aria-label="close")
       .modal-body
 
         = turbo_frame_tag "custom-table-settings" do
@@ -32,11 +32,11 @@
             = f.hidden_field "variant", value: variant
 
             = f.simple_fields_for :fields do |sfi|
-              %div{data: {controller: "sortable", "data-sortable-handle-value": ".handle"}, style: "columns: #{columns}"}
+              %div.custom-table-settings{data: {controller: "sortable", "sortable-handle-value": ".handle"}}
 
                 - items.each do |field, item|
                   -# = abort item.inspect
-                  %div
+                  %div.text-nowrap.overflow-x-hidden
                     %i.handle{style: "cursor: move", class: custom_table_move_icon_class}
                     .form-check.form-switch.d-inline-block
                       -# - if item[:appear] == :always