pg_rails 7.6.16 → 7.6.18

data/pg_engine/spec/models/pg_engine/base_record_spec.rb

@@ -12,4 +12,16 @@ describe PgEngine::BaseRecord do
       expect(obj).to eq described_class.human_attribute_name('bla')
     end
   end
+
+  describe '#default_modal' do
+    it 'the values are independent from each class' do
+      model_class = Class.new(described_class)
+      another_model_class = Class.new(described_class)
+      model_class.default_modal = true
+      another_model_class.default_modal = false
+      expect(model_class.default_modal).to be true
+      expect(another_model_class.default_modal).to be false
+      expect(described_class.default_modal).to be_nil
+    end
+  end
 end

data/pg_engine/spec/requests/admin/eventos_spec.rb

@@ -16,28 +16,23 @@ describe 'Eventos' do
   end
 
   it 'renders the event index' do
-    get '/a/eventos'
+    get '/a/simple_user_notifiers'
 
-    expect(response.body).to include 'New post'
+    expect(response.body).to include 'Crear simple user notifier'
   end
 
   describe 'posting events' do
     subject do
-      get '/a/eventos/new'
+      get '/a/simple_user_notifiers/new'
       expect(response.body).to include 'Tooltip'
-      post '/a/eventos', params: {
-        evento: {
-          type:,
+      post '/a/simple_user_notifiers', params: {
+        simple_user_notifier: {
           message: 'hola',
-          message_text:,
-          subject: asunto,
           user_ids:,
-          record_type: 'User',
-          record_id:,
           target:
         }
       }
-      get "/a/eventos/new?event_id=#{Noticed::Event.last.id}"
+      # get "/a/eventos/new?event_id=#{Noticed::Event.last.id}"
     end
 
     let(:record_id) { nil }
@@ -83,10 +78,9 @@ describe 'Eventos' do
 
     context 'cuando hay error' do
       subject do
-        post '/a/eventos', params: {
-          evento: {
-            type:,
-            message: 'hola',
+        post '/a/simple_user_notifiers', params: {
+          simple_user_notifier: {
+            message: nil,
             target:
           }
         }

data/pg_engine/spec/requests/resource_spec.rb

@@ -0,0 +1,84 @@
+require 'rails_helper'
+
+describe 'Resources' do
+  let(:user) { create :user }
+  let(:cosa) { create :cosa }
+
+  before do
+    sign_in user
+  end
+
+  describe 'action links' do
+    it 'shows the archive link' do
+      get '/u/cosas/' + cosa.to_param
+      expect(response).to have_http_status(:ok)
+      regex = %r{<a data-turbo-method="post" .* href="/u/cosas/[\d]+/archive">}
+      expect(response.body).to match regex
+    end
+
+    it 'shows the unarchive link' do
+      cosa.update(discarded_at: Time.current)
+      get '/u/cosas/' + cosa.to_param
+      expect(response.body).to have_link(href: %r{/u/cosas/[\d]+/restore})
+    end
+  end
+
+  describe 'set breadcrumbs for all actions' do
+    it 'when flat archived index' do
+      get '/u/cosas/archived'
+      expect(response.body).to have_css('.breadcrumb a[href="/u/cosas"]')
+    end
+
+    it 'when nested archived index' do
+      get "/u/categoria_de_cosas/#{cosa.categoria_de_cosa.to_param}/cosas/archived"
+      expect(response.body).to \
+        have_css ".breadcrumb a[href=\"/u/categoria_de_cosas/#{cosa.categoria_de_cosa.to_param}/cosas\"]"
+    end
+  end
+
+  describe '#archive' do
+    let(:url) { "/u/cosas/#{cosa.to_param}/archive" }
+
+    it 'when accepts turbo stream' do
+      headers = { 'ACCEPT' => 'text/vnd.turbo-stream.html' }
+      expect { post url, headers: }.to change { cosa.reload.discarded_at }.to(be_present)
+      expect(response.body).to have_css('turbo-stream')
+    end
+
+    it 'when accepts only html' do
+      expect { post url }.to change { cosa.reload.discarded_at }.to(be_present)
+      expect(response).to redirect_to([:users, cosa])
+    end
+
+    context 'when fails' do
+      before do
+        allow_any_instance_of(Cosa).to receive(:discard).and_return(false)
+      end
+
+      it 'when accepts turbo stream' do
+        post url, headers: { 'ACCEPT' => 'text/vnd.turbo-stream.html' }
+        expect(response.body).to have_css('turbo-stream')
+        expect(response.body).to include('Hubo un error al intentar actualizar el coso')
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+
+      it 'when accepts only html' do
+        post url
+        expect(response).to redirect_to([:users, cosa])
+        expect(flash[:alert]).to eq 'Hubo un error al intentar actualizar el coso'
+      end
+    end
+  end
+
+  describe '#restore' do
+    subject do
+      post "/u/cosas/#{cosa.to_param}/restore"
+    end
+
+    let(:cosa) { create :cosa, discarded_at: Time.zone.now }
+
+    it do
+      expect { subject }.to change { cosa.reload.discarded_at }.to(be_nil)
+    end
+  end
+end

data/pg_engine/spec/requests/users/switcher_spec.rb

@@ -29,7 +29,7 @@ describe 'redirection' do
   context 'when account is discarded' do
     it do
       get '/u/cosas'
-      expect(response.body).to include 'No hay cosos que mostrar'
+      expect(response.body).to include 'No hay ningún coso que mostrar'
       logged_user.user_accounts.first.account.discard!
       get '/u/cosas'
       expect(response).to redirect_to users_account_switcher_path
@@ -62,7 +62,7 @@ describe 'redirection' do
       get '/u/cosas'
       expect(response).to have_http_status(:ok)
       expect(response.body).to include other_account.to_s
-      expect(response.body).to include 'No hay cosos que mostrar'
+      expect(response.body).to include 'No hay ningún coso que mostrar'
       other_user_account.destroy!
       get '/u/cosas'
       expect(response).to redirect_to users_account_switcher_path

data/pg_engine/spec/system/breadcrumbs_spec.rb

@@ -8,34 +8,27 @@ require 'rails_helper'
 #
 # DRIVER=selenium rspec
 describe 'Breadcrumbs' do
-  subject(:visitar) do
-    visit path
-  end
-
-  let(:path) { "/a/cosas/#{cosa.id}" }
   let(:cosa) { create :cosa }
-  let(:logged_user) { create :user, :developer }
 
   before do
-    login_as logged_user
+    login_as create :user, :developer
+
+    # just to sort a circumvent a capybara issue
+    create_list :cosa, 1, categoria_de_cosa: cosa.categoria_de_cosa
   end
 
   describe 'some case' do
     it do
-      visitar
+      visit "/a/cosas/#{cosa.id}"
 
       expect(page).to have_css('nav ol.breadcrumb li').exactly(3)
       expect(page).to have_css('nav ol.breadcrumb li a').exactly(1)
     end
 
     context 'cuando es con nested' do
-      let(:path) do
-        hashid = cosa.categoria_de_cosa.hashid
-        "/a/categoria_de_cosas/#{hashid}/cosas/#{cosa.id}"
-      end
-
       it do
-        visitar
+        hashid = cosa.categoria_de_cosa.hashid
+        visit "/a/categoria_de_cosas/#{hashid}/cosas/#{cosa.id}"
 
         expect(page).to have_css('nav ol.breadcrumb li').exactly(4)
         expect(page).to have_css('nav ol.breadcrumb li a').exactly(1)
@@ -43,14 +36,9 @@ describe 'Breadcrumbs' do
     end
 
     context 'cuando es con nested y modal' do
-      let(:path) do
-        hashid = cosa.categoria_de_cosa.hashid
-        "/a/categoria_de_cosas/#{hashid}"
-      end
-
       it do
-        visitar
-        find('td span[title=Ver] a').click
+        visit "/a/categoria_de_cosas/#{cosa.categoria_de_cosa.hashid}"
+        find_all('td span[title=Ver] a').first.click
 
         expect(page).to have_css('.modal nav ol.breadcrumb li').exactly(4)
         expect(page).to have_no_css('.modal nav ol.breadcrumb li a')

data/pg_engine/spec/system/destroy_spec.rb

@@ -8,7 +8,7 @@ describe 'Sign in' do
   shared_examples 'destroy from index' do
     subject do
       accept_confirm do
-        find("##{dom_id(cosa)} span[title=Eliminar] a").click
+        find("##{dom_id(cosa)} span[title=\"Eliminar definitivamente\"] a").click
       end
       sleep 1
     end
@@ -30,7 +30,7 @@ describe 'Sign in' do
   shared_examples 'destroy from show' do
     subject do
       accept_confirm do
-        find('.btn-toolbar span[title=Eliminar] a').click
+        find('.btn-toolbar span[title="Eliminar definitivamente"] a').click
       end
       sleep 1
     end
@@ -46,7 +46,7 @@ describe 'Sign in' do
     it 'muestra el flash' do
       subject
       expect(page).to have_current_path('/a/cosas')
-      expect(page).to have_text('Coso borrado')
+      expect(page).to have_text('Se eliminó el coso')
     end
   end
 

data/pg_engine/spec/system/login_spec.rb

@@ -16,7 +16,7 @@ describe 'Sign in' do
 
     it do
       subject
-      expect(page).to have_text :all, 'No hay categorías de cosas que mostrar'
+      expect(page).to have_text :all, 'No hay ninguna categoría de cosa que mostrar'
     end
   end
 

data/pg_engine/spec/system/modal_windows_spec.rb

@@ -66,23 +66,23 @@ describe 'Modal windows' do
       visit '/a/cosas'
       find('span[title=Ver] a').click
       accept_confirm do
-        find('.modal span[title=Eliminar] a').click
+        find('.modal span[title="Eliminar definitivamente"] a').click
       end
-      expect(page).to have_text 'No hay cosos que mostrar'
+      expect(page).to have_text 'No hay ningún coso que mostrar'
     end
 
     context 'cuando da error' do
       before do
-        allow_any_instance_of(Cosa).to receive(:discard).and_return(false)
+        allow_any_instance_of(Cosa).to receive(:destroy).and_return(false)
       end
 
       it do
         visit '/a/cosas'
         find('span[title=Ver] a').click
         accept_confirm do
-          find('.modal span[title=Eliminar] a').click
+          find('.modal span[title="Eliminar definitivamente"] a').click
         end
-        expect(page).to have_text 'No se pudo eliminar el registro'
+        expect(page).to have_text 'Hubo un error al intentar eliminar el coso'
       end
     end
   end

data/pg_engine/spec/system/tenants_spec.rb

@@ -22,7 +22,7 @@ describe 'Tenants' do
     it do
       visitar
 
-      expect(page).to have_text 'No hay cosos que mostrar'
+      expect(page).to have_text 'No hay ningún coso que mostrar'
     end
 
     context 'when belongs to multiple accounts' do
@@ -45,7 +45,7 @@ describe 'Tenants' do
 
         click_on other_account.to_s
         visit '/u/categoria_de_cosas'
-        expect(page).to have_text 'No hay categorías de cosas que mostrar'
+        expect(page).to have_text 'No hay ninguna categoría de cosa que mostrar'
       end
 
       it 'shows the profile form' do

data/pg_layout/app/javascript/application.js

@@ -65,10 +65,12 @@ document.addEventListener('pg:record-destroyed', (ev) => {
 
 document.addEventListener('turbo:before-fetch-request', (ev) => {
   // Si es POST, quito la opción text/vnd.turbo-stream.html para que
-  // on successful redirect no haya posibilidad de que se abra un modal
+  // on successful redirect no haya posibilidad de que se abra un modal.
+  // Si el link o form tiene data-turbo-stream entonces no se pisa el header.
   // FIXME: buscar una manera mejor de hacerlo porque es para problemas
   //        quizás, con la movida de abrir modales desde JS
-  if (ev.detail.fetchOptions.method.toLowerCase() === 'post') {
+  if (ev.detail.fetchOptions.method.toLowerCase() === 'post' &&
+      ev.target.dataset.turboStream === undefined) {
     ev.detail.fetchOptions.headers.Accept = 'text/html, application/xhtml+xml'
   }
 

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

@@ -6,5 +6,9 @@ export default class extends Controller {
       this.element.querySelector('turbo-frame').reload()
       ev.stopPropagation()
     })
+    this.element.addEventListener('pg:record-updated', (ev) => {
+      this.element.querySelector('turbo-frame').reload()
+      ev.stopPropagation()
+    })
   }
 }

data/pg_layout/app/views/layouts/pg_layout/base.html.slim

@@ -74,6 +74,7 @@ html
 
                   .btn-toolbar.gap-1
                     = yield(:actions)
+                    = yield(:extra_actions)
                 - if using_modal?
                   .px-2.d-flex.align-items-center.border.border-start-0
                     = button_tag type: :button, class: 'btn btn-sm btn-link',

data/pg_layout/app/views/layouts/pg_layout/show.html.slim

@@ -0,0 +1,10 @@
+- content_for(:actions) do
+  = instancia_modelo.edit_link
+  = instancia_modelo.archive_link
+  = instancia_modelo.restore_link
+  = instancia_modelo.destroy_link_redirect
+
+- content_for :content do
+  = yield
+
+= render template: 'layouts/pg_layout/base'

data/pg_rails/lib/version.rb

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

data/pg_scaffold/lib/generators/pg_rspec/scaffold/templates/controller_spec.rb

@@ -243,11 +243,11 @@ RSpec.describe <%= controller_class_name %>Controller do
   describe 'DELETE #destroy' do
     subject do
       request.headers['Accept'] = 'text/vnd.turbo-stream.html,text/html'
-      delete :destroy, params: { id: <%= file_name %>.to_param, redirect_to: redirect_url }
+      delete :destroy, params: { id: <%= file_name %>.to_param, land_on: }
     end
 
     let!(:<%= nombre_tabla_completo_singular %>) { create :<%= nombre_tabla_completo_singular %> }
-    let(:redirect_url) { nil }
+    let(:land_on) { nil }
 
     it 'destroys the requested <%= nombre_tabla_completo_singular %>' do
 <% if options[:discard] -%>
@@ -259,20 +259,13 @@ RSpec.describe <%= controller_class_name %>Controller do
 <% end -%>
     end
 
-<% if options[:discard] -%>
-    it 'setea el discarded_at' do
-      subject
-      expect(<%= nombre_tabla_completo_singular %>.reload.discarded_at).to be_present
-    end
-
-<% end -%>
     it 'envía el pg-event' do
       subject
       expect(response.body).to include('<pg-event data-event-name="pg:record-destroyed"')
     end
 
-    context 'si hay redirect_to' do
-      let(:redirect_url) { <%= index_helper %>_url }
+    context 'si hay land_on' do
+      let(:land_on) { :index }
 
       it 'redirects to the <%= table_name %> list' do
         subject

data/pg_scaffold/lib/generators/pg_scaffold/templates/controller.rb

@@ -9,13 +9,9 @@ require_dependency "<%= namespaced_path %>/application_controller"
 <% module_namespacing do -%>
 <% module_namespacing_2 do -%>
 class <%= controller_class_name.split('::').last %>Controller < <%= parent_controller %>
-  before_action { @clase_modelo = <%= class_name.split('::').last %> }
-
   include PgEngine::Resource
 
-  before_action(only: :index) { authorize <%= class_name.split('::').last %> }
-
-  before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
+  self.clase_modelo = <%= class_name.split('::').last %>
 
   private
 

data/pg_scaffold/lib/generators/pg_slim/templates/show.html.slim

@@ -1,10 +1,3 @@
-- content_for :title do
-  = @<%= singular_name %>.to_s
-- content_for :actions do
-  = @<%= singular_name %>.destroy_link_redirect
-  .ms-1
-  = @<%= singular_name %>.edit_link
-
 table.table.table-borderless.table-sm.w-auto.mb-0
   - atributos_para_mostrar.each do |att|
     tr

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.16
+  version: 7.6.18
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 2024-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -663,7 +663,6 @@ files:
 - pg_engine/app/assets/stylesheets/active_admin.scss
 - pg_engine/app/assets/stylesheets/notifications.scss
 - pg_engine/app/assets/stylesheets/pg_rails_b5.scss
-- pg_engine/app/components/actions_component.rb
 - pg_engine/app/components/alert_component.html.slim
 - pg_engine/app/components/alert_component.rb
 - pg_engine/app/components/asociable_modal_component.html.slim
@@ -743,6 +742,7 @@ files:
 - pg_engine/app/mailers/pg_engine/base_mailer.rb
 - pg_engine/app/mailers/pg_engine/user_mailer.rb
 - pg_engine/app/models/account.rb
+- pg_engine/app/models/concerns/pg_engine/naming.rb
 - pg_engine/app/models/current.rb
 - pg_engine/app/models/email.rb
 - pg_engine/app/models/email_log.rb
@@ -815,6 +815,7 @@ files:
 - pg_engine/config/initializers/view_component.rb
 - pg_engine/config/initializers/zeitwerk.rb
 - pg_engine/config/locales/devise.en.yml
+- pg_engine/config/locales/es.rb
 - pg_engine/config/locales/es.yml
 - pg_engine/config/routes.rb
 - pg_engine/config/simple_form/simple_form.rb
@@ -903,6 +904,7 @@ files:
 - pg_engine/spec/requests/current_attributes_spec.rb
 - pg_engine/spec/requests/devise_spec.rb
 - pg_engine/spec/requests/public/webhooks_spec.rb
+- pg_engine/spec/requests/resource_spec.rb
 - pg_engine/spec/requests/users/accounts_spec.rb
 - pg_engine/spec/requests/users/base_controller_spec.rb
 - pg_engine/spec/requests/users/dashboard_spec.rb
@@ -986,6 +988,7 @@ files:
 - pg_layout/app/views/layouts/pg_layout/devise.html.slim
 - pg_layout/app/views/layouts/pg_layout/mailer.html.slim
 - pg_layout/app/views/layouts/pg_layout/mailer.text.erb
+- pg_layout/app/views/layouts/pg_layout/show.html.slim
 - pg_layout/app/views/pg_layout/_flash.html.slim
 - pg_layout/app/views/pg_layout/_navbar.html.erb
 - pg_layout/app/views/pg_layout/_sidebar.html.erb

data/pg_engine/app/components/actions_component.rb

@@ -1,14 +0,0 @@
-class ActionsComponent < ViewComponent::Base
-  def initialize(record)
-    @record = record.decorate
-
-    super
-  end
-
-  erb_template <<~ERB
-    <div>
-      <%= @record.edit_link %>
-      <%= @record.destroy_link_redirect %>
-    </div>
-  ERB
-end