pg_rails 7.3.2 → 7.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a98b2f93e0db541d062b9a3197d0cc308ed4abcbe274626253b222f62364eb96
-  data.tar.gz: 4f345c9ed13c0ae1fa6ff0b21a3f1f3474db7f21337c621fa568000fc97950c7
+  metadata.gz: 7b6625d4eea069719a53935223e89933c45ea8193b707a0a601646cf1c7d4d28
+  data.tar.gz: 8fc921c742a0dd8c2d361b8844a36d04f92ca03617cec64dd178bf043ae11781
 SHA512:
-  metadata.gz: ad1f3664f46f4a708723338dfbb37a5de55f8ec57f77dce723c7a96c6782d04e081a0d61cbe0b5be7df675dfe9164c3ee2ccaeea33ab7ddf070a19f95e4d2f97
-  data.tar.gz: b2cf238051be29ec1525b8f1c7189977e5f2f85532591898b89591754f1015288465a383f823afec225e3e898b07e82e5a3e2d555691501e6f79a5f33a8c692d
+  metadata.gz: 42908b6091fa4b5d36cc10bcdc19c6665171c107f73c0dd7b2457355550e931e8bec5d212de311a8bb667090531506b2aab8ce30c101829566e8acd20b8f260f
+  data.tar.gz: deba07fbf28846fb3a536ebc4d0002965cc131c4ad6bb626d4242c49ba9a45d303ccd85ccebec6f75cbd8eab6c3dea58159588541db785f4320e4fbdff0f5c7e

data/pg_associable/app/javascript/modal_controller.js

@@ -9,12 +9,14 @@ export default class extends Controller {
 
   connect (e) {
     this.modalPuntero = new bootstrap.Modal(this.element)
-    if (this.element.dataset.removeOnHide) {
+    if (this.element.dataset.removeOnHide === 'true') {
       this.element.addEventListener('hidden.bs.modal', (e) => {
         this.element.remove()
       })
     }
-    this.modalPuntero.show()
+    if (this.element.dataset.autoShow === 'true') {
+      this.modalPuntero.show()
+    }
 
     this.element.addEventListener('turbo:frame-render', (ev) => {
       if (ev.detail.fetchResponse.response.ok && ev.target.id === 'modal_content') {

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

@@ -1,4 +1,5 @@
 .modal[class="#{@klass} modal-#{@modal_id}" tabindex="-1" data-controller="modal"
+       data-auto-show="true" data-remove-on-hide="false"
        data-modal-asociable-outlet=".asociable-#{@modal_id}"
        data-turbo-temporary="true"]
   .modal-dialog

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

@@ -1,5 +1,6 @@
-.modal[class="#{@klass}" tabindex="-1" data-controller="modal"
-       data-remove-on-hide="true" data-turbo-temporary="true"]
+.modal[id="#{@id}" class="#{@klass}" tabindex="-1" data-controller="modal"
+       data-remove-on-hide="#{@remove_on_hide}" data-turbo-temporary="true"
+       data-auto-show="#{@auto_show}"]
   .modal-dialog
     .modal-content
       = content

data/pg_engine/app/components/modal_component.rb

@@ -1,11 +1,16 @@
 class ModalComponent < ViewComponent::Base
-  def initialize(klass: 'modal-xl')
+  def initialize(klass: 'modal-xl', id: nil, auto_show: true)
     @klass = klass
+    @auto_show = auto_show
+    @id = id
+    @remove_on_hide = @auto_show
 
     super
   end
 
   def before_render
+    return unless @auto_show
+
     controller.instance_variable_set(:@using_modal, true)
   end
 end

data/pg_engine/app/controllers/pg_engine/devise_controller.rb

@@ -1,6 +1,9 @@
 module PgEngine
   class DeviseController < ApplicationController
     before_action :configure_permitted_parameters
+    before_action do
+      @no_main_frame = true
+    end
 
     layout :layout_by_user
 

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

@@ -59,9 +59,7 @@ html
       div
         = render partial: 'pg_layout/navbar' if @navbar.present?
         div
-          / FIXME: rename to main, use a constant
-          = turbo_frame_tag current_turbo_frame || 'top',
-              **{ 'data-turbo-action': (turbo_frame? ? nil : :advance) }.compact do
+          - captured_content = capture do
             - if user_signed_in? && breadcrumbs.any?
               .d-flex.d-print-none
                 .d-flex.flex-grow-1.px-3.py-1[
@@ -103,6 +101,13 @@ html
                       hacer un container con position absolute para los toasts
             = yield(:filtros)
             = content
+          - if @no_main_frame
+            = captured_content
+          - else
+            / FIXME: rename to main, use a constant
+            = turbo_frame_tag current_turbo_frame || 'top',
+                **{ 'data-turbo-action': (turbo_frame? ? nil : :advance) }.compact do
+              = captured_content
 
           div style="width:100%; height: 10em"
           .d-flex.gap-1.justify-content-center.opacity-50 data-controller="theme"

data/pg_rails/lib/version.rb

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

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

@@ -170,6 +170,7 @@ RSpec.describe <%= controller_class_name %>Controller do
 <% else -%>
         post :create, params: { <%= nombre_tabla_completo_singular %>: valid_attributes }
 <% end -%>
+        # FIXME: redirect to target object
         expect(response).to redirect_to([:<%= ns_prefix.first %>, <%= class_name %>.last])
       end
     end
@@ -218,6 +219,7 @@ RSpec.describe <%= controller_class_name %>Controller do
 <% else -%>
         put :update, params: { id: <%= file_name %>.to_param, <%= nombre_tabla_completo_singular %>: valid_attributes }
 <% end -%>
+        # FIXME: redirect to target object
         expect(response).to redirect_to([:<%= ns_prefix.first %>, <%= file_name %>])
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.3.2
+  version: 7.3.4
 platform: ruby
 authors:
 - Martín Rosso