pg_rails 7.6.7 → 7.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0c1496f0173c6ee43cc92f45a5ed539ad58b308533f9fb4fe0f04621882d6de
-  data.tar.gz: 6cc98c258ec0b585e705162da82386cb10f0726800641eafac229bad90759af4
+  metadata.gz: 91cd30e1ebe3fd2ec058f38ac2ad843421e8bb65c989aa5c8b5b7597703719f5
+  data.tar.gz: ceeaa8d7d5a2e3cfb32b39ff6c5da0b4c497a826685ef35f92be2cade7ad2d28
 SHA512:
-  metadata.gz: 6638f89154fb33f4f840cee25e54d4fc7a544a3f7d65505c779e70d1830b360722ddba32b3e4b3b29e027fa04b76c06740ba687411eb95f055d049f9196dedb8
-  data.tar.gz: d2c19217475e137c8e2a8177a2325e3ac184d634740b580972bdd2be777c8e0ac6b48b2462cd6b7f5ca21c14828d9bb4d8263fe4eedd24421079bc205ecabc8c
+  metadata.gz: 4e4444db810e6836a963c75fa5727c39f434c6032c269671bd9286fca0eb788a3013c45f494cebf2c583df4bc0c37803922d86090bc10685e46fee4b158919aa
+  data.tar.gz: a44d48f9d63295bdf519ac6ba424ebc0d1ed1c69f28b5c8be898b1c58dc72165a8ae3b5bb75f4ac47efc13987fba2e134cf275f03a7ac00f9251774f1f387c78

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

@@ -138,16 +138,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 +152,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 +281,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 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

@@ -34,6 +34,10 @@ nav[aria-label=breadcrumb] a {
   border: 1px solid $red;
 }
 
+.trix-content figure a:hover {
+  text-decoration: underline;
+}
+
 input[disabled] {
   background-color: #e9e9ed;
   color: black;

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

@@ -8,12 +8,6 @@ class InlineComponent < ViewComponent::Base
     super
   end
 
-  def before_render
-    return unless controller.in_modal?
-
-    controller.instance_variable_set(:@using_modal, true)
-  end
-
   SUFIJOS = %i[f text].freeze
   def unsuffixed(attribute)
     ret = attribute.to_s.dup

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/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/app/views/active_storage/blobs/_blob.html.erb

@@ -1 +1,16 @@
-<%= image_tag blob %>
+<figure class="attachment attachment--<%= blob.representable? ? "preview" : "file" %> attachment--<%= blob.filename.extension %>">
+  <% if blob.representable? %>
+    <%= image_tag blob.representation(resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %>
+  <% end %>
+
+  <%= link_to rails_blob_path(blob) do %>
+    <figcaption class="attachment__caption">
+      <% if caption = blob.try(:caption) %>
+        <%= caption %>
+      <% else %>
+        <span class="attachment__name"><%= blob.filename %></span>
+        <span class="attachment__size"><%= number_to_human_size blob.byte_size %></span>
+      <% end %>
+    </figcaption>
+  <% end %>
+</figure>

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,6 +5,32 @@ 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'
+})
+
 document.addEventListener('pg:record-created', (ev) => {
   Turbo.visit(window.location)
   setTimeout(() => {

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.7'
+  VERSION = '7.6.9'
 end

metadata

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