pg_rails 7.2.3 → 7.3.1

data/pg_engine/spec/system/breadcrumbs_spec.rb

@@ -0,0 +1,61 @@
+# 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 'Breadcrumbs' do
+  subject(:visitar) do
+    visit path
+  end
+
+  let(:path) { "/admin/cosas/#{cosa.id}" }
+  let(:cosa) { create :cosa }
+  let(:logged_user) { create :user, :developer }
+  let(:account) { logged_user.current_account }
+
+  before do
+    login_as logged_user
+  end
+
+  describe 'some case' do
+    it do
+      visitar
+
+      expect(page).to have_css('nav ol.breadcrumb li').exactly(2)
+      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
+        "/admin/categoria_de_cosas/#{hashid}/cosas/#{cosa.id}"
+      end
+
+      it do
+        visitar
+
+        expect(page).to have_css('nav ol.breadcrumb li').exactly(3)
+        expect(page).to have_css('nav ol.breadcrumb li a').exactly(1)
+      end
+    end
+
+    context 'cuando es con nested y modal' do
+      let(:path) do
+        hashid = cosa.categoria_de_cosa.hashid
+        "/admin/categoria_de_cosas/#{hashid}"
+      end
+
+      it do
+        visitar
+        find('td span[title=Ver] a').click
+
+        expect(page).to have_css('.modal nav ol.breadcrumb li').exactly(3)
+        expect(page).to have_no_css('.modal nav ol.breadcrumb li a')
+      end
+    end
+  end
+end

data/pg_engine/spec/system/destroy_spec.rb

@@ -43,7 +43,7 @@ describe 'Sign in' do
       visit "/frontend/cosas/#{cosa.to_param}"
     end
 
-    it do
+    it 'muestra el flash' do
       subject
       expect(page).to have_current_path('/frontend/cosas')
       expect(page).to have_text('Coso borrado')

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 aún'
+      expect(page).to have_text :all, 'No hay categorías de cosas que mostrar'
     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', from: 'cosa_tipo'
+      select categoria_de_cosa.to_s, from: 'cosa_categoria_de_cosa_id'
+      find('.modal input[type=submit]').click
+      expect(page).to have_text 'Por favor, revisá los campos obligatorios'
+      fill_in 'cosa_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 que mostrar'
+    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,41 @@
 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)
+})
+
+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
+  // 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 === 'post') {
+    ev.detail.fetchOptions.headers.Accept = 'text/html, application/xhtml+xml'
+  }
+
+  if (document.querySelector('.modal.show')) {
+    ev.detail.fetchOptions.headers['Modal-Opened'] = true
+  }
+})

data/pg_layout/app/javascript/config/turbo_rails/index.js

@@ -9,7 +9,10 @@ import '@hotwired/turbo-rails'
 // TODO: testear con capybara
 document.addEventListener('turbo:before-cache', () => {
   document.querySelectorAll('#flash .alert').forEach((el) => {
-    el.remove()
+    // FIXME: en los destroy desde main frame, turbo llama a before-cache
+    // después de renderear el redirect, por eso no puedo hacer el remove
+    //
+    // el.remove()
   })
   document.querySelectorAll('.offcanvas-backdrop').forEach((el) => {
     el.remove()

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

@@ -0,0 +1,10 @@
+import { Controller } from '@hotwired/stimulus'
+
+export default class extends Controller {
+  connect () {
+    this.element.addEventListener('pg:record-destroyed', (ev) => {
+      this.element.querySelector('turbo-frame').reload()
+      ev.stopPropagation()
+    })
+  }
+}

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

@@ -14,6 +14,7 @@ import TooltipController from './tooltip_controller'
 import PopoverController from './popover_controller'
 import PopoverTogglerController from './popover_toggler_controller'
 import DateSelectorController from './date_selector_controller'
+import EmbeddedFrameController from './embedded_frame_controller'
 
 application.register('navbar', NavbarController)
 application.register('nested', NestedController)
@@ -29,5 +30,6 @@ application.register('tooltip', TooltipController)
 application.register('popover', PopoverController)
 application.register('popover-toggler', PopoverTogglerController)
 application.register('date-selector', DateSelectorController)
+application.register('embedded-frame', EmbeddedFrameController)
 
 // TODO: testear con capybara todo lo que se pueda

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/controllers/tooltip_controller.js

@@ -20,6 +20,14 @@ export default class extends Controller {
     }
   }
 
+  setContent (content) {
+    this.tooltip.setContent({ '.tooltip-inner': content })
+  }
+
+  hide () {
+    this.tooltip.hide()
+  }
+
   disconnect () {
     if (this.tooltip) {
       this.tooltip.dispose()

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,13 @@
+class PgEventElement extends HTMLElement {
+  connectedCallback () {
+    const event = new MessageEvent(this.dataset.eventName, { bubbles: true, data: this })
+    this.dispatchEvent(event)
+  }
+
+  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 %>

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

@@ -1,8 +1,6 @@
 <h2><%= t(".sign_up") %></h2>
 <div id="form-signup" data-controller="pg_form">
   <%= pg_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-    <%= f.mensajes_de_error %>
-
     <div class="form-inputs">
       <%= f.input :nombre, required: true, autofocus: true %>
       <%= f.input :apellido, required: true %>

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

@@ -1,7 +1,6 @@
 <h2><%= t(".resend_unlock_instructions") %></h2>
 
 <%= pg_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
-  <%= f.mensajes_de_error %>
   <%= f.full_error :unlock_token %>
 
   <div class="form-inputs">

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

@@ -59,23 +59,51 @@ html
       div
         = render partial: 'pg_layout/navbar' if @navbar.present?
         div
-          - if user_signed_in? && breadcrumbs.any?
-            .d-flex.px-3.py-1.d-print-none[
-              class="bg-primary-subtle align-items-center justify-content-between"
-              style="min-height: 2.5em;"]
-              nav aria-label="breadcrumb"
-                = render_breadcrumbs
-              / = render_breadcrumbs builder: ::Bootstrap4BreadcrumbsBuilder
-              .btn-toolbar.gap-1
-                = yield(:actions)
-            hr.my-0
-          - content = content_for?(:content) ? yield(:content) : yield
-          - unless content.include? 'flash-container'
-            = render FlashContainerComponent.new
-            / TODO: si hay varios flashes toast, se superponen. habría que
-                    hacer un container con position absolute para los toasts
-          = yield(:filtros)
-          = content
+          / FIXME: rename to main, use a constant
+          = turbo_frame_tag current_turbo_frame || 'top',
+              **{ 'data-turbo-action': (turbo_frame? ? nil : :advance) }.compact do
+            - if user_signed_in? && breadcrumbs.any?
+              .d-flex.d-print-none
+                .d-flex.flex-grow-1.px-3.py-1[
+                  class="#{nav_bg} align-items-center justify-content-between"
+                  style="min-height: 2.5em;"]
+                  nav.d-flex aria-label="breadcrumb"
+                    - unless frame_embedded?
+                      i.bi-segmented-nav.me-2
+                    ol.breadcrumb
+                      = render_breadcrumbs builder: PgEngine::Bootstrap5BreadcrumbsBuilder
+
+                  .btn-toolbar.gap-1
+                    = yield(: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: { action: 'modal#maximize',
+                                         controller: :tooltip, 'bs-title': 'Maximizar' } do
+                      i.bi-fullscreen
+                    = link_to request.url,
+                              class: 'btn btn-sm btn-link',
+                              data: { controller: :tooltip,
+                                      'turbo-frame': :_top,
+                                      'bs-title': 'Reemplazar ventana principal' } do
+                      i.bi-box-arrow-up-right
+                    = button_tag type: :button, class: 'btn btn-sm btn-link',
+                                 data: { controller: :tooltip,
+                                         'bs-title': 'Cerrar', 'bs-dismiss': :modal },
+                                         'aria-label': 'Close' do
+                      i.bi-x-lg
+
+              / hr.my-0
+            - content = content_for?(:content) ? yield(:content) : yield
+            / FIXME: rename to main?
+            - if (!turbo_frame? || current_turbo_frame == 'top') && \
+                   content.exclude?('flash-container')
+              = render FlashContainerComponent.new
+              / TODO: si hay varios flashes toast, se superponen. habría que
+                      hacer un container con position absolute para los toasts
+            = yield(:filtros)
+            = content
+
           div style="width:100%; height: 10em"
           .d-flex.gap-1.justify-content-center.opacity-50 data-controller="theme"
             | (Beta) Tema:

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

@@ -1,5 +1,5 @@
 - content_for :content do
-  .container-fluid.pt-3
+  div class="pt-3 #{modal_targeted? ? '' : 'container-fluid'}"
     = content_for?(:containerized_content) ? yield(:containerized_content) : 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.2.3'
+  VERSION = '7.3.1'
 end

data/pg_rails/scss/bootstrap_overrides.scss

@@ -10,5 +10,6 @@ $warning-border-subtle:   tint-color($warning, 20%);
 $secondary-bg-subtle:     tint-color($secondary, 92%);
 // $warning-bg-subtle:       tint-color($warning, 40%);
 
-
 $btn-close-focus-shadow: none;
+
+$breadcrumb-divider: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='8' height='8'><path d='M2.5 0L1 1.5 3.5 4 1 6.5 2.5 8l4-4-4-4z' fill='#{$breadcrumb-divider-color}'/></svg>");

data/pg_rails/scss/pg_rails.scss

@@ -31,6 +31,8 @@ $focus-ring-width:              .05rem;
 $alert-padding-y:               0.5rem;
 $alert-margin-bottom:           0.5rem;
 
+$breadcrumb-margin-bottom: 0;
+
 @import 'bootstrap_pre';
 @import 'bootstrap_overrides';
 @import 'bootstrap_post';
@@ -63,10 +65,15 @@ $alert-margin-bottom:           0.5rem;
 
 
 $warning-border-emphasis:   shade-color($yellow, 60%);
-.bg-primary-subtle .btn-warning {
+.btn-toolbar .btn-warning {
   border: 1px solid $warning-border-emphasis;
 }
 
+$light-border-emphasis:   shade-color($light, 60%);
+.btn-toolbar .btn-light {
+  border: 1px solid $light-border-emphasis;
+}
+
 .listado tr:has(td:hover):has(.bi-eye-fill) td {
 	background-color: #f2f2f2;
 	cursor: pointer;

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

@@ -265,9 +265,9 @@ RSpec.describe <%= controller_class_name %>Controller do
     end
 
 <% 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_scaffold/lib/generators/pg_scaffold/templates/controller.rb

@@ -9,16 +9,14 @@ require_dependency "<%= namespaced_path %>/application_controller"
 <% module_namespacing do -%>
 <% module_namespacing_2 do -%>
 class <%= controller_class_name.split('::').last %>Controller < <%= parent_controller %>
-  include PgEngine::Resource
-
   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]
 
-  add_breadcrumb <%= class_name.split('::').last %>.nombre_plural, :<%= plural_route_name %>_path
-
   private
 
   def atributos_permitidos

data/pg_scaffold/lib/generators/pg_slim/templates/_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(@<%= singular_name %> || object, asociable:) do |f|
-    = f.mensajes_de_error
-
-    = hidden_field_tag :asociable, true if asociable
+  = pg_form_for(@<%= singular_name %> || object) do |f|
   <%- attributes.each do |attribute| -%>
     = f.<%= attribute.reference? ? :pg_associable : :input %> :<%= attribute.name %>
   <%- end -%>

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

@@ -5,7 +5,7 @@
   .ms-1
   = @<%= singular_name %>.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)