pg_rails 7.3.0 → 7.3.1

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

@@ -14,6 +14,8 @@ module PgEngine
     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
 

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

@@ -46,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"
@@ -54,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/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/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

@@ -11,8 +11,6 @@ describe PgEngine::FormHelper do
     {}
   end
 
-  let(:using_modal) { false }
-
   let(:view_context) do
     cont = Admin::CosasController.new
     cont.request = ActionDispatch::TestRequest.create

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

@@ -24,11 +24,11 @@ describe 'Modal windows' do
     it do
       visitar
       click_on 'Cargar coso'
-      select 'Completar'
-      select categoria_de_cosa.to_s
+      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 'Nombre', with: 'bla'
+      fill_in 'cosa_nombre', with: 'bla'
       find('.modal input[type=submit]').click
       expect(page).to have_text 'bla'
     end
@@ -68,7 +68,7 @@ describe 'Modal windows' do
       accept_confirm do
         find('.modal span[title=Eliminar] a').click
       end
-      expect(page).to have_text 'No hay cosos aún'
+      expect(page).to have_text 'No hay cosos que mostrar'
     end
 
     context 'cuando da error' do

data/pg_layout/app/javascript/application.js

@@ -25,3 +25,17 @@ document.addEventListener('pg:record-destroyed', (ev) => {
     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/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/pg_event.js

@@ -1,6 +1,7 @@
 class PgEventElement extends HTMLElement {
   connectedCallback () {
-    this.dispatchEvent(new MessageEvent(this.dataset.eventName, { bubbles: true, data: this }))
+    const event = new MessageEvent(this.dataset.eventName, { bubbles: true, data: this })
+    this.dispatchEvent(event)
   }
 
   disconnectedCallback () {

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.3.0'
+  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_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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.3.0
+  version: 7.3.1
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -646,8 +646,6 @@ files:
 - pg_engine/app/components/date_selector_component.html.slim
 - pg_engine/app/components/date_selector_component.rb
 - pg_engine/app/components/flash_container_component.rb
-- pg_engine/app/components/form_modal_component.html.slim
-- pg_engine/app/components/form_modal_component.rb
 - pg_engine/app/components/internal_error_component.rb
 - pg_engine/app/components/modal_component.html.slim
 - pg_engine/app/components/modal_component.rb
@@ -659,8 +657,6 @@ files:
 - pg_engine/app/components/search_bar_component.rb
 - pg_engine/app/components/search_bar_toggler_component.html.slim
 - pg_engine/app/components/search_bar_toggler_component.rb
-- pg_engine/app/components/show_modal_component.html.slim
-- pg_engine/app/components/show_modal_component.rb
 - pg_engine/app/controllers/admin/accounts_controller.rb
 - pg_engine/app/controllers/admin/email_logs_controller.rb
 - pg_engine/app/controllers/admin/emails_controller.rb
@@ -688,6 +684,7 @@ files:
 - pg_engine/app/decorators/user_decorator.rb
 - pg_engine/app/helpers/pg_engine/flash_helper.rb
 - pg_engine/app/helpers/pg_engine/form_helper.rb
+- pg_engine/app/helpers/pg_engine/frame_helper.rb
 - pg_engine/app/helpers/pg_engine/i18n_helper.rb
 - pg_engine/app/helpers/pg_engine/index_helper.rb
 - pg_engine/app/helpers/pg_engine/pg_rails_helper.rb
@@ -695,6 +692,7 @@ files:
 - pg_engine/app/helpers/pg_engine/print_helper.rb
 - pg_engine/app/helpers/pg_engine/route_helper.rb
 - pg_engine/app/inputs/pg_engine/fecha_input.rb
+- pg_engine/app/lib/pg_engine/bootstrap5_breadcrumbs_builder.rb
 - pg_engine/app/lib/pg_engine/date_jumper.rb
 - pg_engine/app/lib/pg_engine/devise_failure_app.rb
 - pg_engine/app/lib/pg_engine/error_helper.rb
@@ -855,6 +853,7 @@ files:
 - pg_engine/spec/requests/base_controller_requests_spec.rb
 - pg_engine/spec/requests/users/date_jumper_spec.rb
 - pg_engine/spec/system/alerts_spec.rb
+- pg_engine/spec/system/breadcrumbs_spec.rb
 - pg_engine/spec/system/date_selector_spec.rb
 - pg_engine/spec/system/destroy_spec.rb
 - pg_engine/spec/system/login_spec.rb
@@ -880,6 +879,7 @@ files:
 - pg_layout/app/javascript/controllers/application.js
 - pg_layout/app/javascript/controllers/clear_timeout_controller.js
 - pg_layout/app/javascript/controllers/date_selector_controller.js
+- pg_layout/app/javascript/controllers/embedded_frame_controller.js
 - pg_layout/app/javascript/controllers/fadein_onload_controller.js
 - pg_layout/app/javascript/controllers/filtros_controller.js
 - pg_layout/app/javascript/controllers/index.js

data/pg_engine/app/components/form_modal_component.html.slim

@@ -1,15 +0,0 @@
-= render ModalContentComponent.new do |content|
-  - content.with_header do
-    / TODO: render breadcrumbs?
-    - if @record.persisted?
-      = link_to @record.target_object do
-        | Ir al #{@record.class.nombre_singular.downcase}
-      span.ms-1 » Modificando
-    - else
-      .fs-5 = @record.decorate.submit_default_value
-
-  / - content.with_actions do
-    = render @record.actions_component
-
-  - content.with_body do
-    = render partial: 'form', locals: { object: @record }

data/pg_engine/app/components/form_modal_component.rb

@@ -1,6 +0,0 @@
-class FormModalComponent < ViewComponent::Base
-  def initialize(record)
-    @record = record
-    super
-  end
-end

data/pg_engine/app/components/show_modal_component.html.slim

@@ -1,10 +0,0 @@
-= render ModalContentComponent.new do |content|
-  - content.with_header do
-    = link_to @record.target_object, 'data-turbo-frame': '_top' do
-      | Ir al #{@record.class.nombre_singular.downcase}
-
-  - content.with_actions do
-    = render @record.actions_component
-
-  - content.with_body do
-    = render @record

data/pg_engine/app/components/show_modal_component.rb

@@ -1,7 +0,0 @@
-class ShowModalComponent < ViewComponent::Base
-  def initialize(record, **)
-    @record = record
-
-    super(**)
-  end
-end