pg_rails 7.1.4 → 7.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97005ad0cfff2f7088c2dbfe667e1fc8339b8873c3935580d374069fdda0c463
-  data.tar.gz: 938afdb82665e744d1c352e5879523329064bb5cadc7c9becdd88bb6aa85505e
+  metadata.gz: e9ea11adc017949414ed89c42127ce6867418dcd461219fb56289a2832a938a6
+  data.tar.gz: 30ab308185ff7e68acebf1611161f55fa5d783bc95536db27a2026091637d69a
 SHA512:
-  metadata.gz: ce4389f063db55a1761fa50c4335a5b7c98825222b7c541accd5f3e8b4e65c13f9a7ebe3a65787b7c90219f90f11370136faf1efb98f2b2996d9047fc8707e86
-  data.tar.gz: 6a510173f026e874693cc471f9eb251b733164f3cfc1fd72f105b9b556e7cf918962340584e1479d47d130ba723d0c5642a97f3b8097f417c84d7bf495a53c97
+  metadata.gz: 61685a1f498123e153ae0a635805566b69dbf177ad079da95e53221b81c05af957cdc9d8d0de63004d48d74801cf493a7062f303c227f9cdffa08a5834442941
+  data.tar.gz: 6c80c211396d351891a1c4071672bae515a629d933a128cd3e9f3b5fae4d948e624b9577645cee199bd10e4d6aa55b1aafa1278e4011dc7d1e7a87a60efede3e

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

@@ -80,6 +80,19 @@ input[type=datetime-local], input[type=datetime] {
   // max-width: 17em;
 }
 
+.filter label {
+  font-size: 0.8em;
+  font-weight: bold;
+  max-width: 5em;
+  text-align: right;
+  line-height: 1.2em;
+  vertical-align: middle;
+  opacity: 0.5;
+  min-width: 1em!important;
+  padding-left: 0.5em;
+  width: min-content;
+}
+
 // Modal
 .modal-content {
   box-shadow: 15px 15px 9px 0px rgba(0, 0, 0, 0.6);

data/pg_engine/app/controllers/admin/users_controller.rb

@@ -53,7 +53,7 @@ module Admin
     end
 
     def atributos_para_buscar
-      %i[email_cont nombre_cont apellido_cont developer]
+      %i[email nombre apellido developer]
     end
 
     def atributos_para_listar

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

@@ -20,15 +20,10 @@ module PgEngine
     def index
       @collection = filtros_y_policy atributos_para_buscar
 
-      shared_context = Ransack::Context.for(clase_modelo)
-
+      shared_context = Ransack::Adapters::ActiveRecord::Context.new(@collection)
       @q = @clase_modelo.ransack(params[:q], context: shared_context)
-      # @collection = @q.result(distinct: true)
-      @collection = @collection.joins(shared_context.join_sources)
-      vis = Ransack::Visitor.new.accept(@q.base)
-      @collection = @collection.where(vis)
+      @collection = shared_context.evaluate(@q)
 
-      @collection = sort_collection(@collection)
       pg_respond_index
     end
 
@@ -159,7 +154,9 @@ module PgEngine
     def pg_respond_show(object = nil)
       object ||= instancia_modelo
       if params[:modal].present?
-        render turbo_stream: turbo_stream.append_all('body', partial: 'pg_layout/modal_show', locals: { object: })
+        render turbo_stream: turbo_stream.append_all(
+          'body', partial: 'pg_layout/modal_show', locals: { object: }
+        )
       else
         respond_to do |format|
           format.json { render json: object }
@@ -303,44 +300,5 @@ module PgEngine
         self, clase_modelo, []
       ).filtrar(policy_scope(clase_modelo))
     end
-
-    def do_sort(scope, field, direction)
-      # TODO: restringir ciertos campos?
-      unless scope.model.column_names.include?(field.to_s) ||
-             scope.model.respond_to?("order_by_#{field}")
-        pg_warn("No existe el campo \"#{field}\"")
-        return scope
-      end
-      unless direction.to_sym.in? %i[asc desc]
-        pg_warn("Direction not valid: \"#{direction}\"")
-        return scope
-      end
-      scope = if scope.model.respond_to? "order_by_#{field}"
-                scope.send "order_by_#{field}", direction
-              else
-                sql = scope.model.arel_table[field.to_sym].send(direction).to_sql + ' nulls last'
-                scope.order(sql)
-              end
-      instance_variable_set(:@field, field)
-      instance_variable_set(:@direction, direction)
-      scope
-    rescue ArgumentError => e
-      pg_warn(e)
-      scope
-    end
-
-    def sort_collection(scope, options = {})
-      if params[:order_by].present?
-        field = params[:order_by]
-        direction = params[:order_direction]
-        do_sort(scope, field, direction)
-      elsif options[:default].present?
-        field = options[:default].first[0]
-        direction = options[:default].first[1]
-        do_sort(scope, field, direction)
-      else
-        do_sort(scope, 'id', 'desc')
-      end
-    end
   end
 end

data/pg_engine/app/controllers/pg_engine/base_controller.rb

@@ -91,7 +91,7 @@ module PgEngine
       end
 
       if Current.user.present?
-        @notifications = Current.user.notifications.order(id: :desc)
+        @notifications = Current.user.notifications.order(id: :desc).includes(:event)
                                 .where(type: 'SimpleUserNotifier::Notification')
         unseen = @notifications.unseen.any?
         # FIXME: testear y fixear, buscar el primero que esté present

data/pg_engine/app/helpers/pg_engine/index_helper.rb

@@ -2,43 +2,42 @@
 
 module PgEngine
   module IndexHelper
-    def encabezado(campo, options = {})
+    def encabezado(input, options = {})
+      if input.is_a? Array
+        campo = input.first
+        sort_field = input.last
+      else
+        campo = sort_field = input
+      end
+
       campo = campo.to_s.sub(/_f\z/, '')
       campo = campo.to_s.sub(/_text\z/, '')
-      clase = options[:clase] || @clase_modelo
-      if options[:ordenable]
-        field = controller.instance_variable_get(:@field)
-        direction = controller.instance_variable_get(:@direction)
-        uri = URI.parse(request.url)
-        cgi = if uri.query.present?
-                CGI.parse(uri.query)
-              else
-                {}
-              end
-        cgi['order_by'] = campo
-        cgi['order_direction'] =
-          if field.to_s == campo.to_s && direction.to_s == 'desc'
-            'asc'
-          else
-            'desc'
-          end
+      sort_field = sort_field.to_s.sub(/_f\z/, '')
+      sort_field = sort_field.to_s.sub(/_text\z/, '')
 
-        symbol = if field.to_s == campo.to_s
-                   if direction.to_s == 'asc'
-                     '<i class="bi bi-sort-down-alt" />'
-                   elsif direction.to_s == 'desc'
-                     '<i class="bi bi-sort-up" />'
-                   end
-                 else
-                   ''
-                 end
+      clase = options[:clase] || @clase_modelo
+      key = [controller_name, action_name, 'listado_header', campo].join('.')
+      dflt = :"activerecord.attributes.#{clase.model_name.i18n_key}.#{campo}"
+      human_name = clase.human_attribute_name(key, default: dflt)
 
-        uri.query = cgi.transform_values { |b| (b.length == 1 ? b.first : b) }.to_query
+      if options[:ordenable]
+        sort_link(@q, sort_field, human_name, default_order: default_order(campo))
+      else
+        human_name
+      end
+    end
 
-        link_to(clase.human_attribute_name(campo), uri.to_s) + " #{symbol}".html_safe
+    def default_order(campo)
+      columna = @clase_modelo.columns.find { _1.name == campo.to_s }
+      if columna && columna.type.to_s.include?('date')
+        :desc
       else
-        clase.human_attribute_name(campo)
+        :asc
       end
+    rescue StandardError => e
+      pg_err e
+
+      :asc
     end
   end
 end

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

@@ -7,13 +7,44 @@ module PgEngine
     include PostgresHelper
     attr_accessor :controller
 
-    SUFIJOS = %w[desde hasta incluye es_igual_a in cont eq].freeze
+    # El orden de los sufijos es importante
+    SUFIJOS = %w[
+      desde
+      hasta
+      gteq
+      gt
+      lteq
+      lt
+      incluye
+      es_igual_a
+      in
+      cont_all
+      cont_any
+      not_cont
+      cont
+      eq
+    ].freeze
 
     def initialize(controller, clase_modelo, campos)
       @clase_modelo = clase_modelo
-      @campos = campos
-      @controller = controller
       @filtros = {}
+      @campos = campos.map do |campo|
+        if extraer_sufijo(campo).blank?
+          case tipo(campo)
+          when :enumerized, :boolean
+            :"#{campo}_eq"
+          when :asociacion
+            :"#{campo.to_s.sub(/_id$/, '')}_id_eq"
+          when :date, :datetime
+            [:"#{campo}_gteq", :"#{campo}_lteq"]
+          else
+            :"#{campo}_cont_all"
+          end
+        else
+          campo
+        end
+      end.flatten
+      @controller = controller
       @campos.each { |campo| @filtros[campo] = {} }
     end
 
@@ -33,96 +64,23 @@ module PgEngine
       @filtros[campo][:scope_asociacion] = block
     end
 
-    def algun_filtro_presente?
-      @campos.any? { |campo| parametros_controller[campo].present? }
-    end
-
     def filtrar(query, parametros = nil)
       parametros = parametros_controller if parametros.nil?
 
       # Filtro soft deleted
       query = query.kept if query.respond_to?(:kept) && parametros[:archived] != 'true'
 
-      @filtros.each_key do |campo|
-        next if parametros[campo].blank?
-
-        if @filtros[campo.to_sym].present? && @filtros[campo.to_sym][:query].present?
-          query = @filtros[campo.to_sym][:query].call(query, parametros[campo])
-        elsif tipo(campo) == :enumerized
-          columna = @clase_modelo.columns.find { |c| c.name == campo.to_s }
-          query = if columna.array
-                    query.where("? = any(#{@clase_modelo.table_name}.#{campo})", parametros[campo])
-                  else
-                    query.where("#{@clase_modelo.table_name}.#{campo} = ?", parametros[campo])
-                  end
-        elsif tipo(campo).in?(%i[integer float decimal])
-          campo_a_comparar = "#{@clase_modelo.table_name}.#{sin_sufijo(campo)}"
-          query = query.where("#{campo_a_comparar} #{comparador(campo)} ?", parametros[campo])
-        elsif tipo(campo) == :asociacion
-          nombre_campo = sin_sufijo(campo)
-          suf = extraer_sufijo(campo)
-          asociacion = obtener_asociacion(nombre_campo)
-          if asociacion.instance_of?(ActiveRecord::Reflection::HasAndBelongsToManyReflection)
-            array = parametros[campo].instance_of?(Array) ? parametros[campo].join(',') : parametros[campo]
-            query = query.joins(nombre_campo.to_sym).group("#{@clase_modelo.table_name}.id")
-                         .having("ARRAY_AGG(#{asociacion.join_table}.#{asociacion.association_foreign_key}) #{comparador_array(suf)} ARRAY[#{array}]::bigint[]")
-          elsif asociacion.instance_of?(ActiveRecord::Reflection::BelongsToReflection)
-            query = query.where("#{@clase_modelo.table_name}.#{campo}_id = ?", parametros[campo])
-          else
-            raise 'filtro de asociacion no soportado'
-          end
-        elsif tipo(campo).in?(%i[string text])
-          columna = @clase_modelo.columns.find { |c| c.name == campo.to_s }
-          campo_tabla = "#{@clase_modelo.table_name}.#{campo}"
-          match_like = "%#{parametros[campo]}%"
-          query =
-            if columna&.array
-              # FIXME: testear
-              # El CONCAT no sé para qué sirve, pero lo dejo
-              query.where("unaccent(CONCAT(array_to_string(#{campo_tabla}, ' '))) ILIKE unaccent(?)", I18n.transliterate(match_like).to_s)
-            else
-              match_vector = parametros[campo].split.map { |a| "#{a}:*" }.join(' & ')
-              condicion = "to_tsvector(coalesce(unaccent(#{campo_tabla}), '')) @@ to_tsquery( unaccent(?) )"
-              condicion += " OR unaccent(CONCAT(#{campo_tabla})) ILIKE unaccent(?)"
-              query = query.where(condicion, I18n.transliterate(match_vector).to_s,
-                                  I18n.transliterate(match_like).to_s)
-            end
-        elsif tipo(campo) == :boolean
-          if campo.to_s == 'discarded'
-            # Si el nombre del campo es 'discarded' entonces no es un campo
-            # real sino filtro booleano por presencia de discarded_at
-            case parametros[campo]
-            when 'si'
-              query = query.unscope(where: :discarded_at).where("#{@clase_modelo.table_name}.discarded_at IS NOT NULL")
-            when 'no'
-              query = query.unscope(where: :discarded_at).where("#{@clase_modelo.table_name}.discarded_at IS NULL")
-            end
-          else
-            # Si no simplemente hago la query por booleano
-            query = query.where("#{@clase_modelo.table_name}.#{campo} = ?", parametros[campo] == 'si')
-          end
-        elsif tipo(campo) == :date || tipo(campo) == :datetime
-          begin
-            fecha = Date.parse(parametros[campo])
-            fecha = fecha + 1.day - 1.second if tipo(campo) == :datetime && comparador(campo) == '<'
-            campo_a_comparar = "#{@clase_modelo.table_name}.#{sin_sufijo(campo)}"
-            query = query.where("#{campo_a_comparar} #{comparador(campo)} ?", fecha)
-          rescue ArgumentError
-          end
-        end
-      end
       query
     end
 
     def tipo(campo)
       nombre_campo = sin_sufijo(campo)
+
       if @filtros[nombre_campo.to_sym].present? && @filtros[nombre_campo.to_sym][:tipo].present?
         @filtros[nombre_campo.to_sym][:tipo]
       elsif @clase_modelo.respond_to?(:enumerized_attributes) && @clase_modelo.enumerized_attributes[nombre_campo.to_s].present?
         :enumerized
-      elsif @clase_modelo.reflect_on_all_associations.find do |a|
-              a.name == nombre_campo.to_sym
-            end.present?
+      elsif find_on_all_associations(@clase_modelo, campo).present?
         :asociacion
       else
         columna = @clase_modelo.columns.find { |c| c.name == nombre_campo.to_s }
@@ -133,7 +91,8 @@ module PgEngine
           # real sino filtro booleano por presencia de discarded_at
           return :boolean if campo.to_s == 'discarded'
 
-          Rails.logger.warn("no existe el campo: #{nombre_campo}")
+          pg_warn("no existe el campo: #{nombre_campo}")
+
           return
         end
         columna.type
@@ -165,28 +124,39 @@ module PgEngine
       SUFIJOS.each do |sufijo|
         return sufijo if campo.to_s.ends_with?("_#{sufijo}")
       end
+
       nil
     end
 
     def sin_sufijo(campo)
       ret = campo.to_s.dup
+
       SUFIJOS.each do |sufijo|
         ret.gsub!(/_#{sufijo}$/, '')
       end
+
       ret
     end
 
     def placeholder_campo(campo)
       suf = extraer_sufijo(campo)
-      if suf.present?
-        "#{@clase_modelo.human_attribute_name(sin_sufijo(campo))} #{suf}"
-      else
-        @clase_modelo.human_attribute_name(campo)
-      end
+      key = [controller_name, action_name, 'filter', sin_sufijo(campo)].join('.')
+      dflt = :"activerecord.attributes.#{@clase_modelo.model_name.i18n_key}.#{sin_sufijo(campo)}"
+      human_name = @clase_modelo.human_attribute_name(key, default: dflt)
+
+      ret =
+        if suf.present?
+          "#{human_name} #{I18n.t(suf, scope: 'ransack.predicates')}"
+        else
+          human_name
+        end
+
+      ret.strip.downcase.tap { _1[0] = _1[0].capitalize }
     end
 
     def filtros_html(options = {})
       @form = options[:form]
+
       raise PgEngine::Error, 'se debe setear el form' if @form.blank?
 
       res = ''
@@ -198,8 +168,6 @@ module PgEngine
         end
 
         res += case tipo(campo)
-               when :select_custom
-                 filtro_select_custom(campo, placeholder_campo(campo))
                when :enumerized
                  filtro_select(campo, placeholder_campo(campo))
                when :asociacion
@@ -212,24 +180,30 @@ module PgEngine
                  filtro_texto(campo, placeholder_campo(campo))
                end
       end
-      res +=  hidden_field_tag('order_by', parametros_controller['order_by'])
-      res +=  hidden_field_tag('order_direction', parametros_controller['order_direction'])
+
+      if params[:q] && params[:q][:s]
+        res += @form.hidden_field('s', value: params[:q][:s])
+      end
+
       res.html_safe
     end
 
-    def obtener_asociacion(campo)
+    def find_on_all_associations(klass, campo)
       nombre_campo = sin_sufijo(campo)
-      extraer_sufijo(campo)
-      asociacion = @clase_modelo.reflect_on_all_associations.find do |a|
-        a.name == nombre_campo.to_sym
+      klass.reflect_on_all_associations.find do |a|
+        a.name == nombre_campo.to_sym || a.name == nombre_campo.sub(/_id$/, '').to_sym
       end
+    end
+
+    def obtener_asociacion(campo)
+      asociacion = find_on_all_associations(@clase_modelo, campo)
+
       raise 'no se encontró la asociacion' if asociacion.nil?
 
       if asociacion.instance_of?(ActiveRecord::Reflection::ThroughReflection)
         through_class = asociacion.through_reflection.class_name.constantize
-        asociacion_posta = through_class.reflect_on_all_associations.find do |a|
-          a.name == nombre_campo.to_sym
-        end
+        asociacion_posta = find_on_all_associations(through_class, campo)
+
         raise 'no se encontró la asociacion' if asociacion_posta.nil?
 
         asociacion_posta
@@ -238,7 +212,7 @@ module PgEngine
       end
     end
 
-    def filtro_asociacion(campo, _placeholder = '')
+    def filtro_asociacion(campo, placeholder = '')
       asociacion = obtener_asociacion(campo)
       nombre_clase = asociacion.options[:class_name]
       nombre_clase = asociacion.name.to_s.camelize if nombre_clase.nil?
@@ -252,18 +226,18 @@ module PgEngine
         scope = @filtros[campo.to_sym][:scope_asociacion].call(scope)
       end
 
+      # TODO: default sort
+
       map = scope.map { |o| [o.to_s, o.id] }
 
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
-          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'
+            @form.select campo, map, { multiple: true }, placeholder:, 'data-controller': 'selectize',
+                                                         class: 'form-control form-control-sm pg-input-lg'
           else
-            campo = campo.to_s + '_id_eq'
-            @form.select campo, map, { include_blank: "Seleccionar #{placeholder}" }, class: 'form-select form-select-sm pg-input-lg'
+            @form.select campo, map, { include_blank: "Seleccionar #{placeholder.downcase}" }, class: 'form-select form-select-sm pg-input-lg'
           end
         end
       end
@@ -276,36 +250,19 @@ module PgEngine
       end
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
-          placeholder = ransack_placeholder(campo)
           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')
+            @form.select(campo, map, { include_blank: "Seleccionar #{placeholder.downcase}" }, placeholder:, class: 'form-select form-select-sm pg-input-lg')
           end
         end
       end
     end
 
-    # DEPRECADO
-    def filtro_select_custom(campo, placeholder = '')
-      map = @filtros[campo.to_sym][:opciones]
-      unless @filtros[campo.to_sym].present? && @filtros[campo.to_sym][:include_blank] == false
-        map.unshift ["Seleccionar #{placeholder.downcase}",
-                     nil]
-      end
-      default = parametros_controller[campo].nil? ? nil : parametros_controller[campo]
-      content_tag :div, class: 'col-auto' do
-        content_tag :div, class: 'filter' do
-          select_tag campo, options_for_select(map, default), class: 'form-select form-select-sm pg-input-lg'
-        end
-      end
-    end
-
     def filtro_texto(campo, placeholder = '')
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
-          placeholder = ransack_placeholder(campo)
           @form.search_field(
             campo, class: 'form-control form-control-sm allow-enter-submit', placeholder:, autocomplete: 'off'
           )
@@ -314,15 +271,13 @@ module PgEngine
     end
 
     def filtro_boolean(campo, placeholder = '')
-      map = [%w[Si si], %w[No no]]
-      unless @filtros[campo.to_sym].present? && @filtros[campo.to_sym][:include_blank] == false
-        map.unshift ["¿#{placeholder.titleize}?",
-                     nil]
-      end
-      default = parametros_controller[campo].nil? ? nil : parametros_controller[campo]
+      map = [%w[Sí true], %w[No false]]
+
+      include_blank = "¿#{placeholder.titleize}?"
+
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
-          select_tag campo, options_for_select(map, default), class: 'form-select form-select-sm pg-input-lg'
+          @form.select campo.to_sym, map, { include_blank: }, class: 'form-select form-select-sm pg-input-lg'
         end
       end
     end
@@ -330,7 +285,6 @@ module PgEngine
     def filtro_fecha(campo, placeholder = '')
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
-          placeholder = ransack_placeholder(campo)
           label_tag(nil, placeholder, class: 'text-body-secondary') +
             @form.date_field(
               campo, class: 'form-control form-control-sm d-inline-block w-auto ms-1', placeholder:, autocomplete: 'off'
@@ -339,10 +293,6 @@ module PgEngine
       end
     end
 
-    def ransack_placeholder(campo)
-      @form.object.translate(campo, include_associations: false)
-    end
-
     def parametros_controller
       params
     end

data/pg_engine/app/policies/pg_engine/base_policy.rb

@@ -89,8 +89,8 @@ module PgEngine
     end
 
     def objeto_borrado?
-      if record.respond_to?(:discarded?)
-        record.discarded?
+      if record.respond_to?(:kept?)
+        !record.kept?
       else
         false
       end

data/pg_engine/app/views/pg_engine/base/download.xlsx.axlsx

@@ -2,12 +2,12 @@
 
 wb = xlsx_package.workbook
 wb.add_worksheet(name: @clase_modelo.nombre_plural) do |sheet|
-  headers = atributos_para_listar.map { |a| @clase_modelo.human_attribute_name(a) }
+  headers = atributos_para_listar.map { |a, _sort_by| @clase_modelo.human_attribute_name(a) }
   headers.prepend 'ID interno'
   sheet.add_row(headers)
 
   @collection.decorate.each do |object|
-    array = atributos_para_listar.map do |att|
+    array = atributos_para_listar.map do |att, _sort_by|
       object.send(att)
     end
     array.prepend object.to_key

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

@@ -16,7 +16,7 @@
 
 - if @filtros.present? && show_filters?
   .border-bottom#filtros
-    .d-flex.align-items-center.p-2
+    .d-flex.align-items-center.px-3.py-2
       .px-2.d-none.d-sm-inline-block
         span.bi.bi-funnel-fill
       = search_form_for @q, url: namespaced_path(@clase_modelo) do |f|
@@ -49,7 +49,7 @@ div
           - @collection.each do |object|
             - object = object.decorate
             tr id="#{dom_id(object)}"
-              - atributos_para_listar.each do |att|
+              - atributos_para_listar.each do |att, _sort_field|
                 td.text-nowrap = object.send(att)
               td.text-nowrap.text-end.ps-5
                 .actions-wrapper

data/pg_engine/config/initializers/ransack.rb

@@ -25,6 +25,14 @@ module Arel
 end
 
 Ransack.configure do |config|
+  config.postgres_fields_sort_option = :nulls_always_last
+
+  config.custom_arrows = {
+    up_arrow: '<i class="bi bi-sort-up" />',
+    down_arrow: '<i class="bi bi-sort-down-alt" />',
+    default_arrow: ''
+  }
+
   # Piso predicados cont y not_cont para que usen unaccent
   config.add_predicate 'cont',
     arel_predicate: 'matches_unaccent',

data/pg_engine/config/locales/es.yml

@@ -3,10 +3,14 @@ es:
     predicates:
       cont: ''
       cont_all: ''
+      cont_any: ''
+      not_cont: 'no contiene'
       in: ''
       eq: ''
       lt: 'hasta'
       gt: 'desde'
+      lteq: 'hasta'
+      gteq: 'desde'
   pg_engine:
     base:
       index:

data/pg_engine/spec/controllers/concerns/pg_engine/resource_helper_spec.rb

@@ -47,65 +47,4 @@ describe PgEngine::Resource do
       expect(subject).to eq categoria_de_cosa
     end
   end
-
-  describe '#do_sort' do
-    subject do
-      instancia.send(:do_sort, scope, param, direction)
-    end
-
-    let!(:cosa_ult) { create :cosa, nombre: 'Z' }
-    let!(:cosa_pri) { create :cosa, nombre: 'a' }
-    let(:scope) { Cosa.all }
-    let(:param) { :nombre }
-    let(:direction) { :desc }
-
-    context 'asc' do
-      let(:direction) { :asc }
-
-      it do
-        expect(subject.to_a).to eq [cosa_pri, cosa_ult]
-      end
-    end
-
-    context 'desc' do
-      let(:direction) { :desc }
-
-      it do
-        expect(subject.to_a).to eq [cosa_ult, cosa_pri]
-      end
-    end
-
-    context 'cuando no existe el param' do
-      let(:param) { :inexistente }
-
-      it do
-        expect(subject.to_a).to eq [cosa_ult, cosa_pri]
-      end
-    end
-
-    context 'cuando ordeno por categoria' do
-      let(:param) { :categoria_de_cosa }
-
-      before do
-        cosa_pri.categoria_de_cosa.update_column(:nombre, 'a')
-        cosa_ult.categoria_de_cosa.update_column(:nombre, 'z')
-      end
-
-      context 'si es asc' do
-        let(:direction) { :asc }
-
-        it do
-          expect(subject.to_a).to eq [cosa_pri, cosa_ult]
-        end
-      end
-
-      context 'si es desc' do
-        let(:direction) { :desc }
-
-        it do
-          expect(subject.to_a).to eq [cosa_ult, cosa_pri]
-        end
-      end
-    end
-  end
 end

data/pg_engine/spec/factories/users.rb

@@ -43,6 +43,20 @@ FactoryBot.define do
     password { "password#{rand(99_999)}" }
     confirmed_at { Faker::Date.backward }
 
+    transient do
+      account { nil }
+    end
+
+    after(:create) do |model, context|
+      if context.account
+        model.user_accounts.create!(account: context.account)
+      end
+    end
+
+    trait :orphan do
+      orphan { true }
+    end
+
     trait :admin do
       developer { true }
     end

data/pg_rails/lib/pg_rails/tom_select_helpers.rb

@@ -0,0 +1,9 @@
+module PgRails
+  module TomSelectHelpers
+    def select_tom(placeholder:, text:)
+      find("input[placeholder=\"#{placeholder}\"]").click
+      find('.ts-wrapper [role="option"]', text:).click
+      send_keys :escape
+    end
+  end
+end

data/pg_rails/lib/version.rb

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

data/pg_scaffold/lib/generators/pg_scaffold/templates/controller.rb

@@ -26,7 +26,6 @@ class <%= controller_class_name.split('::').last %>Controller < <%= parent_contr
   end
 
   def atributos_para_buscar
-    # FIXME: append _cont
     %i[<%= atributos_a_filtrar.map(&:name).join(' ') %>]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.1.4
+  version: 7.1.6
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2024-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -866,6 +866,7 @@ files:
 - pg_rails/lib/pg_rails/dotenv_support.rb
 - pg_rails/lib/pg_rails/redis_support.rb
 - pg_rails/lib/pg_rails/rspec_logger_matchers.rb
+- pg_rails/lib/pg_rails/tom_select_helpers.rb
 - pg_rails/lib/pg_rails/vcr_support.rb
 - pg_rails/lib/version.rb
 - pg_rails/scss/bootstrap_overrides.scss