pg_rails 7.2.2 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20cb7ade648f78aa73ed631d9732326edc5a251a36141d054084366d9a6b9859
-  data.tar.gz: 38c923c5650e20ecb6be91b304ec3014cbd189976b254500275f5d2bf77ea9a0
+  metadata.gz: 987f2b59fff584bde7004887e631c776fd0da367988e6ca6117726ff6b6de937
+  data.tar.gz: 41676e4fbcadad6e6a7a2b999368137c4d200fe83da5d7a1a300ed8d0a24a99f
 SHA512:
-  metadata.gz: 156c1e465ab38406145f7d3bddf65fa0e40bf28a16109c15eb41f623735032dd23f7ddfb4a3341abbe8167ffd065082aef10945c8181c38bb01c4c368aa1853e
-  data.tar.gz: 7691712c1641cceb9ed53b6740ad9650844b69056c8433c4b65eb149cc9014ebce8870583306ebe7ed55c23209ec6b762b1a6961225fd65281aa5ddeec133dad
+  metadata.gz: 2cda455c10578a6c9b990e0f7c00317166c80d499ff82267a925912935f510b79195d1ad13caf9669af1f314da0dfeb23a7aa9782f3df56996b4a128af3b5535
+  data.tar.gz: f394f37f00f3f7dad3abcdfaab5697e1cf2079733a9e385df66101f8e5d1fe55e61f48d385ba9e6d855c9990b509c4a98a63c4efc1e1d9cb2c8535702c1c34cd

data/pg_associable/app/helpers/pg_associable/form_builder_methods.rb

@@ -31,8 +31,7 @@ module PgAssociable
     def collection_pc(atributo, _options)
       klass = clase_asociacion(atributo)
       user = Current.user
-      in_modal = options[:asociable].present?
-      puede_crear = !in_modal && Pundit::PolicyFinder.new(klass).policy.new(user, klass).new?
+      puede_crear = !template.using_modal? && Pundit::PolicyFinder.new(klass).policy.new(user, klass).new?
       collection = Pundit::PolicyFinder.new(klass).scope.new(user, klass).resolve
       [collection, puede_crear]
     end

data/pg_associable/app/helpers/pg_associable/helpers.rb

@@ -3,11 +3,10 @@ module PgAssociable
     MAX_RESULTS = 8
 
     def pg_respond_abrir_modal
-      respond_to do |format|
-        format.turbo_stream do
-          render turbo_stream: turbo_stream.append_all('body', partial: 'pg_associable_modal')
-        end
-      end
+      content = FormModalComponent.new(@clase_modelo.new.decorate)
+                                  .render_in(view_context)
+      modal = AsociableModalComponent.new(modal_id: params[:id]).with_content(content)
+      render turbo_stream: turbo_stream.append_all('body', modal)
     end
 
     def pg_respond_buscar

data/pg_associable/app/javascript/modal_controller.js

@@ -3,7 +3,6 @@ import * as bootstrap from 'bootstrap'
 
 export default class extends Controller {
   static outlets = ['asociable']
-  static targets = ['response']
 
   modalPuntero = null
 
@@ -15,17 +14,30 @@ export default class extends Controller {
       })
     }
     this.modalPuntero.show()
+
+    this.element.addEventListener('pg:record-created', (ev) => {
+      const el = ev.data
+      if (this.asociableOutlets.length > 0) {
+        const newObject = JSON.parse(el.dataset.response)
+        this.asociableOutlet.completarCampo(newObject)
+        ev.stopPropagation()
+      }
+      this.modalPuntero.hide()
+    })
+
+    this.element.addEventListener('pg:record-updated', (ev) => {
+      this.modalPuntero.hide()
+    })
+
+    this.element.addEventListener('pg:record-destroyed', (ev) => {
+      this.modalPuntero.hide()
+    })
+
     document.addEventListener('turbo:before-cache', () => {
       this.element.remove()
     }, { once: true })
   }
 
-  responseTargetConnected (e) {
-    const newObject = JSON.parse(e.dataset.response)
-    this.asociableOutlet.completarCampo(newObject)
-    this.element.remove()
-  }
-
   openModal () {
     this.modalPuntero.show()
   }

data/pg_associable/spec/system/associable_spec.rb

@@ -17,8 +17,8 @@ describe 'Associable' do
     find('.cosa_categoria_de_cosa .list-group-item').click
     fill_in 'categoria_de_cosa_nombre', with: 'la categoría'
     select 'Completar', from: 'categoria_de_cosa_tipo'
-    click_on 'Crear Categoría de cosa'
-    click_on 'Crear Coso'
+    click_on 'Agregar Categoría de cosa'
+    click_on 'Cargar Coso'
     expect(page).to have_text 'Creado por'
   end
 end

data/pg_engine/app/components/actions_component.rb

@@ -0,0 +1,14 @@
+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

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

@@ -0,0 +1,6 @@
+.modal[class="#{@klass} modal-#{@modal_id}" tabindex="-1" data-controller="modal"
+       data-modal-asociable-outlet=".asociable-#{@modal_id}"
+       data-turbo-temporary="true"]
+  .modal-dialog
+    .modal-content
+      = content

data/pg_engine/app/components/asociable_modal_component.rb

@@ -0,0 +1,7 @@
+class AsociableModalComponent < ModalComponent
+  def initialize(modal_id: nil, **)
+    @modal_id = modal_id
+
+    super(**)
+  end
+end

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

@@ -0,0 +1,15 @@
+= 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

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

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

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

data/pg_engine/app/components/modal_component.rb

@@ -0,0 +1,11 @@
+class ModalComponent < ViewComponent::Base
+  def initialize(klass: 'modal-xl')
+    @klass = klass
+
+    super
+  end
+
+  def before_render
+    controller.instance_variable_set(:@using_modal, true)
+  end
+end

data/pg_engine/app/components/modal_content_component.rb

@@ -0,0 +1,28 @@
+class ModalContentComponent < ViewComponent::Base
+  renders_one :actions
+  renders_one :body
+  renders_one :header
+
+  def before_render
+    controller.instance_variable_set(:@using_modal, true)
+  end
+
+  erb_template <<~ERB
+    <%= helpers.turbo_frame_tag :modal_generic do %>
+      <div class="modal-header">
+        <%= header %>
+        <a class="btn-close" type="button" data-bs-dismiss="modal" aria-label="Close"></a>
+      </div>
+      <div class="modal-body">
+        <div class="d-flex justify-content-around sticky-top">
+          <div class="flash position-relative w-100 d-flex justify-content-center">
+          </div>
+        </div>
+        <div class="float-end">
+          <%= actions %>
+        </div>
+        <%= body %>
+      </div>
+    <% end %>
+  ERB
+end

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

@@ -0,0 +1,10 @@
+= 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

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

data/pg_engine/app/controllers/admin/emails_controller.rb

@@ -14,26 +14,9 @@ module Admin
 
     add_breadcrumb Email.nombre_plural, :admin_emails_path
 
-    def new
-      render template: 'admin/emails/_send', locals: { email: @email },
-             layout: 'pg_layout/containerized'
-    end
-
-    def create
-      saved = false
-      ActiveRecord::Base.transaction do
-        # TODO: acá la transaction jode porque el ActiveJob no puede deserializar el Email
-        # Con rails 7.2 esto se debería arreglar
-        if (saved = @email.save)
-          PgEngine::AdminMailer.with(email_object: @email).admin_mail.deliver_later
-        end
-      end
-      if saved
-        redirect_to @email.decorate.target_object
-      else
-        render template: 'admin/emails/_send',
-               layout: 'pg_layout/containerized', status: :unprocessable_entity,
-               locals: { email: @email }
+    after_action only: :create do
+      if @saved
+        PgEngine::AdminMailer.with(email_object: @email).admin_mail.deliver_later
       end
     end
 

data/pg_engine/app/controllers/concerns/pg_engine/resource.rb

@@ -7,6 +7,16 @@ module PgEngine
       clazz.helper_method :current_page_size
       clazz.helper_method :show_filters?
       clazz.helper_method :available_page_sizes
+
+      clazz.layout :set_layout
+    end
+
+    def set_layout
+      if action_name == 'index'
+        'pg_layout/base'
+      else
+        'pg_layout/containerized'
+      end
     end
 
     # Public endpoints
@@ -25,18 +35,40 @@ module PgEngine
     end
 
     def show
-      add_breadcrumb instancia_modelo.to_s_short, instancia_modelo.target_object
-
       pg_respond_show
     end
 
+    def respond_with_modal(klass_or_string)
+      if klass_or_string.is_a?(Class)
+        content = klass_or_string.new(instancia_modelo).render_in(view_context)
+      elsif klass_or_string.is_a?(String)
+        content = ModalContentComponent.new.with_body_content(klass_or_string)
+                                       .render_in(view_context)
+      end
+
+      if can_open_modal?
+        modal = ModalComponent.new.with_content(content)
+        render turbo_stream: turbo_stream.append_all('body', modal)
+      else
+        render html: content
+      end
+    end
+
     def new
-      add_breadcrumb instancia_modelo.submit_default_value
+      if respond_with_modal?
+        respond_with_modal(FormModalComponent)
+      else
+        add_breadcrumb instancia_modelo.submit_default_value
+      end
     end
 
     def edit
-      add_breadcrumb instancia_modelo.to_s_short, instancia_modelo.target_object
-      add_breadcrumb 'Editando'
+      if respond_with_modal?
+        respond_with_modal(FormModalComponent)
+      else
+        add_breadcrumb instancia_modelo.to_s_short, instancia_modelo.target_object
+        add_breadcrumb 'Editando'
+      end
     end
 
     def create
@@ -93,57 +125,53 @@ module PgEngine
 
     def pg_respond_update
       object = instancia_modelo
-      respond_to do |format|
-        if (@saved = object.save)
-          format.html { redirect_to object.decorate.target_object }
-          format.json { render json: object.decorate }
+      if (@saved = object.save)
+        if in_modal?
+          body = <<~HTML.html_safe
+            <pg-event data-event-name="pg:record-created" data-turbo-temporary
+              data-response='#{object.decorate.to_json}'></pg-event>
+          HTML
+          render html: ModalContentComponent.new.with_body_content(body)
+                                            .render_in(view_context)
         else
-          # TODO: esto solucionaría el problema?
-          # self.instancia_modelo = instancia_modelo.decorate
-          format.html { render :edit, status: :unprocessable_entity }
-          format.json { render json: object.errors, status: :unprocessable_entity }
+          redirect_to object.decorate.target_object
         end
+      elsif in_modal?
+        render html: FormModalComponent.new(instancia_modelo.decorate)
+                                       .render_in(view_context)
+      else
+        add_breadcrumb instancia_modelo.decorate.to_s_short, instancia_modelo.decorate.target_object
+        add_breadcrumb 'Editando'
+        # TODO: esto solucionaría el problema?
+        # self.instancia_modelo = instancia_modelo.decorate
+        #
+        render :edit, status: :unprocessable_entity
       end
     end
 
     def pg_respond_create
       object = instancia_modelo
-      respond_to do |format|
-        if (@saved = object.save)
-          # TODO: 'asociable' lo cambiaría por 'in_modal' o algo así
-          if params[:asociable]
-            format.turbo_stream do
-              render turbo_stream:
-                turbo_stream.update_all('.modal.show .pg-associable-form', <<~HTML
-                  <div data-modal-target="response" data-response='#{object.decorate.to_json}'></div>
-                HTML
-                )
-              # FIXME: handlear json
-              # render json: object.decorate, content_type: 'application/json'
-            end
-          end
-          format.html do
-            if params[:save_and_next] == 'true'
-              new_path = "#{url_for(@clase_modelo)}/new"
-              redirect_to new_path, notice: "#{@clase_modelo.nombre_singular} creado."
-            else
-              redirect_to object.decorate.target_object
-            end
-          end
-          format.json { render json: object.decorate }
+      if (@saved = object.save)
+        if in_modal?
+          body = <<~HTML.html_safe
+            <pg-event data-event-name="pg:record-created" data-turbo-temporary
+              data-response='#{object.decorate.to_json}'></pg-event>
+          HTML
+          render html: ModalContentComponent.new.with_body_content(body)
+                                            .render_in(view_context)
+
         else
-          # TODO: esto solucionaría el problema?
-          # self.instancia_modelo = instancia_modelo.decorate
-          if params[:asociable]
-            format.turbo_stream do
-              # FIXME: agregar , status: :unprocessable_entity
-              render turbo_stream:
-                turbo_stream.update_all('.modal.show .pg-associable-form', partial: 'form', locals: { asociable: true })
-            end
-          end
-          format.html { render :new, status: :unprocessable_entity }
-          format.json { render json: object.errors.full_messages, status: :unprocessable_entity }
+          redirect_to object.decorate.target_object
         end
+      elsif in_modal?
+        render html: FormModalComponent.new(instancia_modelo.decorate)
+                                       .render_in(view_context)
+      else
+        add_breadcrumb instancia_modelo.decorate.submit_default_value
+        # TODO: esto solucionaría el problema?
+        # self.instancia_modelo = instancia_modelo.decorate
+
+        render :new, status: :unprocessable_entity
       end
     end
 
@@ -159,83 +187,87 @@ module PgEngine
       end
     end
 
-    def pg_respond_show(object = nil)
-      object ||= instancia_modelo
-      if params[:modal].present?
-        respond_to do |format|
-          format.html
-          format.turbo_stream do
-            render turbo_stream: turbo_stream.append_all(
-              'body', partial: 'pg_layout/modal_show', locals: { object: }
-            )
-          end
-        end
+    def accepts_turbo_stream?
+      request.headers['Accept'].present? &&
+        request.headers['Accept'].include?('text/vnd.turbo-stream.html')
+    end
+
+    def in_modal?
+      request.headers['turbo-frame'] == 'modal_generic'
+    end
+
+    def respond_with_modal?
+      can_open_modal? || in_modal?
+    end
+
+    def can_open_modal?
+      request.get? &&
+        params[:start_modal] == 'true' &&
+        accepts_turbo_stream? &&
+        !in_modal?
+    end
+
+    def pg_respond_show
+      if respond_with_modal?
+        respond_with_modal(ShowModalComponent)
       else
-        respond_to do |format|
-          format.json { render json: object }
-          format.html
-        end
+        add_breadcrumb instancia_modelo.to_s_short, instancia_modelo.target_object
       end
     end
 
+    def destroyed_message(model)
+      "#{model.model_name.human} #{model.gender == 'f' ? 'borrada' : 'borrado'}"
+    end
+
     def pg_respond_destroy(model, redirect_url = nil)
       if destroy_model(model)
-        msg = "#{model.model_name.human} #{model.gender == 'f' ? 'borrada' : 'borrado'}"
-        respond_to do |format|
-          if redirect_url.present?
-            format.html do
-              redirect_to redirect_url, notice: msg, status: :see_other
-            end
-          else
-            format.turbo_stream do
-              # Esto no es totalmente limpio pero funciona tanto en los listados como en los
-              # modal show
-              render turbo_stream: turbo_stream.remove(model) + turbo_stream.remove_all('.modal')
-            end
-            format.html do
-              redirect_back(fallback_location: root_path, notice: msg, status: 303)
-            end
-            format.json { head :no_content }
-          end
+        if respond_with_modal?
+          body = <<~HTML.html_safe
+            <pg-event data-event-name="pg:record-destroyed" data-turbo-temporary>
+            </pg-event>
+          HTML
+          respond_with_modal(body)
+        elsif redirect_url.present?
+          redirect_to redirect_url, notice: destroyed_message(model), status: :see_other
+        elsif accepts_turbo_stream?
+          body = <<~HTML.html_safe
+            <pg-event data-event-name="pg:record-destroyed" data-turbo-temporary>
+            </pg-event>
+          HTML
+          render turbo_stream: turbo_stream.append_all('body', body)
+        else
+          redirect_back(fallback_location: root_path,
+                        notice: destroyed_message(model), status: 303)
         end
+      elsif in_modal?
+
+        flash.now[:alert] = @error_message
+        render turbo_stream: render_turbo_stream_flash_messages(to: '.modal-body .flash')
+      elsif accepts_turbo_stream?
+        flash.now[:alert] = @error_message
+        render turbo_stream: render_turbo_stream_flash_messages
       else
-        respond_to do |format|
-          format.html do
-            if model.respond_to?(:associated_elements) && model.associated_elements.present?
-              @model = model
-              render destroy_error_details_view
-            else
-              flash[:alert] = @error_message
-              redirect_back(fallback_location: root_path, status: 303)
-            end
-          end
-          format.json { render json: { error: @error_message }, status: :unprocessable_entity }
-        end
+        flash[:alert] = @error_message
+        redirect_back(fallback_location: root_path, status: 303)
       end
     end
 
-    # TODO: crear esta vista en pg_rails
-    def destroy_error_details_view
-      'destroy_error_details'
-    end
-
     def destroy_model(model)
       @error_message = 'No se pudo eliminar el registro'
+
       begin
         destroy_method = model.respond_to?(:discard) ? :discard : :destroy
         return true if model.send(destroy_method)
 
-        @error_message = model.errors.full_messages.join(', ')
+        @error_message = model.errors.full_messages.join(', ').presence || @error_message
+
         false
       rescue ActiveRecord::InvalidForeignKey => e
-        # class_name = /from table \"(?<table_name>[\p{L}_]*)\"/.match(e.message)[:table_name].singularize.camelcase
-        # # pk_id = /from table \"(?<pk_id>[\p{L}_]*)\"/.match(e.message)[:pk_id].singularize.camelcase
-        # clazz = Object.const_get class_name
-        # objects = clazz.where(model.class.table_name.singularize => model)
         model_name = t("activerecord.models.#{model.class.name.underscore}")
         @error_message = "#{model_name} no se pudo borrar porque tiene elementos asociados."
-        logger.debug e.message
+        pg_warn(e)
       end
+
       false
     end
 

data/pg_engine/app/decorators/pg_engine/base_record_decorator.rb

@@ -42,7 +42,11 @@ module PgEngine
     # rubocop:enable Style/MissingRespondToMissing
 
     def destroy_link_redirect
-      destroy_link(redirect_to: helpers.url_for(target_index))
+      if helpers.using_modal?
+        destroy_link
+      else
+        destroy_link(redirect_to: helpers.url_for(target_index))
+      end
     end
 
     def destroy_link(confirm_text: '¿Estás seguro?', klass: 'btn-light', redirect_to: nil)
@@ -60,18 +64,28 @@ module PgEngine
     def edit_link(text: ' Modificar', klass: 'btn-warning')
       return unless Pundit.policy!(Current.user, object).edit?
 
+      start_modal = !helpers.using_modal? && object.class.default_modal
+
       helpers.content_tag :span, rel: :tooltip, title: 'Modificar' do
-        helpers.link_to edit_object_url, class: "btn btn-sm #{klass}" do
+        helpers.link_to edit_object_url + url_suffix(start_modal:), class: "btn btn-sm #{klass}",
+                                                                    'data-turbo-stream': start_modal do
           helpers.content_tag(:span, nil, class: clase_icono('pencil')) + text
         end
       end
     end
 
+    def url_suffix(start_modal: nil)
+      start_modal ? '?start_modal=true' : ''
+    end
+
     def show_link(text: '', klass: 'btn-light')
       return unless Pundit.policy!(Current.user, object).show?
 
+      start_modal = !helpers.using_modal? && object.class.default_modal
+
       helpers.content_tag :span, rel: :tooltip, title: 'Ver' do
-        helpers.link_to object_url, class: "btn btn-sm #{klass}" do
+        helpers.link_to object_url + url_suffix(start_modal:), class: "btn btn-sm #{klass}",
+                                                               'data-turbo-stream': start_modal do
           helpers.content_tag(:span, nil, class: clase_icono('eye-fill')) + text
         end
       end
@@ -88,12 +102,14 @@ module PgEngine
       end
     end
 
-    def new_link(remote: nil, klass: 'btn-warning')
+    def new_link(klass: 'btn-warning')
       return unless Pundit.policy!(Current.user, object).new?
 
+      start_modal = !helpers.using_modal? && object.class.default_modal
+
       helpers.content_tag :span, rel: :tooltip, title: submit_default_value do
-        helpers.link_to(new_object_url, class: "btn btn-sm #{klass}",
-                                        remote:) do
+        helpers.link_to(new_object_url + url_suffix(start_modal:), class: "btn btn-sm #{klass}",
+                                                                   'data-turbo-stream': start_modal) do
           helpers.content_tag(:span, nil,
                               class: clase_icono('plus').to_s) + "<span class='d-none d-sm-inline'> #{submit_default_value}</span>".html_safe
         end
@@ -105,7 +121,7 @@ module PgEngine
     end
 
     def new_object_url
-      "#{helpers.url_for(target_index)}/new"
+      helpers.url_for(target_new)
     end
 
     def object_url
@@ -116,6 +132,11 @@ module PgEngine
       pg_namespace.present? ? [pg_namespace, object] : object
     end
 
+    def target_new
+      mod_name_sing = object.class.model_name.singular.to_sym
+      pg_namespace.present? ? [:new, pg_namespace, mod_name_sing] : [:new, mod_name_sing]
+    end
+
     def target_index
       pg_namespace.present? ? [pg_namespace, object.class] : object.class
     end
@@ -123,7 +144,7 @@ module PgEngine
     # actionview-7.1.3.2/lib/action_view/helpers/form_helper.rb
     def submit_default_value
       key = :create
-      model = object.model_name.human
+      model = object.model_name.human.downcase
       defaults = []
       defaults << :"helpers.submit.#{object.model_name.i18n_key}.#{key}"
       defaults << :"helpers.submit.#{key}"

data/pg_engine/app/helpers/pg_engine/flash_helper.rb

@@ -1,7 +1,11 @@
 module PgEngine
   module FlashHelper
-    def render_turbo_stream_flash_messages
-      turbo_stream.prepend 'flash', partial: 'pg_layout/flash'
+    def render_turbo_stream_flash_messages(to: nil)
+      if to.present?
+        turbo_stream.prepend_all to, partial: 'pg_layout/flash'
+      else
+        turbo_stream.prepend 'flash', partial: 'pg_layout/flash'
+      end
     end
 
     def render_turbo_stream_title