pg_rails 7.6.8 → 7.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61bc441e108885c9686261c08fc110a3096fd0da5f43b78c5b995f2d6a0ae69b
-  data.tar.gz: b016d6b41b1a814e135c0e15049469ea61c37a056bc4e9545b8946195d0e7164
+  metadata.gz: 893c71adcb5816e5cbd09b2860163a03d84c56a4980388578f22ce31dd75e2c6
+  data.tar.gz: 8debfcd4a503776a404c284add03df833a2e95efea61ba51e67068203bd72492
 SHA512:
-  metadata.gz: 31fc27bf74fce36435f8e23283d5612f893baca07f8d90ac26df6bfe870a7aa74df8b91b116445c680da11e8bebb1db35c7dba2f3ed46ab9ca458d72636f1ca8
-  data.tar.gz: 0a74fc77e43ef5000cd6acce42f1f48e00bcb07f80847c8a2b3c9c9c2e750ef96dceb51418092f1e3eb75ae160771b4ed4438c524c570dfa8b855a20462f56ba
+  metadata.gz: ee18015d09a9ab2940295018f8cb5e8feb2bebb015e90b18984971f6194360cb205b614d5649155df68cbc619f173f3dcb46c9df6aa4f3f3166a00841cb244ef
+  data.tar.gz: 77223fb87d0035b0165b4c0edf47830dfc5493a07ec567bc6628a8c3d3407dc2d16030b03d5502d310f8fbf0d2602293b1b63c82d0912166186449798db3beed

data/pg_associable/app/assets/stylesheets/pg_associable.scss

@@ -82,17 +82,26 @@
 .sub-wrapper {
   overflow: auto;
   box-shadow: 0px 9px 13px -3px rgba(0, 0, 0, 0.5);
+  z-index: 50;
   // position: absolute;
   // z-index: 1;
   background-color: #{$body-bg};
   border: 1px solid #a7b7bb;
   border-top: none;
   border-radius: 4px;
-  padding: 5px 0;
+  // padding: 5px 0;
   width: 100%;
 
   border-top-left-radius: 0;
   border-top-right-radius: 0;
+
+  a[data-action="asociable#crearItem"] {
+    position: sticky;
+    bottom: 0;
+    background-color: #faf5ff;
+    outline: 1px solid #ababcc;
+    box-shadow: 20px 9px 13px 7px rgba(0, 0, 0, 0.5);
+  }
 }
 .modal-asociable .modal-footer {
   justify-content: space-between;

data/pg_associable/app/helpers/pg_associable/form_builder_methods.rb

@@ -6,7 +6,7 @@ module PgAssociable
       mod.include PgEngine::RouteHelper
     end
 
-    MAXIMO_PARA_SELECT = 10
+    LIMIT_TO_AUTOPRELOAD = 10
     # TODO: si está entre 10 y 50, habilitar un buscador por js
 
     def pg_associable_pro(atributo, options = {})
@@ -27,15 +27,21 @@ module PgAssociable
       return input(atributo, options) if options[:disabled]
 
       collection, puede_crear = collection_pc(atributo, options)
-      options.deep_merge!({ wrapper_html: { 'data-puede-crear': 'true' } }) if puede_crear
+      collection_count = collection.count
+      options.deep_merge!({ wrapper_html: { 'data-puede-crear': text_for_new(atributo) } }) if puede_crear
 
-      if !puede_crear && collection.count <= MAXIMO_PARA_SELECT
+      if !puede_crear && collection_count <= LIMIT_TO_AUTOPRELOAD
         select_comun(atributo, options, collection)
       else
-        select_pro(atributo, options, collection)
+        select_pro(atributo, options, collection, collection_count)
       end
     end
 
+    def text_for_new(atributo)
+      klass = clase_asociacion(atributo)
+      klass.new.decorate.text_for_new
+    end
+
     def collection_pc(atributo, _options)
       klass = clase_asociacion(atributo)
       user = Current.user
@@ -45,7 +51,12 @@ module PgAssociable
       [collection, puede_crear]
     end
 
-    def select_pro(atributo, options, collection)
+    def select_pro(atributo, options, collection, collection_count = nil)
+      if collection_count.present? && collection_count.positive? &&
+         collection_count < LIMIT_TO_AUTOPRELOAD && options[:preload].blank?
+        options[:preload] = collection
+      end
+
       if (preload = options.delete(:preload))
         collection = preload.is_a?(Integer) ? collection.limit(preload) : preload
         options.deep_merge!({ wrapper_html: { 'data-preload': collection.decorate.to_json } })

data/pg_associable/app/helpers/pg_associable/helpers.rb

@@ -16,9 +16,10 @@ module PgAssociable
       query = params[:query]
       timeout_id = params[:timeout_id]
       @collection = search_in_scope(query)
+      @count = @collection.count
       render turbo_stream:
         turbo_stream.update("#{resultados_prefix}-#{params[:id]}",
-                            partial:, locals: { collection: @collection, query:, timeout_id: })
+                            partial:, locals: { collection: @collection, query:, timeout_id:, count: @count })
     end
 
     def search_in_scope(query)

data/pg_associable/app/javascript/asociable_controller.tsx

@@ -27,7 +27,6 @@ export default class extends Controller {
     this.subWrapper.setAttribute('id', `resultados-inline-${this.elemId}`)
     this.subWrapper.classList.add('sub-wrapper')
     this.subWrapper.classList.add('position-absolute')
-    this.subWrapper.classList.add('z-1')
     result.appendChild(this.subWrapper)
     this.input.parentNode.appendChild(result)
 
@@ -138,16 +137,6 @@ export default class extends Controller {
   resetResultados () {
     this.lastValue = null
     const rows = []
-    if (this.element.dataset.puedeCrear) {
-      rows.push(
-        <a key="new" href="javascript:void(0)"
-           className="list-group-item"
-           data-action="asociable#crearItem"
-        >
-          Nuevo
-        </a>
-      )
-    }
     if (this.element.dataset.preload) {
       JSON.parse(this.element.dataset.preload).forEach((object) => {
         rows.push(
@@ -162,6 +151,18 @@ export default class extends Controller {
         )
       })
     }
+    if (this.element.dataset.puedeCrear) {
+      rows.push(
+        <a key="new" href="javascript:void(0)"
+           className="list-group-item mt-3 text-center"
+           data-action="asociable#crearItem"
+        >
+          <i className="bi bi-stars"/>
+          &nbsp;
+          {this.element.dataset.puedeCrear}
+        </a>
+      )
+    }
     this.subWrapper.innerHTML = renderToStaticMarkup(
       <div className="resultados" tabIndex={-1}>
         <ul className="list-group list-group-flush">
@@ -279,7 +280,6 @@ export default class extends Controller {
         <input type="hidden" name="id" value={this.elemId} />
         <input type="hidden" name="query" value={this.input.value} />
         <input type="hidden" name="timeout_id" value={timeouts} />
-        <input type="hidden" name="puede_crear" value={this.element.dataset.puedeCrear} />
       </form>
     )
     const form = document.createElement('div')

data/pg_associable/app/views/pg_associable/_resultados_inline.html.slim

@@ -1,12 +1,23 @@
-/ # locals: (collection:, query:, timeout_id:, field_name: nil)
+/ # locals: (collection:, query:, timeout_id:, count:, field_name: nil)
 .resultados.inline tabindex="-1"
   div data-controller="clear-timeout" data-timeout-id="#{timeout_id}"
   ul.list-group.list-group-flush
-    - if collection.any?
+    - if count.positive?
+      .text-center.fst-italic.text-secondary.pt-1 style="font-size:0.7em"
+        | #{count} resultados para "#{query}"
       - collection.each do |object|
         = link_to object.to_s, 'javascript:void(0)',
                   class: 'list-group-item',
                   data: { action: 'asociable#selectItem',
                           id: object.id, object: object.decorate.to_json, field_name: }
     - else
-      li.px-3.py-1 style="font-size: 0.85em" No hay resultados para "#{query}"
+      li [class="list-group-item text-center text-warning-emphasis py-2" style="font-size: 0.85em"]
+        | No hay resultados para "#{query}"
+
+    - if policy(clase_modelo).new_from_associable?
+      / TODO: unificar código repetido en asociable_controller.js
+      a [key="new" href="javascript:void(0)" class="list-group-item mt-3 text-center"
+         data-action="asociable#crearItem"]
+        i class="bi bi-stars"
+        |  
+        = clase_modelo.new.decorate.text_for_new

data/pg_associable/spec/system/associable_spec.rb

@@ -14,7 +14,7 @@ describe 'Associable' do
     fill_in 'cosa_nombre', with: 'La cosa'
     select 'Los', from: 'cosa_tipo'
     find('.cosa_categoria_de_cosa input[type=text]').click
-    expect(page).to have_text :all, 'Nuevo'
+    expect(page).to have_text :all, 'Nueva categoría de cosa'
     find('.cosa_categoria_de_cosa .list-group-item').click
     select Account.first.to_s
     fill_in 'categoria_de_cosa_nombre', with: 'la categoría'

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

@@ -211,6 +211,10 @@ input[type=datetime-local], input[type=datetime] {
   border-bottom: 1px dotted #333;
   padding-bottom: 1px;
 
+  .edit-link {
+    color: rgba(33, 37, 41, 0.21);
+  }
+
   &:not(:has(.trix-content)) .edit-link {
     margin-right: 0.25em;
   }
@@ -221,8 +225,8 @@ input[type=datetime-local], input[type=datetime] {
     border-bottom: 1px dotted #333;
   }
 
-  a:hover {
-    i {
+  &:hover {
+    .edit-link i {
       color: black;
     }
   }

data/pg_engine/app/components/inline_edit/inline_edit_component.html.slim

@@ -1,18 +1,19 @@
 = helpers.turbo_frame_tag(@frame_id, class: 'inline-edit')
-  = helpers.pg_form_for(@model, render_errors: false, wrapper_mappings: @wrapper_mappings) do |f|
-    = hidden_field_tag :inline_attribute, @attribute
+  div data-controller="pg_form"
+    = helpers.pg_form_for(@model, render_errors: false, wrapper_mappings: @wrapper_mappings) do |f|
+      = hidden_field_tag :inline_attribute, @attribute
 
-    / html5 solo aplica a datetime
-    / date_selector solo aplica a date
-    / ignore_date y prompt solo aplica a time
-    / cada caso es inocuo para el resto de los types
-    = f.field @unsuffixed_attribute, label: false, date_selector: true, minute_step: 15,
-                                     ignore_date: true, prompt: { hour: 'hh', minute: 'mm' }
-    .actions.d-flex.gap-1
-      = button_tag class: 'btn btn-sm btn-primary',
-                   data: { controller: 'tooltip', 'bs-title': 'Guardar' } do
-        i.bi.bi-check-lg
-      = link_to users_inline_show_path(model: @model.to_gid, attribute: @attribute),
-                class: 'btn btn-sm btn-secondary',
-                data: { controller: 'tooltip', 'bs-title': 'Cancelar' } do
-        i.bi.bi-x-lg
+      / html5 solo aplica a datetime
+      / date_selector solo aplica a date
+      / ignore_date y prompt solo aplica a time
+      / cada caso es inocuo para el resto de los types
+      = f.field @unsuffixed_attribute, label: false, date_selector: true, minute_step: 15,
+        ignore_date: true, prompt: { hour: 'hh', minute: 'mm' }
+      .actions.d-flex.gap-1
+        = button_tag class: 'btn btn-sm btn-primary',
+                     data: { controller: 'tooltip', 'bs-title': 'Guardar' } do
+          i.bi.bi-check-lg
+        = link_to users_inline_show_path(model: @model.to_gid, attribute: @attribute),
+                  class: 'btn btn-sm btn-secondary',
+                  data: { controller: 'tooltip', 'bs-title': 'Cancelar' } do
+          i.bi.bi-x-lg

data/pg_engine/app/components/inline_edit/inline_edit_component.rb

@@ -3,7 +3,7 @@ class InlineEditComponent < InlineComponent
     @wrapper_mappings = {
       string: :inline_form_grow,
       pg_associable: :inline_form_control,
-      date: :inline_form_control,
+      date: :inline_form_control_autosubmit,
       datetime: :inline_form_control,
       time: :inline_multi_select,
       select: :inline_form_select

data/pg_engine/app/components/inline_edit/inline_show_component.html.slim

@@ -4,7 +4,7 @@
               data: { \
                 controller: :tooltip,
                 'bs-title': "Modificar #{@model.class.human_attribute_name(@attribute).downcase}" },
-                class: 'text-body-tertiary edit-link', style: 'font-size: 0.8em' do
+                class: 'edit-link', style: 'font-size: 0.8em' do
       i.bi.bi-pencil
     span = @model.decorate.send(@attribute)
 - else

data/pg_engine/app/decorators/pg_engine/base_record_decorator.rb

@@ -26,6 +26,13 @@ module PgEngine
       truncate(object.to_s)
     end
 
+    def text_for_new
+      klass = object.class
+      # TODO: no está bueno tener que hacer el new, gender debería estar en la clase
+      verb = klass.new.gender == 'f' ? 'Nueva' : 'Nuevo'
+      "#{verb} #{klass.model_name.human.downcase}"
+    end
+
     # rubocop:disable Style/MissingRespondToMissing
     def method_missing(method_name, *args, &)
       valor = object.attributes[method_name.to_s]

data/pg_engine/config/simple_form/simple_form_bootstrap.rb

@@ -310,6 +310,21 @@ SimpleForm.setup do |config|
     b.optional :hint, wrap_with: { class: 'form-text' }
   end
 
+  config.wrappers :inline_form_control_autosubmit, class: '' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :minlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'visually-hidden'
+
+    b.use :input, class: 'form-control form-control-sm', error_class: 'is-invalid', 'data-action': 'pg_form#submit'
+    b.use :error, wrap_with: { class: 'invalid-feedback' }
+    b.optional :hint, wrap_with: { class: 'form-text' }
+  end
+
   config.wrappers :inline_form_select, class: '' do |b|
     b.use :html5
     b.use :placeholder
@@ -320,7 +335,7 @@ SimpleForm.setup do |config|
     b.optional :readonly
     b.use :label, class: 'visually-hidden'
 
-    b.use :input, class: 'form-select form-select-sm', error_class: 'is-invalid'
+    b.use :input, class: 'form-select form-select-sm', error_class: 'is-invalid', 'data-action': 'pg_form#submit'
     b.use :error, wrap_with: { class: 'invalid-feedback' }
     b.optional :hint, wrap_with: { class: 'form-text' }
   end

data/pg_layout/app/javascript/application.js

@@ -5,28 +5,30 @@ import './elements'
 
 import { Turbo } from '@hotwired/turbo-rails'
 
+import Trix from 'trix'
+
 document.addEventListener('trix-before-initialize', (ev) => {
-  Trix.config.lang.attachFiles = "Adjuntar archivos"
-  Trix.config.lang.bold = "Negrita"
-  Trix.config.lang.bullets = "Lista sin números"
-  Trix.config.lang.byte = "Byte"
-  Trix.config.lang.bytes = "Bytes"
-  Trix.config.lang.captionPlaceholder = "Agregá un subtítulo"
-  Trix.config.lang.code = "Monospace"
-  Trix.config.lang.heading1 = "Título"
-  Trix.config.lang.indent = "Incrementar nivel"
-  Trix.config.lang.italic = "Cursiva"
-  Trix.config.lang.link = "Linkear"
-  Trix.config.lang.numbers = "Lista numerada"
-  Trix.config.lang.outdent = "Disminuir nivel"
-  Trix.config.lang.quote = "Cita"
-  Trix.config.lang.redo = "Rehacer"
-  Trix.config.lang.remove = "Quitar"
-  Trix.config.lang.strike = "Tachar"
-  Trix.config.lang.undo = "Deshacer"
-  Trix.config.lang.unlink = "Deslinkear"
-  Trix.config.lang.url = "URL"
-  Trix.config.lang.urlPlaceholder = "Ingresá una URL"
+  Trix.config.lang.attachFiles = 'Adjuntar archivos'
+  Trix.config.lang.bold = 'Negrita'
+  Trix.config.lang.bullets = 'Lista sin números'
+  Trix.config.lang.byte = 'Byte'
+  Trix.config.lang.bytes = 'Bytes'
+  Trix.config.lang.captionPlaceholder = 'Agregá un subtítulo'
+  Trix.config.lang.code = 'Monospace'
+  Trix.config.lang.heading1 = 'Título'
+  Trix.config.lang.indent = 'Incrementar nivel'
+  Trix.config.lang.italic = 'Cursiva'
+  Trix.config.lang.link = 'Linkear'
+  Trix.config.lang.numbers = 'Lista numerada'
+  Trix.config.lang.outdent = 'Disminuir nivel'
+  Trix.config.lang.quote = 'Cita'
+  Trix.config.lang.redo = 'Rehacer'
+  Trix.config.lang.remove = 'Quitar'
+  Trix.config.lang.strike = 'Tachar'
+  Trix.config.lang.undo = 'Deshacer'
+  Trix.config.lang.unlink = 'Deslinkear'
+  Trix.config.lang.url = 'URL'
+  Trix.config.lang.urlPlaceholder = 'Ingresá una URL'
 })
 
 document.addEventListener('pg:record-created', (ev) => {

data/pg_layout/app/javascript/controllers/pg_form_controller.js

@@ -34,4 +34,19 @@ export default class extends Controller {
       }
     }
   }
+
+  submit () {
+    let form = null
+    if (this.element instanceof HTMLFormElement) {
+      form = this.element
+    } else {
+      form = this.element.querySelector('form')
+    }
+    if (form) {
+      form.requestSubmit()
+    } else {
+      Rollbar.error('No form found')
+      console.error('No form found')
+    }
+  }
 }

data/pg_rails/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.8
+  version: 7.6.10
 platform: ruby
 authors:
 - Martín Rosso