pg_rails 7.2.2 → 7.3.0

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

@@ -2,7 +2,12 @@
 
 module PgEngine
   module FormHelper
-    def pg_form_for(object, *args, &)
+    def using_modal?
+      @using_modal || controller.instance_variable_get(:@using_modal)
+    end
+
+    # 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 +32,21 @@ 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 += hidden_field_tag(:using_modal, true) if using_modal?
+        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/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,10 @@ module PgEngine
     before_create :setear_creado_y_actualizado_por
     before_update :setear_actualizado_por
 
+    class << self
+      attr_accessor :default_modal
+    end
+
     scope :query, ->(param) { param.present? ? where(id: param) : all }
 
     def self.ransackable_associations(_auth_object = nil)
@@ -47,6 +51,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 +66,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/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

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

@@ -0,0 +1,53 @@
+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(:using_modal) { false }
+
+  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

data/pg_engine/spec/system/modal_windows_spec.rb

@@ -0,0 +1,89 @@
+# Initially generated with PgRails::SystemSpecGenerator
+# https://github.com/martin-rosso/pg_rails
+
+require 'rails_helper'
+
+# By default uses selenium_chrome_headless_iphone driver
+# run with DRIVER environment variable to override, eg:
+#
+# DRIVER=selenium rspec
+describe 'Modal windows' do
+  subject(:visitar) do
+    visit '/admin/cosas'
+  end
+
+  let(:logged_user) { create :user, :developer }
+  let(:account) { logged_user.current_account }
+  let!(:categoria_de_cosa) { create :categoria_de_cosa }
+
+  before do
+    login_as logged_user
+  end
+
+  describe 'crear con modal' do
+    it do
+      visitar
+      click_on 'Cargar coso'
+      select 'Completar'
+      select categoria_de_cosa.to_s
+      find('.modal input[type=submit]').click
+      expect(page).to have_text 'Por favor, revisá los campos obligatorios'
+      fill_in 'Nombre', with: 'bla'
+      find('.modal input[type=submit]').click
+      expect(page).to have_text 'bla'
+    end
+  end
+
+  describe 'show con modal' do
+    let!(:cosa) { create :cosa, categoria_de_cosa: }
+
+    it do
+      visit '/admin/cosas/' + cosa.to_param
+      click_on 'Ver categoría'
+      expect(page).to have_css '.modal', text: categoria_de_cosa.nombre
+    end
+  end
+
+  describe 'edit con modal' do
+    let!(:cosa) { create :cosa, categoria_de_cosa: }
+
+    it do
+      visit '/admin/cosas/' + cosa.to_param
+      click_on 'Modificar'
+      fill_in 'Nombre', with: ''
+      find('.modal input[type=submit]').click
+      expect(page).to have_text 'Por favor, revisá los campos obligatorios'
+      fill_in 'Nombre', with: 'bla'
+      find('.modal input[type=submit]').click
+      expect(page).to have_text 'bla'
+    end
+  end
+
+  describe 'destroy con modal' do
+    before { create :cosa, categoria_de_cosa: }
+
+    it do
+      visit '/admin/cosas'
+      find('span[title=Ver] a').click
+      accept_confirm do
+        find('.modal span[title=Eliminar] a').click
+      end
+      expect(page).to have_text 'No hay cosos aún'
+    end
+
+    context 'cuando da error' do
+      before do
+        allow_any_instance_of(Cosa).to receive(:discard).and_return(false)
+      end
+
+      it do
+        visit '/admin/cosas'
+        find('span[title=Ver] a').click
+        accept_confirm do
+          find('.modal span[title=Eliminar] a').click
+        end
+        expect(page).to have_text 'No se pudo eliminar el registro'
+      end
+    end
+  end
+end

data/pg_engine/spec/system/send_mail_spec.rb

@@ -13,7 +13,7 @@ describe 'Enviar email' do
     # click_on 'Enviar'
     # expect(page).to have_text 'revisá los campos obligatorios'
     fill_in 'email_to', with: Faker::Internet.email
-    click_on 'Enviar'
+    click_on 'Crear Email'
   end
 
   around do |example|

data/pg_layout/app/javascript/application.js

@@ -1,3 +1,27 @@
 import './config'
 import './channels'
 import './controllers'
+import './elements'
+
+import { Turbo } from '@hotwired/turbo-rails'
+
+document.addEventListener('pg:record-created', (ev) => {
+  Turbo.visit(window.location)
+  setTimeout(() => {
+    Turbo.cache.clear()
+  }, 1000)
+})
+
+document.addEventListener('pg:record-updated', (ev) => {
+  Turbo.visit(window.location)
+  setTimeout(() => {
+    Turbo.cache.clear()
+  }, 1000)
+})
+
+document.addEventListener('pg:record-destroyed', (ev) => {
+  Turbo.visit(window.location)
+  setTimeout(() => {
+    Turbo.cache.clear()
+  }, 1000)
+})

data/pg_layout/app/javascript/controllers/date_selector_controller.js

@@ -48,22 +48,23 @@ export default class extends Controller {
       responseKind: 'json'
     })
 
+    let json = null
     if (response.ok) {
-      const json = await response.json
+      json = await response.json
       fechaEl.value = json.date
       this.element.querySelector('button').removeAttribute('disabled')
       this.closePopover()
     } else {
       let message = 'Hubo un error'
       try {
-        const json = await response.json
+        json = await response.json
         message = json.html || 'Hubo un error'
-      } catch {
+      } catch (e) {
         // JSON parser error
+        Rollbar.error(e)
       }
       flashMessage(message, 'warning', true)
       this.element.querySelector('button').removeAttribute('disabled')
-      Rollbar.error('date jumper error', json)
     }
   }
 }

data/pg_layout/app/javascript/controllers/popover_toggler_controller.js

@@ -5,9 +5,11 @@ export default class extends Controller {
   popover = null
 
   connect () {
+    const container = this.element.closest('.modal-body') ? '.modal-body' : 'body'
     this.popover = new bootstrap.Popover(this.element, {
       // WARNING: don't use for user input html
       sanitize: false,
+      container,
       template: `
 <div class="popover" role="tooltip" data-controller="popover">
   <div class="popover-arrow"></div>
@@ -16,8 +18,7 @@ export default class extends Controller {
   <div class="popover-body">
   </div>
 </div>
-      `,
-      container: 'body'
+      `
     })
   }
 

data/pg_layout/app/javascript/elements/index.js

@@ -0,0 +1 @@
+import './pg_event'

data/pg_layout/app/javascript/elements/pg_event.js

@@ -0,0 +1,12 @@
+class PgEventElement extends HTMLElement {
+  connectedCallback () {
+    this.dispatchEvent(new MessageEvent(this.dataset.eventName, { bubbles: true, data: this }))
+  }
+
+  disconnectedCallback () {
+  }
+}
+
+if (customElements.get('pg-event') === undefined) {
+  customElements.define('pg-event', PgEventElement)
+}

data/pg_layout/app/views/devise/confirmations/new.html.erb

@@ -1,5 +1,4 @@
 <%= pg_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
-  <%= f.mensajes_de_error %>
   <%= f.full_error :confirmation_token %>
 
   <div class="form-inputs">

data/pg_layout/app/views/devise/passwords/edit.html.erb

@@ -1,8 +1,6 @@
 <h2><%= t(".change_your_password") %></h2>
 
 <%= pg_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
-  <%= f.mensajes_de_error %>
-
   <%= f.input :reset_password_token, as: :hidden %>
   <%= f.full_error :reset_password_token %>
 

data/pg_layout/app/views/devise/passwords/new.html.erb

@@ -1,8 +1,6 @@
 <h2><%= t(".forgot_your_password") %></h2>
 
 <%= pg_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
-  <%= f.mensajes_de_error %>
-
   <div class="form-inputs">
     <%= f.input :email,
                 required: true,

data/pg_layout/app/views/devise/registrations/edit.html.erb

@@ -1,8 +1,6 @@
 <h2><%= t(".title", resource: devise_i18n_fix_model_name_case(resource.model_name.human, i18n_key: "registrations.edit.title")) %></h2>
 
 <%= pg_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
-  <%= f.mensajes_de_error %>
-
   <div class="form-inputs">
     <%= f.input :email, required: true, autofocus: true %>
     <%= f.input :nombre, required: true %>