pg_rails 7.6.5 → 7.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d093a397aa4021d053313ee524475eb24295290e56974623fdf03b0ab14691ee
-  data.tar.gz: b0ae6c35558a26ff88d59e4949341a2d1046bd0ff81ff83279961b70d20813dd
+  metadata.gz: c0c1496f0173c6ee43cc92f45a5ed539ad58b308533f9fb4fe0f04621882d6de
+  data.tar.gz: 6cc98c258ec0b585e705162da82386cb10f0726800641eafac229bad90759af4
 SHA512:
-  metadata.gz: 2c1d7f92c914bf3ca632cfcb04cdcb9a52870e69a057085df1b68bc7e402a4831f7ce1b008f9aa3a6e50bd3436ce192225f795f52841b939bb0733024c4c98fa
-  data.tar.gz: 87b8d08575eca14e090029038176c1dcf352047a340f41b3f908bfaf21b06614e952d5543a595e02503f25bb47d0dd45cb5ba86d74c089f0d4c35cde4b23db96
+  metadata.gz: 6638f89154fb33f4f840cee25e54d4fc7a544a3f7d65505c779e70d1830b360722ddba32b3e4b3b29e027fa04b76c06740ba687411eb95f055d049f9196dedb8
+  data.tar.gz: d2c19217475e137c8e2a8177a2325e3ac184d634740b580972bdd2be777c8e0ac6b48b2462cd6b7f5ca21c14828d9bb4d8263fe4eedd24421079bc205ecabc8c

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

@@ -39,7 +39,7 @@ module PgAssociable
     def collection_pc(atributo, _options)
       klass = clase_asociacion(atributo)
       user = Current.user
-      puede_crear = !template.using_modal? && Pundit::PolicyFinder.new(klass).policy.new(user, klass).new?
+      puede_crear = Pundit::PolicyFinder.new(klass).policy.new(user, klass).new_from_associable?
       collection = Pundit::PolicyFinder.new(klass).scope.new(user, klass).resolve
       collection = collection.kept if collection.respond_to?(:kept)
       [collection, puede_crear]
@@ -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/helpers/pg_associable/helpers.rb

@@ -4,7 +4,8 @@ module PgAssociable
 
     def pg_respond_abrir_modal
       src = clase_modelo.new.decorate.new_object_url
-      content = ModalContentComponent.new(src:).render_in(view_context)
+      turbo_frame_id = "modal_content_#{params[:id]}"
+      content = ModalContentComponent.new(src:, turbo_frame_id:).render_in(view_context)
       modal = AsociableModalComponent.new(modal_id: params[:id]).with_content(content)
       render turbo_stream: turbo_stream.append_all('body', modal)
     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

@@ -250,18 +250,3 @@ input[type=datetime-local], input[type=datetime] {
     width: initial;
   }
 }
-
-// WIP, inline rich text en listados
-.listado {
-  .inline-edit {
-    display: flex!important;
-    align-items: center;
-    gap: 0.25em;
-
-    &:has(.trix-content) .edit-link {
-      margin-bottom: 0;
-      display: inline;
-      border-bottom: none;
-    }
-  }
-}

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/components/modal_content_component.rb

@@ -1,5 +1,6 @@
 class ModalContentComponent < ViewComponent::Base
-  def initialize(src: nil)
+  def initialize(src: nil, turbo_frame_id: :modal_content)
+    @turbo_frame_id = turbo_frame_id
     @src = src
     with_content(loading_html) if @src.present?
 
@@ -20,7 +21,7 @@ class ModalContentComponent < ViewComponent::Base
         <div class="flash position-relative w-100 d-flex justify-content-center">
         </div>
       </div>
-      <%= helpers.turbo_frame_tag :modal_content,
+      <%= helpers.turbo_frame_tag @turbo_frame_id,
                                   **{ src: @src, refresh: :morph }.compact do %>
         <%= content %>
       <% end %>

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/policies/account_policy.rb

@@ -28,6 +28,11 @@ class AccountPolicy < ApplicationPolicy
   # def acceso_total?
   #   user.developer?
   # end
+
+  def new_from_associable?
+    false
+  end
+
   def base_access_to_record?
     ActsAsTenant.unscoped? ||
       record.user_accounts.pluck(:user_id).include?(user.id)

data/pg_engine/app/policies/pg_engine/base_policy.rb

@@ -25,6 +25,10 @@ module PgEngine
       create?
     end
 
+    def new_from_associable?
+      new?
+    end
+
     def update?
       puede_editar? && !objeto_borrado?
     end

data/pg_engine/app/policies/user_policy.rb

@@ -18,6 +18,10 @@ class UserPolicy < ApplicationPolicy
   #   acceso_total? && !record.readonly?
   # end
 
+  def new_from_associable?
+    false
+  end
+
   def base_access_to_record?
     user.developer? || user == record
   end

data/pg_engine/app/views/pg_engine/base/index.html.slim

@@ -14,9 +14,9 @@
 - if @filtros.present?
   = render SearchBarComponent.new(@q, @filtros)
 
-div
+.table-responsive style="padding-bottom: 15em"
   - if @collection.any?
-    .table-responsive
+    .xtable-responsive
       table.table.table-sm.listado.xpg-revert-width.xborder-end
         caption.ps-3 = page_entries_info @collection
         thead.table-light

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_engine/spec/system/modal_windows_spec.rb

@@ -24,7 +24,8 @@ describe 'Modal windows' do
       visitar
       click_on 'Cargar coso'
       select 'Completar', from: 'cosa_tipo'
-      select categoria_de_cosa.to_s, from: 'cosa_categoria_de_cosa_id'
+      find("input[placeholder='el placeholder'").click
+      click_on categoria_de_cosa.to_s
       find('.modal input[type=submit]').click
       expect(page).to have_text 'Por favor, revisá los campos obligatorios'
       fill_in 'cosa_nombre', with: 'bla'

data/pg_rails/lib/version.rb

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

data/pg_rails/scss/pg_rails.scss

@@ -76,6 +76,13 @@ $values: 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100;
     text-overflow: ellipsis;
     white-space: nowrap;
     min-width: 30em * $value * 0.01;
+
+    // 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.5
+  version: 7.6.7
 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