pg_rails 7.6.4 → 7.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 558b69c5a93797c069002f3477d6ccc34b63b98fa4f1a37ddedcc4ab6010ef3b
-  data.tar.gz: a3cc4d53326372aaa5e7155b2d50cfdee3fc3d0814a81eee53ec3701814c3e23
+  metadata.gz: 365f1740542a5fbba1bce8e40441e42581235cd67e68a7890292f512a63535d7
+  data.tar.gz: dfc9376def176892e05dc733c8a0df12a97f4b3da8c2fd0a31b1f7f5fc9b77a5
 SHA512:
-  metadata.gz: 259c3f0cc7c935f4a5b9569a2cd33cb1cc60e71a1c5cc85118fb3190415ebad4d78065c641bbe0bdaf479639df1be0ef93ded0ad589313f7dd23011ecfa618d8
-  data.tar.gz: b0e0ad29958f836916d4469d43bd5f3c8797eb9e00a981694034c025158083f28a0ea32bce7057a957bd2d2898d75daf7905fc9e0facd2ec78677f0de06c3389
+  metadata.gz: 94fc43c2038e908511860200282138fc7fa4ca95d8536abbbaa1530e5a975ffcdc8e6d64243669511c7c8a9abe6dfea0922f27fc23eea91f71c455d92295851f
+  data.tar.gz: 9020921857f2ec5e1d7af48321a9655b2f34557c0496a55b92bebd557772e9873e921bb7f1a9b8133093759c2f388c9ccc395949b13c5ad06ee68d52ae1eee86

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]

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_engine/app/assets/stylesheets/pg_rails_b5.scss

@@ -204,22 +204,47 @@ input[type=datetime-local], input[type=datetime] {
 // Inline edit
 
 .inline-edit {
-  // text-decoration: underline;
-  // text-decoration-style: dotted;
-  // text-decoration-color: #262626;
   border-bottom: 1px dotted #333;
   padding-bottom: 1px;
 
+  &:not(:has(.trix-content)) .edit-link {
+    margin-right: 0.25em;
+  }
+
+  &:has(.trix-content) .edit-link {
+    margin-bottom: 0.55em;
+    display: inline-block;
+    border-bottom: 1px dotted #333;
+  }
+
   a:hover {
     i {
       color: black;
     }
   }
 
+  form {
+    display: flex;
+    align-items: start;
+    gap: 0.25rem;
+
+    &:has(trix-editor) {
+      display: block;
+
+      .actions {
+        margin-top: 0.25rem;
+      }
+    }
+  }
+
   input[type=text] {
     min-width: 22em;
   }
 
+  select {
+    max-width: 45em;
+  }
+
   // To display correctly in tables with fixed witdh columns
   .form-select {
     width: initial;

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

@@ -1,14 +1,14 @@
 = helpers.turbo_frame_tag(@frame_id, class: 'inline-edit')
-  = helpers.pg_form_for(@model, render_errors: false, wrapper_mappings: @wrapper_mappings,
-                        html: { class: 'd-flex align-items-start gap-1' }) do |f|
+  = 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
 
-    = 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
+    .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_show_component.html.slim

@@ -1,8 +1,8 @@
 - 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', style: 'font-size: 0.8em' do
+              class: 'text-body-tertiary edit-link', style: 'font-size: 0.8em' do
       i.bi.bi-pencil
-    span.ms-1 = @model.decorate.send(@attribute)
+    span = @model.decorate.send(@attribute)
 - else
   = @model.decorate.send(@attribute)

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/lib/pg_form_builder.rb

@@ -31,6 +31,8 @@ class PgFormBuilder < SimpleForm::FormBuilder
 
     if find_on_all_associations(model.class, attribute_name).present?
       pg_associable(attribute_name, options)
+    elsif model.respond_to?("rich_text_#{attribute_name}")
+      rich_text_area attribute_name
     else
       input(attribute_name, options, &)
     end

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/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.4'
+  VERSION = '7.6.6'
 end

data/pg_rails/scss/pg_rails.scss

@@ -76,6 +76,11 @@ $values: 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100;
     text-overflow: ellipsis;
     white-space: nowrap;
     min-width: 30em * $value * 0.01;
+
+    // TODO: con css grid esto se debería poder hacer mejor
+    &:has(form) {
+      min-width: 28em;
+    }
   }
 }
 

metadata

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