pg_rails 7.1.1.pre.1 → 7.1.1.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26619042e1d28565472f7c5dd99e31b4a75668c3efd5e0c299ad6f3a5e6f71cd
-  data.tar.gz: 1f306defd53cda0f8567ac4f17465b99aaed1d1293565b08b08176b853301713
+  metadata.gz: '08c5ab91e5c32e537c33112965e6be68eb7d5992e236f27752a182af7cf584ff'
+  data.tar.gz: 32461e729fa13575fbd61f9c02e5907e06e6b8acabd18068db0c049483a83536
 SHA512:
-  metadata.gz: a338901f4520b0a9dd9b7dfb363951ddd884f20ad87b9bcd5fea6591d908383c22a942ff9be7e6f914a7788e18e8233b58a541cb5b37d27f889665025bdede16
-  data.tar.gz: e21ec84cfa1a7191fdc5776524cfa1e67468f38720080ceb6299dd9305f16d7f57cc155314f72d9eaa79a6ed0a2c7d9834d7781f80eeb0e0d7d53f6827557230
+  metadata.gz: 1b0caab961e097ce6a9b770fecbc02c179013987d20fdd016f44f2675084555b44ff700f94abe07f748fb4a55466614ef44c28758420881c096781936edbb9bb
+  data.tar.gz: 6652961ad489a6a699819874c79c69356f6a9f8882f1c4ed195556b16d8836c440886db77bee3f2a60f2fda6c07e9a68f525c2c91ceba9748c01caf89449e421

data/pg_associable/app/javascript/modal_controller.js

@@ -14,8 +14,8 @@ export default class extends Controller {
         this.element.remove()
         window.Stimulus.controllers.map((c) => { return c.calendar })
           .filter((e) => { return e })
-          .map((c) => { c.refetchEvents() })
-          })
+          .forEach((c) => { c.refetchEvents() })
+      })
     }
     this.modalPuntero.show()
     document.addEventListener('turbo:before-cache', () => {

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

@@ -65,6 +65,7 @@ input[type=datetime-local], input[type=datetime] {
   }
 }
 .listado td:has(.btn) {
+  // FIXME: rompe porque es una tabla y tiene que tener su propio display
   display: flex;
   justify-content: flex-end;
   gap: 4px;

data/pg_engine/app/components/alert_component.rb

@@ -4,7 +4,6 @@ class AlertComponent < ViewComponent::Base
   def initialize(type:, toast: false, dismissible: true)
     @type = type.to_s
 
-    # rubocop:disable Style/IfUnlessModifier
     unless @type.in? ApplicationController._flash_types.map(&:to_s)
       raise PgEngine::Error, 'el type no es válido'
     end

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

@@ -22,6 +22,7 @@ module Admin
     def create
       saved = false
       ActiveRecord::Base.transaction do
+        # FIXME: acá la transaction jode porque el ActiveJob no puede deserializar el Email
         if (saved = @email.save)
           PgEngine::AdminMailer.with(email_object: @email).admin_mail.deliver_later
         end

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

@@ -139,7 +139,7 @@ module PgEngine
     end
 
     def pg_respond_show(object = nil)
-      object = object || instancia_modelo
+      object ||= instancia_modelo
       if params[:modal].present?
         render turbo_stream: turbo_stream.append_all('body', partial: 'pg_layout/modal_show', locals: { object: })
       else

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

@@ -17,10 +17,10 @@ module PgEngine
               end
         cgi['order_by'] = campo
         cgi['order_direction'] =
-          if field.to_s == campo.to_s && direction.to_s == 'asc'
-            'desc'
-          else
+          if field.to_s == campo.to_s && direction.to_s == 'desc'
             'asc'
+          else
+            'desc'
           end
 
         symbol = if field.to_s == campo.to_s

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

@@ -72,13 +72,21 @@ module PgEngine
             raise 'filtro de asociacion no soportado'
           end
         elsif tipo(campo).in?(%i[string text])
-          match_vector = parametros[campo].split.map { |a| "#{a}:*" }.join(' & ')
-          match_like = "%#{parametros[campo]}%"
+          columna = @clase_modelo.columns.find { |c| c.name == campo.to_s }
           campo_tabla = "#{@clase_modelo.table_name}.#{campo}"
-          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)
+          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

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

@@ -2,12 +2,15 @@
 
 wb = xlsx_package.workbook
 wb.add_worksheet(name: @clase_modelo.nombre_plural) do |sheet|
-  sheet.add_row(atributos_para_listar.map { |a| @clase_modelo.human_attribute_name(a) })
+  headers = atributos_para_listar.map { |a| @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|
       object.send(att)
     end
+    array.prepend object.to_key
     sheet.add_row array
   end
 end

data/pg_engine/config/locales/es.yml

@@ -5,6 +5,9 @@ es:
         empty: 'No hay %{model} aún'
         empty_but_filtered: 'No hay %{model} para los filtros aplicados'
   attributes:
+    external_labels: Etiquetas externas
+    external_source: Fuente externa
+    external_id: ID externo
     created_at: Fecha de creación
     updated_at: Fecha de actualización
     discarded_at: Fecha de borrado

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.1.1.pre.1
+  version: 7.1.1.pre.3
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails