pg_rails 7.6.6 → 7.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 365f1740542a5fbba1bce8e40441e42581235cd67e68a7890292f512a63535d7
-  data.tar.gz: dfc9376def176892e05dc733c8a0df12a97f4b3da8c2fd0a31b1f7f5fc9b77a5
+  metadata.gz: 61bc441e108885c9686261c08fc110a3096fd0da5f43b78c5b995f2d6a0ae69b
+  data.tar.gz: b016d6b41b1a814e135c0e15049469ea61c37a056bc4e9545b8946195d0e7164
 SHA512:
-  metadata.gz: 94fc43c2038e908511860200282138fc7fa4ca95d8536abbbaa1530e5a975ffcdc8e6d64243669511c7c8a9abe6dfea0922f27fc23eea91f71c455d92295851f
-  data.tar.gz: 9020921857f2ec5e1d7af48321a9655b2f34557c0496a55b92bebd557772e9873e921bb7f1a9b8133093759c2f388c9ccc395949b13c5ad06ee68d52ae1eee86
+  metadata.gz: 31fc27bf74fce36435f8e23283d5612f893baca07f8d90ac26df6bfe870a7aa74df8b91b116445c680da11e8bebb1db35c7dba2f3ed46ab9ca458d72636f1ca8
+  data.tar.gz: 0a74fc77e43ef5000cd6acce42f1f48e00bcb07f80847c8a2b3c9c9c2e750ef96dceb51418092f1e3eb75ae160771b4ed4438c524c570dfa8b855a20462f56ba

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

@@ -61,6 +61,8 @@ module PgAssociable
 
     def select_comun(atributo, options, collection)
       options[:collection] = collection
+      options[:include_blank] = 'Ninguno'
+      options[:prompt] = nil
       association atributo, options
     end
 

data/pg_associable/app/javascript/asociable_controller.tsx

@@ -311,6 +311,10 @@ export default class extends Controller {
       this.element.dataset.object = object
       const event = new CustomEvent('pg_associable:changed', { detail: object })
       this.element.dispatchEvent(event)
+      const inlineEdit = this.element.closest('.inline-edit')
+      if (inlineEdit) {
+        inlineEdit.querySelector('button[type=submit]').click()
+      }
     } else {
       hiddenField.value = null
       textField.value = null

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

@@ -2,8 +2,12 @@
   = helpers.pg_form_for(@model, render_errors: false, wrapper_mappings: @wrapper_mappings) do |f|
     = hidden_field_tag :inline_attribute, @attribute
 
-    = f.field @unsuffixed_attribute, label: false, html5: true
-
+    / 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

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

@@ -5,6 +5,7 @@ class InlineEditComponent < InlineComponent
       pg_associable: :inline_form_control,
       date: :inline_form_control,
       datetime: :inline_form_control,
+      time: :inline_multi_select,
       select: :inline_form_select
     }
 

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

@@ -1,7 +1,10 @@
 - if @model.class.inline_editable?(@unsuffixed_attribute) && helpers.policy(@model).edit?
   = helpers.turbo_frame_tag(@frame_id, class: 'inline-edit')
     = link_to users_inline_edit_path(model: @model.to_gid, attribute: @attribute),
-              class: 'text-body-tertiary edit-link', style: 'font-size: 0.8em' do
+              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
       i.bi.bi-pencil
     span = @model.decorate.send(@attribute)
 - else

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

@@ -34,7 +34,12 @@ module PgEngine
       if valor.instance_of?(Date)
         dmy(valor)
       elsif valor.instance_of?(ActiveSupport::TimeWithZone)
-        dmy_time(valor)
+        column = object.class.columns.find { |c| c.name == method_name.to_s }
+        if column.present? && column.type == :time
+          hhmm(valor)
+        else
+          dmy_time(valor)
+        end
       else
         super
       end

data/pg_engine/app/helpers/pg_engine/print_helper.rb

@@ -51,6 +51,12 @@ module PgEngine
       date.strftime('%d/%m/%Y %H:%M')
     end
 
+    def hhmm(time)
+      return if time.blank?
+
+      time.strftime('%H:%M')
+    end
+
     def dmy(date)
       return if date.blank?
 

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

@@ -141,6 +141,16 @@ SimpleForm.setup do |config|
     b.use :hint, wrap_with: { class: 'form-text' }
   end
 
+  config.wrappers :inline_multi_select, class: '' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.wrapper class: 'd-flex flex-row justify-content-between align-items-center' do |ba|
+      ba.use :input, class: 'form-select form-select-sm mx-1', error_class: 'is-invalid'
+    end
+    b.use :error, wrap_with: { class: 'invalid-feedback d-block' }
+    b.use :hint, wrap_with: { class: 'form-text' }
+  end
+
   # vertical range input
   config.wrappers :vertical_range, class: 'mb-3' do |b|
     b.use :html5

data/pg_layout/app/javascript/application.js

@@ -5,6 +5,30 @@ import './elements'
 
 import { Turbo } from '@hotwired/turbo-rails'
 
+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_rails/lib/version.rb

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

data/pg_rails/scss/pg_rails.scss

@@ -77,9 +77,11 @@ $values: 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100;
     white-space: nowrap;
     min-width: 30em * $value * 0.01;
 
-    // TODO: con css grid esto se debería poder hacer mejor
+    // FIXME: con css grid esto se debería poder hacer mejor
+    // además, el pg_asociable directamente se rompe
     &:has(form) {
       min-width: 28em;
+      overflow: initial;
     }
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.6
+  version: 7.6.8
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-10 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails