pg_rails 7.1.2 → 7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce0769a565090d652ca06ad2735dab28268086a6a8a50f32051a7a55dddbceb6
-  data.tar.gz: 57d748d610429ee9ab28eb5496fd58659fc4cd2723c0b6576c35174706125fa1
+  metadata.gz: 3a62b699dfe2595c04b2c1dbde1379411b3ddaa4c49ad54b0a9f66e421b62796
+  data.tar.gz: 992584663e2439031e7760c9d97971478a8f9a41d4d9d52b01316d81789b3549
 SHA512:
-  metadata.gz: ff50d53f0b5a537176d240aca2ace0b336c307605e9ee5e0af061069263d3b8fc10fa16131393081ae2854fda19f16986e31ec1f5254f82358c355cef37127f6
-  data.tar.gz: 3636fe84f77a66e05a7693a271aaf3eda21352d35384a25c75c848c17c850b0b01b635ec264cfdfc635efda2ef65bf36384b138693d3de6aa75fd9ddfd962ce9
+  metadata.gz: cd3261127d268f14b9af5c991f66e959ccd3d5a700d500b109003c8a40fdf376ca8a85a9ff18b053fe657bcf4cdabc12d43ee95804f056fc1091d02c80fa7369
+  data.tar.gz: 5dfc48133fc688bd971d83586b845c78b8222740c598f7919dfc5ad8619aa3d140698c1fae4d869c4df38574fea07256b5921f03d715c196c0223dc9236bc876

data/pg_engine/app/assets/stylesheets/pg_rails_b5.scss

@@ -77,7 +77,7 @@ input[type=datetime-local], input[type=datetime] {
 .filter {
   display: inline-block;
   vertical-align: top;
-  max-width: 17em;
+  // max-width: 17em;
 }
 
 // Modal

data/pg_engine/app/controllers/concerns/pg_engine/resource.rb

@@ -318,7 +318,7 @@ module PgEngine
       scope = if scope.model.respond_to? "order_by_#{field}"
                 scope.send "order_by_#{field}", direction
               else
-                scope.order(field => direction)
+                scope.order("#{field} #{direction} nulls last")
               end
       instance_variable_set(:@field, field)
       instance_variable_set(:@direction, direction)

data/pg_engine/app/lib/pg_engine/filtros_builder.rb

@@ -7,7 +7,7 @@ module PgEngine
     include PostgresHelper
     attr_accessor :controller
 
-    SUFIJOS = %w[desde hasta incluye es_igual_a].freeze
+    SUFIJOS = %w[desde hasta incluye es_igual_a in cont eq].freeze
 
     def initialize(controller, clase_modelo, campos)
       @clase_modelo = clase_modelo
@@ -240,14 +240,12 @@ module PgEngine
 
     def filtro_asociacion(campo, _placeholder = '')
       asociacion = obtener_asociacion(campo)
-      multiple = asociacion.instance_of?(ActiveRecord::Reflection::HasAndBelongsToManyReflection)
       nombre_clase = asociacion.options[:class_name]
       nombre_clase = asociacion.name.to_s.camelize if nombre_clase.nil?
       clase_asociacion = Object.const_get(nombre_clase)
       scope = Pundit.policy_scope!(Current.user, clase_asociacion)
 
-      # Filtro soft deleted, y sea con paranoia o con discard
-      scope = scope.without_deleted if scope.respond_to?(:without_deleted)
+      # Filtro soft deleted
       scope = scope.kept if scope.respond_to?(:kept)
 
       if @filtros[campo.to_sym][:scope_asociacion].present?
@@ -258,14 +256,14 @@ module PgEngine
 
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
-          if multiple
-            @form.select campo, map, { multiple: true }, 'data-controller': 'selectize',
-                                                         class: 'form-select form-select-sm pg-input-lg'
+          placeholder = ransack_placeholder(campo)
+          suf = extraer_sufijo(campo)
+          if suf.in? %w[in]
+            @form.select sin_sufijo(campo) + '_id_in', map, { multiple: true }, placeholder:, 'data-controller': 'selectize',
+                                                                                class: 'form-control form-control-sm pg-input-lg'
           else
-            campo = campo.to_s + '_id_in'
-            placeholder = ransack_placeholder(campo)
-            @form.select campo, map, { multiple: true }, placeholder:, 'data-controller': 'selectize',
-                                                         class: 'form-control form-control-sm pg-input-lg'
+            campo = campo.to_s + '_id_eq'
+            @form.select campo, map, { include_blank: "Seleccionar #{placeholder}" }, class: 'form-select form-select-sm pg-input-lg'
           end
         end
       end
@@ -279,7 +277,12 @@ module PgEngine
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
           placeholder = ransack_placeholder(campo)
-          @form.select(campo, map, { multiple: true }, placeholder:, class: 'form-control form-control-sm pg-input-lg', 'data-controller': 'selectize')
+          suf = extraer_sufijo(campo)
+          if suf.in? %w[in]
+            @form.select(campo, map, { multiple: true }, placeholder:, class: 'form-control form-control-sm pg-input-lg', 'data-controller': 'selectize')
+          else
+            @form.select(campo, map, { include_blank: "Seleccionar #{placeholder}" }, placeholder:, class: 'form-select form-select-sm pg-input-lg')
+          end
         end
       end
     end
@@ -337,7 +340,7 @@ module PgEngine
     end
 
     def ransack_placeholder(campo)
-      @form.object.translate(campo, include_associations: true)
+      @form.object.translate(campo, include_associations: false)
     end
 
     def parametros_controller

data/pg_engine/app/views/pg_engine/base/index.html.slim

@@ -21,7 +21,9 @@
         span.bi.bi-funnel-fill
       = search_form_for @q, url: namespaced_path(@clase_modelo) do |f|
         .row.g-1
-          = @filtros.filtros_html(form: f)
+          .col
+            .row.g-1
+              = @filtros.filtros_html(form: f)
           .col-auto.gap-1.d-flex.align-items-start
             = button_tag class: 'btn btn-sm btn-primary col-auto' do
               span.bi.bi-search

data/pg_engine/config/initializers/ransack.rb

@@ -0,0 +1,48 @@
+module Arel
+  module Predications
+    def matches_unaccent(other, escape = nil, case_sensitive = false)
+      left = Arel::Nodes::NamedFunction.new('unaccent', [self])
+      right = Arel::Nodes::NamedFunction.new('unaccent',
+                                             [Arel::Nodes::Quoted.new(other)])
+      left.matches(right)
+    end
+
+    def matches_unaccent_any(others, escape = nil, case_sensitive = false)
+      grouping_any :matches_unaccent, others, escape, case_sensitive
+    end
+
+    def matches_unaccent_all(others, escape = nil, case_sensitive = false)
+      grouping_all :matches_unaccent, others, escape, case_sensitive
+    end
+
+    def does_not_match_unaccent(other)
+      left = Arel::Nodes::NamedFunction.new('unaccent', [self])
+      right = Arel::Nodes::NamedFunction.new('unaccent',
+                                             [Arel::Nodes::Quoted.new(other)])
+      left.does_not_match(right)
+    end
+  end
+end
+
+Ransack.configure do |config|
+  # Piso predicados cont y not_cont para que usen unaccent
+  config.add_predicate 'cont',
+    arel_predicate: 'matches_unaccent',
+    formatter: proc { |v| "%#{Ransack::Constants.escape_wildcards(v.downcase)}%" },
+    case_insensitive: true
+
+  config.add_predicate 'cont_any',
+    arel_predicate: 'matches_unaccent_any',
+    formatter: proc { |v| v.split(' ').map { "%#{Ransack::Constants.escape_wildcards(_1.downcase)}%" } },
+    case_insensitive: true
+
+  config.add_predicate 'cont_all',
+    arel_predicate: 'matches_unaccent_all',
+    formatter: proc { |v| v.split(' ').map { "%#{Ransack::Constants.escape_wildcards(_1.downcase)}%" } },
+    case_insensitive: true
+
+  config.add_predicate 'not_cont',
+    arel_predicate: 'does_not_match_unaccent',
+    formatter: proc { |v| "%#{Ransack::Constants.escape_wildcards(v.downcase)}%" },
+    case_insensitive: true
+end

data/pg_engine/config/locales/es.yml

@@ -2,8 +2,11 @@ es:
   ransack:
     predicates:
       cont: ''
+      cont_all: ''
       in: ''
       eq: ''
+      lt: 'hasta'
+      gt: 'desde'
   pg_engine:
     base:
       index:

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.1.2'
+  VERSION = '7.1.3'
 end

data/pg_rails/scss/pg_rails.scss

@@ -53,6 +53,11 @@ $alert-margin-bottom:           0.5rem;
 .ts-wrapper.multi .ts-control > div {
 	margin: 0!important;
 }
+.ts-control:not(.rtl) {
+	padding-right: 0.75rem !important;
+}
+
+
 $warning-border-emphasis:   shade-color($yellow, 60%);
 .bg-primary-subtle .btn-warning {
   border: 1px solid $warning-border-emphasis;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.1.2
+  version: 7.1.3
 platform: ruby
 authors:
 - Martín Rosso
@@ -703,6 +703,7 @@ files:
 - pg_engine/config/initializers/anycable.rb
 - pg_engine/config/initializers/cable_ready.rb
 - pg_engine/config/initializers/devise.rb
+- pg_engine/config/initializers/ransack.rb
 - pg_engine/config/initializers/rollbar.rb
 - pg_engine/config/initializers/simple_form_monkey_patch.rb
 - pg_engine/config/initializers/zeitwerk.rb