pg_rails 7.2.3 → 7.3.1

data/pg_engine/app/helpers/pg_engine/flash_helper.rb

@@ -1,7 +1,11 @@
 module PgEngine
   module FlashHelper
-    def render_turbo_stream_flash_messages
-      turbo_stream.prepend 'flash', partial: 'pg_layout/flash'
+    def render_turbo_stream_flash_messages(to: nil)
+      if to.present?
+        turbo_stream.prepend_all to, partial: 'pg_layout/flash'
+      else
+        turbo_stream.prepend 'flash', partial: 'pg_layout/flash'
+      end
     end
 
     def render_turbo_stream_title

data/pg_engine/app/helpers/pg_engine/form_helper.rb

@@ -2,7 +2,8 @@
 
 module PgEngine
   module FormHelper
-    def pg_form_for(object, *args, &)
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def pg_form_for(object, *args, &block_passed)
       resource = object
       if object.is_a? PgEngine::BaseRecordDecorator
         object = object.target_object
@@ -27,8 +28,20 @@ module PgEngine
         options[:html][:data][:errors] = resource.errors.details.to_json
       end
 
-      simple_form_for(object, *(args << options), &)
+      if options[:render_errors].nil?
+        options[:render_errors] = true
+      end
+
+      block_with_additives = lambda do |f|
+        ret = ''.html_safe
+        ret += f.mensajes_de_error if options[:render_errors]
+        ret += capture(f, &block_passed)
+        ret
+      end
+
+      simple_form_for(object, *(args << options), &block_with_additives)
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     def url_change_format(url, formato)
       uri = URI.parse(url)

data/pg_engine/app/helpers/pg_engine/frame_helper.rb

@@ -0,0 +1,52 @@
+module PgEngine
+  module FrameHelper
+    # Will the current view rendered in a modal?
+    def using_modal?
+      controller.instance_variable_get(:@using_modal) ||
+        modal_targeted?
+    end
+
+    def using_modal2?
+      @using_modal || modal_targeted?
+    end
+
+    def in_modal?
+      request.headers['Modal-Opened'] == 'true'
+    end
+
+    def current_turbo_frame
+      request.headers['Turbo-Frame']
+    end
+
+    def turbo_frame?
+      current_turbo_frame.present?
+    end
+
+    def modal_targeted?
+      current_turbo_frame == 'modal_content'
+    end
+
+    def frame_embedded?
+      turbo_frame? && current_turbo_frame.include?('embedded')
+    end
+
+    def embed_index(object, key)
+      content_tag(:div, 'data-controller': 'embedded-frame') do
+        turbo_frame_tag "embedded--#{key}",
+                        refresh: :morph, src: url_for([pg_namespace, object, key]) do
+          content_tag(:p, class: 'p text-body-secondary text-center') { 'Cargando...' }
+        end
+      end
+    end
+
+    def nav_bg
+      if frame_embedded?
+        'bg-warning bg-opacity-25'
+      elsif using_modal?
+        'bg-warning bg-opacity-50'
+      else
+        'bg-primary-subtle'
+      end
+    end
+  end
+end

data/pg_engine/app/lib/pg_engine/bootstrap5_breadcrumbs_builder.rb

@@ -0,0 +1,22 @@
+module PgEngine
+  class Bootstrap5BreadcrumbsBuilder < BreadcrumbsOnRails::Breadcrumbs::Builder
+    def render
+      @elements.collect do |element|
+        render_element(element)
+      end.join(@options[:separator] || '')
+    end
+
+    def render_element(element)
+      content = if element.path.nil?
+                  compute_name(element)
+                else
+                  # TODO: add aria-current="page"
+                  @context.link_to_unless_current(
+                    compute_name(element), compute_path(element), element.options
+                  )
+                end
+
+      @context.content_tag('li', content, class: 'breadcrumb-item')
+    end
+  end
+end

data/pg_engine/app/lib/pg_engine/filtros_builder.rb

@@ -64,11 +64,12 @@ module PgEngine
       @filtros[campo][:scope_asociacion] = block
     end
 
+    # FIXME: deprecar
     def filtrar(query, parametros = nil)
-      parametros = parametros_controller if parametros.nil?
+      parametros_controller if parametros.nil?
 
       # Filtro soft deleted
-      query = query.kept if query.respond_to?(:kept) && parametros[:archived] != 'true'
+      query = query.kept if query.respond_to?(:kept)
 
       query
     end

data/pg_engine/app/models/current.rb

@@ -1,5 +1,5 @@
 class Current < ActiveSupport::CurrentAttributes
-  attribute :account, :user, :namespace
+  attribute :account, :user, :namespace, :controller
   # attribute :request_id, :user_agent, :ip_address
 
   # resets { Time.zone = nil }

data/pg_engine/app/models/email.rb

@@ -36,6 +36,8 @@ class Email < ApplicationRecord
   include Hashid::Rails
   audited
 
+  self.default_modal = true
+
   after_commit do
     associated.email_updated(self) if associated.respond_to? :email_updated
   end

data/pg_engine/app/models/pg_engine/base_record.rb

@@ -13,6 +13,12 @@ module PgEngine
     before_create :setear_creado_y_actualizado_por
     before_update :setear_actualizado_por
 
+    class << self
+      # This is a per class variable, all subclasses of BaseRecord inherit it
+      # BUT **the values are independent between all of them**
+      attr_accessor :default_modal
+    end
+
     scope :query, ->(param) { param.present? ? where(id: param) : all }
 
     def self.ransackable_associations(_auth_object = nil)
@@ -47,6 +53,10 @@ module PgEngine
       end
     end
 
+    def actions_component
+      ActionsComponent.new(self)
+    end
+
     # Para el dom_id (index.html)
     def to_key
       if respond_to? :hashid
@@ -58,6 +68,9 @@ module PgEngine
 
     def to_s
       %i[nombre name].each do |campo|
+        # Using `_in_database` for consistent breadcrumbs when editing the name
+        campo = :"#{campo}_in_database"
+
         return "#{send(campo)} ##{to_param}" if try(campo).present?
       end
       if to_param.present?

data/pg_engine/app/views/admin/accounts/_form.html.slim

@@ -1,10 +1,7 @@
-/ # locals: (object: nil, asociable: false)
+/ # locals: (object: nil)
 
 div style="max-width: 22em"
   = pg_form_for(@account || object) do |f|
-    = f.mensajes_de_error
-
-    = hidden_field_tag :asociable, true if asociable
     = f.input :plan
     = f.input :nombre
     .mt-2

data/pg_engine/app/views/admin/email_logs/_form.html.slim

@@ -1,10 +1,7 @@
-/ # locals: (object: nil, asociable: false)
+/ # locals: (object: nil)
 
 div style="max-width: 22em" data-controller="pg_form"
-  = pg_form_for(@email_log || object, asociable:) do |f|
-    = f.mensajes_de_error
-
-    = hidden_field_tag :asociable, true if asociable
+  = pg_form_for(@email_log || object) do |f|
     = f.pg_associable :email
     = f.input :log_id
     = f.input :event

data/pg_engine/app/views/admin/emails/_form.html.slim

@@ -1,17 +1,17 @@
-/ # locals: (object: nil, asociable: false)
+/ # locals: (object: nil)
 
-div style="max-width: 22em" data-controller="pg_form"
-  = pg_form_for(@email || object, asociable:) do |f|
-    = f.mensajes_de_error
-
-    / = hidden_field_tag :asociable, true if asociable
-    / = f.input :from_address
-    / = f.input :from_name
-    / = f.input :reply_to
-    / = f.input :to
-    / = f.input :subject
-    / = f.input :body_input, as: :text
-    = f.input :status
+- object ||= @email
+div style="max-width: 52em" data-controller="pg_form"
+  = pg_form_for(object) do |f|
+    - if object.persisted?
+      = f.input :status
+    - else
+      = f.input :from_name
+      = f.input :from_address
+      = f.input :to
+      = f.input :subject
+      = f.input :reply_to
+      = f.input :body_input, as: :text, input_html: { rows: 5 }
 
     .mt-2
     = f.button :submit

data/pg_engine/app/views/admin/emails/_send.html.slim

@@ -1,7 +1,6 @@
 / # locals: (email:)
 
 = pg_form_for email do |f|
-  = f.mensajes_de_error
   = f.input :from_name
   = f.input :from_address
   = f.input :to

data/pg_engine/app/views/admin/emails/show.html.slim

@@ -5,7 +5,7 @@
   .ms-1
   = @email.edit_link
 
-table.table.table-borderless.table-sm.w-auto.mb-0.m-3
+table.table.table-borderless.table-sm.w-auto.mb-0
   - atributos_para_mostrar.each do |att|
     tr
       th = @clase_modelo.human_attribute_name(att)
@@ -23,23 +23,22 @@ table.table.table-borderless.table-sm.w-auto.mb-0.m-3
     th = t('attributes.updated_at')
     td = @email.updated_at
 
-.m-4
-  h4 Logs
-  table.table
+h4 Logs
+table.table
+  tr
+    th log_id
+    th event
+    th log_level
+    th severity
+    th timestamp
+    th created_at
+    th updated_at
+  - @email.email_logs.order(timestamp: :desc).each do |log|
     tr
-      th log_id
-      th event
-      th log_level
-      th severity
-      th timestamp
-      th created_at
-      th updated_at
-    - @email.email_logs.order(timestamp: :desc).each do |log|
-      tr
-        td = log.log_id
-        td = log.event
-        td = log.log_level
-        td = log.severity
-        td = log.timestamp
-        td = log.created_at
-        td = log.updated_at
+      td = log.log_id
+      td = log.event
+      td = log.log_level
+      td = log.severity
+      td = log.timestamp
+      td = log.created_at
+      td = log.updated_at

data/pg_engine/app/views/admin/eventos/new.html.slim

@@ -1,6 +1,4 @@
 = pg_form_for @event, url: admin_eventos_path do |f|
-  = f.mensajes_de_error
-
   = f.input :type, as: :select, collection: @notifier_types
   - if params[:plain_text]
     = link_to 'Change to rich text', url_for

data/pg_engine/app/views/admin/user_accounts/_form.html.slim

@@ -1,10 +1,7 @@
-/ # locals: (object: nil, asociable: false)
+/ # locals: (object: nil)
 
 div style="max-width: 22em"
   = pg_form_for(@user_account || object) do |f|
-    = f.mensajes_de_error
-
-    = hidden_field_tag :asociable, true if asociable
     = f.pg_associable :user
     = f.pg_associable :account
     = f.input :profiles

data/pg_engine/app/views/admin/users/_form.html.slim

@@ -1,10 +1,7 @@
-/ # locals: (object: nil, asociable: false)
+/ # locals: (object: nil)
 
 div style="max-width: 22em"
   = pg_form_for(@user || object) do |f|
-    = f.mensajes_de_error
-
-    = hidden_field_tag :asociable, true if asociable
     = f.input :nombre
     = f.input :apellido
     = f.input :email

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

@@ -1,5 +1,4 @@
 - content_for :title do
   | Modificar #{@clase_modelo.nombre_singular.downcase}
 
-.p-3
-  = render 'form'
+= render 'form'

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

@@ -2,6 +2,10 @@
 - content_for :actions do
   - @actions&.each do |link_args|
     = link_to(*link_args)
+  = link_to request.url, class: 'btn btn-sm btn-outline-primary',
+                         data: { controller: :tooltip, 'bs-title': 'Actualizar' } do
+    i.bi.bi-arrow-clockwise
+  .ms-1
   - if @filtros.present?
     = render SearchBarTogglerComponent.new
     .ms-1
@@ -42,7 +46,7 @@ div
       ul.list-group.list-group-horizontal
         - available_page_sizes.each do |page_size|
           = link_to page_size,
-            namespaced_path(@clase_modelo, page_size:),
+            url_for(page_size:),
             class: "list-group-item py-0 px-1 #{'active' if current_page_size == page_size}"
   - elsif @records_filtered
     - i18n_key = "#{controller_key}.#{action_name}.index.empty_but_filtered"
@@ -50,8 +54,7 @@ div
       = t(i18n_key, default: :'.empty_but_filtered', model: @clase_modelo.nombre_plural.downcase)
       | :
       span.ms-2
-      = link_to namespaced_path(@clase_modelo, mostrar_filtros: 1) do
-        | Limpiar búsqueda
+      = link_to 'Limpiar búsqueda', url_for + '?cancel_filter=true'
   - else
     - i18n_key = "#{controller_key}.#{action_name}.index.empty"
     p.m-3 = t(i18n_key, default: :'.empty', model: @clase_modelo.nombre_plural.downcase)

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

@@ -1,5 +1,4 @@
 - content_for :title do
   | Crear #{@clase_modelo.nombre_singular.downcase}
 
-.p-3
-  = render 'form'
+= render 'form'

data/pg_engine/app/views/public/mensaje_contactos/new.html.slim

@@ -1,4 +1,4 @@
-/ # locals: (object: nil, asociable: false)
+/ # locals: (object: nil)
 
 .d-none
   / Preload
@@ -8,10 +8,7 @@
     h2 Ponete en contacto
     .d-inline-block style="width: 30em; max-width: 100%"
       div data-controller="pg_form"
-        = pg_form_for(@mensaje_contacto || object, asociable:) do |f|
-          = f.mensajes_de_error
-
-          = hidden_field_tag :asociable, true if asociable
+        = pg_form_for(@mensaje_contacto || object) do |f|
           - unless user_signed_in?
             = f.input :nombre, input_html: { style: 'max-width: 22em' }
             = f.input :email, input_html: { style: 'max-width: 23em' }

data/pg_engine/config/initializers/kaminari.rb

@@ -0,0 +1,3 @@
+Kaminari.configure do |config|
+  config.params_on_first_page = true
+end

data/pg_engine/config/initializers/ransack_memory.rb

@@ -1,4 +1,15 @@
 RansackMemory::Core.config = {
-  param: :q, # this means the default Ransack param name for searching. You can change it
-  session_key_format: '%controller_name%_%action_name%_%request_format%' # this means how the key used to store the information to the session will be stored. Currently it interpolates request parameters. You can customize it and use these vars to build a key that fits your needs
+  # This means the default Ransack param name for searching. You can change it
+  param: :q,
+
+  # This means how the key used to store the information to the session
+  # will be stored. Currently it interpolates request parameters.
+  # You can customize it and use these vars to build a key that fits your needs
+  #
+  # Available variables are:
+  #   controller_name
+  #   action_name
+  #   request_format
+  #   turbo_frame
+  session_key_format: '%controller_name%_%action_name%_%request_format%_%turbo_frame%'
 }

data/pg_engine/config/locales/es.yml

@@ -14,7 +14,7 @@ es:
   pg_engine:
     base:
       index:
-        empty: 'No hay %{model} aún'
+        empty: 'No hay %{model} que mostrar'
         empty_but_filtered: 'No hay %{model} para los filtros aplicados'
   attributes:
     external_labels: Etiquetas externas

data/pg_engine/lib/pg_engine/utils/pg_logger.rb

@@ -19,20 +19,20 @@ def pg_err(*args)
   pg_log(:error, *args)
 end
 
-def pg_warn(*args)
-  pg_log(:warn, *args)
+def pg_warn(*)
+  pg_log(:warn, *)
 end
 
-def pg_info(*args)
-  pg_log(:info, *args)
+def pg_info(*)
+  pg_log(:info, *)
 end
 
-def pg_debug(*args)
-  pg_log(:debug, *args)
+def pg_debug(*)
+  pg_log(:debug, *)
 end
 
-def pg_log(*args)
-  PgEngine::PgLogger.log(*args)
+def pg_log(*)
+  PgEngine::PgLogger.log(*)
 end
 
 module PgEngine
@@ -42,8 +42,8 @@ module PgEngine
     end
 
     class << self
-      def log(type, *args)
-        notify_all(build_msg(*args), type)
+      def log(type, *)
+        notify_all(build_msg(*), type)
       end
 
       private

data/pg_engine/spec/controllers/admin/accounts_controller_spec.rb

@@ -200,9 +200,9 @@ RSpec.describe Admin::AccountsController do
       expect(account.reload.discarded_at).to be_present
     end
 
-    it 'quita el elemento de la lista' do
+    it 'envía el pg-event' do
       subject
-      expect(response.body).to include('turbo-stream action="remove"')
+      expect(response.body).to include('<pg-event data-event-name="pg:record-destroyed"')
     end
 
     context 'si hay redirect_to' do

data/pg_engine/spec/controllers/admin/email_logs_controller_spec.rb

@@ -162,9 +162,9 @@ RSpec.describe Admin::EmailLogsController do
       expect { subject }.to change(EmailLog, :count).by(-1)
     end
 
-    it 'quita el elemento de la lista' do
+    it 'envía el pg-event' do
       subject
-      expect(response.body).to include('turbo-stream action="remove"')
+      expect(response.body).to include('<pg-event data-event-name="pg:record-destroyed"')
     end
 
     context 'si hay redirect_to' do

data/pg_engine/spec/controllers/admin/emails_controller_spec.rb

@@ -153,9 +153,9 @@ RSpec.describe Admin::EmailsController do
       expect { subject }.to change(Email, :count).by(-1)
     end
 
-    it 'quita el elemento de la lista' do
+    it 'envía el pg-event' do
       subject
-      expect(response.body).to include('turbo-stream action="remove"')
+      expect(response.body).to include('<pg-event data-event-name="pg:record-destroyed"')
     end
 
     context 'si hay redirect_to' do

data/pg_engine/spec/controllers/admin/user_accounts_controller_spec.rb

@@ -183,9 +183,9 @@ RSpec.describe Admin::UserAccountsController do
       expect { subject }.to change(UserAccount, :count).by(-1)
     end
 
-    it 'quita el elemento de la lista' do
+    it 'envía el pg-event' do
       subject
-      expect(response.body).to include('turbo-stream action="remove"')
+      expect(response.body).to include('<pg-event data-event-name="pg:record-destroyed"')
     end
 
     context 'si hay redirect_to' do

data/pg_engine/spec/controllers/admin/users_controller_spec.rb

@@ -174,9 +174,9 @@ RSpec.describe Admin::UsersController do
       expect(user.reload.discarded_at).to be_present
     end
 
-    it 'quita el elemento de la lista' do
+    it 'envía el pg-event' do
       subject
-      expect(response.body).to include('turbo-stream action="remove"')
+      expect(response.body).to include('<pg-event data-event-name="pg:record-destroyed"')
     end
 
     context 'si hay redirect_to' do

data/pg_engine/spec/controllers/concerns/pg_engine/resource_helper_spec.rb

@@ -14,7 +14,6 @@ describe PgEngine::Resource do
       allow(request).to receive_messages(filtered_parameters: { id: 321 },
                                          parameters: { id: 321 })
       allow(instancia).to receive(:request).and_return(request)
-      instancia.set_clase_modelo
     end
 
     it do
@@ -34,7 +33,6 @@ describe PgEngine::Resource do
       allow(request).to receive_messages(filtered_parameters: { id: categoria_de_cosa.to_param },
                                          parameters: { id: categoria_de_cosa.to_param })
       allow(instancia).to receive(:request).and_return(request)
-      instancia.set_clase_modelo
     end
 
     it do

data/pg_engine/spec/lib/pg_engine/form_helper_spec.rb

@@ -0,0 +1,51 @@
+require 'rails_helper'
+
+describe PgEngine::FormHelper do
+  subject do
+    view_context.pg_form_for(cosa, **options) do |f|
+      f.submit 'ACEPTAR'
+    end
+  end
+
+  let(:options) do
+    {}
+  end
+
+  let(:view_context) do
+    cont = Admin::CosasController.new
+    cont.request = ActionDispatch::TestRequest.create
+    cont.view_context
+  end
+  let(:cosa) { Cosa.new }
+
+  before do
+    Current.namespace = :admin
+  end
+
+  it 'renders the form and the button' do
+    expect(subject).to include 'ACEPTAR'
+    expect(subject).to include '<form'
+  end
+
+  context 'when there are errors' do
+    let(:cosa) do
+      ret = Cosa.new(nombre: nil)
+      ret.validate
+      ret
+    end
+
+    it 'renders the errors' do
+      expect(subject).to include 'Por favor, revisá los campos obligatorios'
+    end
+
+    context 'and its requested not to render errors' do
+      let(:options) do
+        { render_errors: false }
+      end
+
+      it 'renders the errors' do
+        expect(subject).not_to include 'Por favor, revisá los campos obligatorios'
+      end
+    end
+  end
+end