pg_rails 7.1.0 → 7.1.1.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22051324268199a76c6b3bc928fe0391326c16951b65586d4e1d492e6705735c
-  data.tar.gz: 3f48621a08c26bdf19b07673a70bac70cf46035a98fb95063c710bcc1673a840
+  metadata.gz: f1a5b2d45d523d85b889cb132876fecfa47dcb5ec2215745a8a5f52f65cb64d1
+  data.tar.gz: 2d3a6033834156a52fd1b2732fa5807da7c543a0ebac232ce1e588e2b8264595
 SHA512:
-  metadata.gz: 89c635b554cdd4aa4b7e809c747be08d501fae9ca78e5c4c54da16d630a0858893034e424d13c3d28b6eaf221175f520db66150abf6e6d151115dd219ed79429
-  data.tar.gz: d75744f9d5d3b020e54f63dbf8c289049795d9f2f95e8a56c4c657ca701e171a6077097de5db1155ca104b2b02ff242052803866b458a4d67a7946e59df29dfd
+  metadata.gz: e8307c9947ada0096c2c631c688fa6b5117c48473bd263786af090814aed41641535a5a205d9bfbfceef9ced876b8814b09e7dbcb6176730dc339f4499921e48
+  data.tar.gz: 5dff3bd33e3eb3adfe4f1ce205c34f6099ae1446cf58288aa411c863511531bab2aa40d476c04c6e41a2d5b8df72ff53bc9857f3fc6f6b311b4d620e1de6df12

data/pg_associable/app/javascript/modal_controller.js

@@ -9,6 +9,14 @@ export default class extends Controller {
 
   connect (e) {
     this.modalPuntero = new bootstrap.Modal(this.element)
+    if (this.element.dataset.removeOnHide) {
+      this.element.addEventListener('hidden.bs.modal', (e) => {
+        this.element.remove()
+        window.Stimulus.controllers.map((c) => { return c.calendar })
+          .filter((e) => { return e })
+          .forEach((c) => { c.refetchEvents() })
+      })
+    }
     this.modalPuntero.show()
     document.addEventListener('turbo:before-cache', () => {
       this.element.remove()

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

@@ -146,7 +146,8 @@ input[type=datetime-local], input[type=datetime] {
 }
 .fc-multimonth {
   .fc-daygrid-day-events {
-    display: none;
+    xdisplay: none;
+    visibility: hidden;
   }
   .fc-daygrid-day-top {
     display: inline-block;

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

@@ -89,6 +89,7 @@ module PgEngine
       object = instancia_modelo
       respond_to do |format|
         if (@saved = object.save)
+          # TODO: 'asociable' lo cambiaría por 'in_modal' o algo así
           if params[:asociable]
             format.turbo_stream do
               render turbo_stream:
@@ -96,7 +97,8 @@ module PgEngine
                   <div data-modal-target="response" data-response='#{object.decorate.to_json}'></div>
                 HTML
                 )
-              # rubocop:enable Rails/SkipsModelValidations
+              # FIXME: handlear json
+              # render json: object.decorate, content_type: 'application/json'
             end
           end
           format.html do
@@ -113,10 +115,9 @@ module PgEngine
           # self.instancia_modelo = instancia_modelo.decorate
           if params[:asociable]
             format.turbo_stream do
-              # rubocop:disable Rails/SkipsModelValidations
+              # FIXME: agregar , status: :unprocessable_entity
               render turbo_stream:
                 turbo_stream.update_all('.modal.show .pg-associable-form', partial: 'form', locals: { asociable: true })
-              # rubocop:enable Rails/SkipsModelValidations
             end
           end
           format.html { render :new, status: :unprocessable_entity }
@@ -138,9 +139,14 @@ module PgEngine
     end
 
     def pg_respond_show(object = nil)
-      respond_to do |format|
-        format.json { render json: object || instancia_modelo }
-        format.html
+      object ||= instancia_modelo
+      if params[:modal].present?
+        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 }
+          format.html
+        end
       end
     end
 

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/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_layout/app/views/pg_layout/_modal_show.html.slim

@@ -0,0 +1,9 @@
+.modal.modal-lg.modal-asociable[tabindex="-1" data-controller="modal" data-remove-on-hide="true"]
+  .modal-dialog
+    .modal-content
+      .modal-header
+        .modal-title
+          h3 Item
+        a.btn-close[type="button" data-bs-dismiss="modal" aria-label="Close"]
+      .modal-body
+        = render object

data/pg_rails/lib/version.rb

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

data/pg_rails/scss/bootstrap_overrides.scss

@@ -7,7 +7,8 @@ $danger-bg-subtle:        tint-color($danger, 98%);
 // $info-border-subtle:      tint-color($info, 60%);
 $warning-border-subtle:   tint-color($warning, 20%);
 // $danger-border-subtle:    tint-color($danger, 60%);
-
 $secondary-bg-subtle:     tint-color($secondary, 92%);
+$warning-bg-subtle:       tint-color($warning, 40%);
+
 
 $btn-close-focus-shadow: none;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.1.1.pre.2
 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
@@ -848,6 +848,7 @@ files:
 - pg_layout/app/views/layouts/pg_layout/mailer.html.slim
 - pg_layout/app/views/layouts/pg_layout/mailer.text.erb
 - pg_layout/app/views/pg_layout/_flash.html.slim
+- pg_layout/app/views/pg_layout/_modal_show.html.slim
 - pg_layout/app/views/pg_layout/_navbar.html.erb
 - pg_layout/app/views/pg_layout/_sidebar.html.erb
 - pg_layout/app/views/pg_layout/_sidebar_mobile.html.erb