pg_rails 7.2.3 → 7.3.1

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

@@ -1,12 +1,115 @@
 module PgEngine
   module Resource
+    # rubocop:disable Metrics/PerceivedComplexity
     def self.included(clazz)
-      # clazz.before_action :authenticate_user!
+      class << clazz
+        # This is a per class variable, all subclasses of clazz inherit it
+        # BUT **the values are independent between all of them**
+        attr_accessor :nested_class, :nested_key, :clase_modelo
+
+        # TODO: separar los endpoints de la lógica de filtros para evitar esta variable
+        # en Agenda
+        attr_accessor :skip_default_breadcrumb
+      end
+      clazz.delegate :nested_key, :nested_class, :clase_modelo, to: clazz
+
+      clazz.helper_method :nested_class, :nested_key, :clase_modelo
+      clazz.helper_method :nested_record, :nested_id
+
       clazz.helper_method :atributos_para_listar
       clazz.helper_method :atributos_para_mostrar
       clazz.helper_method :current_page_size
       clazz.helper_method :show_filters?
       clazz.helper_method :available_page_sizes
+
+      clazz.before_action do
+        # TODO: quitar esto, que se use el attr_accessor
+        #       o sea, quitar todas las referencias a @clase_modelo
+        @clase_modelo = clase_modelo
+      end
+
+      clazz.before_action unless: -> { clazz.skip_default_breadcrumb } do
+        if nested_record.present?
+          # Link al nested, siempre que sea no sea un embedded frame
+          # ya que en tal caso se supone que el nested está visible
+          # en el main frame. Además, si es un modal abierto desde
+          # el nested record, no muestro el link al mismo.
+          unless frame_embedded?
+            if modal_targeted? && referred_by?(nested_record)
+              add_breadcrumb nested_record.decorate.to_s_short
+            else
+              add_breadcrumb nested_record.decorate.to_s_short,
+                             nested_record.decorate.target_object
+            end
+          end
+
+          # Texto de index pero sin link, porque se supone que es un
+          # embedded index o viene de tal
+          add_breadcrumb clase_modelo.nombre_plural
+
+        elsif !modal_targeted?
+          # Link al index, siempre que no sea un modal, porque en tal
+          # caso se supone que el index está visible en el main frame
+          if clase_modelo.present?
+            add_breadcrumb clase_modelo.nombre_plural,
+                           url_for([pg_namespace, nested_record, clase_modelo])
+          else
+            # :nocov:
+            pg_warn 'clase_modelo is nil'
+            # :nocov:
+          end
+        end
+      end
+
+      clazz.layout :set_layout
+    end
+    # rubocop:enable Metrics/PerceivedComplexity
+
+    def referred_by?(object)
+      url_for(object.decorate.target_object) == request.referer
+    end
+
+    def nested_id
+      return unless nested_key.present? && nested_class.present?
+
+      id = params[nested_key]
+
+      # if using hashid-rails
+      if nested_class.respond_to? :decode_id
+        id = nested_class.decode_id(id)
+      end
+
+      id
+    end
+
+    def nested_record
+      return if nested_id.blank?
+
+      nested_class.find(nested_id)
+    end
+
+    def accepts_turbo_stream?
+      request.headers['Accept'].present? &&
+        request.headers['Accept'].include?('text/vnd.turbo-stream.html')
+    end
+
+    def respond_with_modal?
+      can_open_modal? || modal_targeted?
+    end
+
+    def can_open_modal?
+      request.get? &&
+        clase_modelo.default_modal &&
+        accepts_turbo_stream? &&
+        !in_modal?
+    end
+
+    def set_layout
+      if action_name == 'index'
+        'pg_layout/base'
+      else
+        'pg_layout/containerized'
+      end
     end
 
     # Public endpoints
@@ -25,18 +128,45 @@ module PgEngine
     end
 
     def show
-      add_breadcrumb instancia_modelo.to_s_short, instancia_modelo.target_object
-
       pg_respond_show
     end
 
+    # FIXME: refactor
+    def respond_with_modal(component)
+      content = component.render_in(view_context)
+
+      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 can_open_modal?
+        path = [request.path, request.query_string].compact.join('?')
+        component = ModalContentComponent.new(src: path)
+        respond_with_modal(component)
+      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 can_open_modal?
+        path = [request.path, request.query_string].compact.join('?')
+        component = ModalContentComponent.new(src: path)
+        respond_with_modal(component)
+      else
+        if modal_targeted? && referred_by?(instancia_modelo)
+          add_breadcrumb instancia_modelo.to_s_short
+        else
+          add_breadcrumb instancia_modelo.to_s_short,
+                         instancia_modelo.target_object
+        end
+        add_breadcrumb 'Modificando'
+      end
     end
 
     def create
@@ -55,36 +185,59 @@ module PgEngine
     protected
 
     def default_sort
-      nil
+      'id desc'
     end
 
     def available_page_sizes
-      [10, 20, 30, 50, 100].push(current_page_size).uniq.sort
+      [5, 10, 20, 30, 50, 100].push(current_page_size).uniq.sort
+    end
+
+    def show_filters_by_default?
+      true
+    end
+
+    def filters_applied?
+      params[RansackMemory::Core.config[:param].presence || :q].present?
+    end
+
+    def session_key_identifier
+      ::RansackMemory::Core.config[:session_key_format]
+                           .gsub('%controller_name%', controller_path.parameterize.underscore)
+                           .gsub('%action_name%', action_name)
+                           .gsub('%request_format%', request.format.symbol.to_s)
+                           .gsub('%turbo_frame%', request.headers['Turbo-Frame'] || 'top')
+      # FIXME: rename to main?
     end
 
     def show_filters?
-      cur_route = pg_current_route
-      idtf = cur_route[:controller] + '#' + cur_route[:action] + '#open-filters'
+      return true if filters_applied?
+
+      idtf = "show-filters_#{session_key_identifier}"
 
       if params[:ocultar_filtros]
-        session[idtf] = nil
+        session[idtf] = false
       elsif params[:mostrar_filtros]
         session[idtf] = true
       end
 
-      session[idtf]
+      if session[idtf].nil?
+        show_filters_by_default?
+      else
+        session[idtf]
+      end
     end
 
     def current_page_size
-      if params[:page_size].present?
-        session[page_size_session_key] = params[:page_size].to_i
+      aux = params[:page_size].presence&.to_i
+      if aux.present? && aux.positive?
+        session[page_size_session_key] = aux
       end
 
       session[page_size_session_key].presence || default_page_size
     end
 
     def page_size_session_key
-      "#{controller_name}/#{action_name}/page_size"
+      "page_size_#{session_key_identifier}"
     end
 
     def default_page_size
@@ -93,57 +246,52 @@ 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 }
-        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 }
+      if (@saved = object.save)
+        respond_to do |format|
+          format.html do
+            if in_modal?
+              body = <<~HTML.html_safe
+                <pg-event data-event-name="pg:record-updated" data-turbo-temporary
+                  data-response='#{object.decorate.to_json}'></pg-event>
+              HTML
+              render html: ModalContentComponent.new.with_content(body)
+                                                .render_in(view_context)
+            else
+              redirect_to object.decorate.target_object
+            end
+          end
+          format.json do
+            render json: object.decorate.as_json
+          end
         end
+      else
+        add_breadcrumb instancia_modelo.decorate.to_s_short, instancia_modelo.decorate.target_object
+        add_breadcrumb 'Modificando'
+        # 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 turbo_stream: turbo_stream.append(current_turbo_frame, body)
         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
+      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
 
@@ -153,104 +301,98 @@ module PgEngine
         format.html { render_listing }
         format.xlsx do
           render xlsx: 'download',
-                 filename: "#{@clase_modelo.nombre_plural.gsub(' ', '-').downcase}" \
+                 filename: "#{clase_modelo.nombre_plural.gsub(' ', '-').downcase}" \
                            "-#{Time.zone.now.strftime('%Y-%m-%d-%H.%M.%S')}.xlsx"
         end
       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 pg_respond_show
+      if can_open_modal?
+        path = [request.path, request.query_string].compact.join('?')
+        component = ModalContentComponent.new(src: path)
+        respond_with_modal(component)
       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
+
+    # rubocop:disable Metrics/PerceivedComplexity
     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
+        # FIXME: rename to main
+        if turbo_frame? && current_turbo_frame != 'top'
+          body = <<~HTML.html_safe
+            <pg-event data-event-name="pg:record-destroyed" data-turbo-temporary>
+            </pg-event>
+          HTML
+          render turbo_stream: turbo_stream.append(current_turbo_frame, 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
+    # rubocop:enable Metrics/PerceivedComplexity
 
     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
 
     def render_listing
-      @collection = @collection.page(params[:page]).per(current_page_size)
+      total = @collection.count
+      current_page = params[:page].presence&.to_i || 1
+      if current_page_size * (current_page - 1) > total
+        current_page = (total.to_f / current_page_size).ceil
+      end
+      @collection = @collection.page(current_page).per(current_page_size)
       @records_filtered = default_scope_for_current_model.any? if @collection.empty?
     end
 
     def buscar_instancia
-      if Object.const_defined?('FriendlyId') && @clase_modelo.is_a?(FriendlyId)
-        @clase_modelo.friendly.find(params[:id])
-      elsif @clase_modelo.respond_to? :find_by_hashid!
-        @clase_modelo.find_by_hashid!(params[:id])
+      if Object.const_defined?('FriendlyId') && clase_modelo.is_a?(FriendlyId)
+        clase_modelo.friendly.find(params[:id])
+      elsif clase_modelo.respond_to? :find_by_hashid!
+        clase_modelo.find_by_hashid!(params[:id])
       else
-        @clase_modelo.find(params[:id])
+        clase_modelo.find(params[:id])
       end
     rescue ActiveRecord::RecordNotFound
       raise PgEngine::PageNotFoundError
@@ -258,7 +400,10 @@ module PgEngine
 
     def set_instancia_modelo
       if action_name.in? %w[new create]
-        self.instancia_modelo = @clase_modelo.new(modelo_params)
+        self.instancia_modelo = clase_modelo.new(modelo_params)
+        if nested_id.present?
+          instancia_modelo.send("#{nested_key}=", nested_id)
+        end
       else
         self.instancia_modelo = buscar_instancia
 
@@ -291,12 +436,7 @@ module PgEngine
     end
 
     def nombre_modelo
-      @clase_modelo.name.underscore
-    end
-
-    def clase_modelo
-      # agarro la variable o intento con el nombre del controller
-      @clase_modelo ||= self.class.name.singularize.gsub('Controller', '').constantize
+      clase_modelo.name.underscore
     end
 
     def filtros_y_policy(campos, dflt_sort = nil)
@@ -305,20 +445,35 @@ module PgEngine
       )
       scope = policy_scope(clase_modelo)
 
-      scope = @filtros.filtrar(scope)
+      if nested_id.present?
+        scope = scope.where(nested_key => nested_id)
+        scope = scope.undiscarded if scope.respond_to?(:undiscarded)
+      elsif scope.respond_to?(:kept)
+        scope = scope.kept
+      end
+      # Soft deleted
 
       shared_context = Ransack::Adapters::ActiveRecord::Context.new(scope)
-      @q = @clase_modelo.ransack(params[:q], context: shared_context)
-
+      @q = clase_modelo.ransack(params[:q], context: shared_context)
       @q.sorts = dflt_sort if @q.sorts.empty? && dflt_sort.present?
 
       shared_context.evaluate(@q)
     end
 
     def default_scope_for_current_model
-      PgEngine::FiltrosBuilder.new(
-        self, clase_modelo, []
-      ).filtrar(policy_scope(clase_modelo))
+      scope = policy_scope(clase_modelo)
+
+      if nested_id.present?
+        scope = scope.where(nested_key => nested_id)
+
+        # Skip nested discarded check
+        scope = scope.undiscarded if scope.respond_to?(:undiscarded)
+      elsif scope.respond_to?(:kept)
+        scope = scope.kept
+      end
+      # Soft deleted, including nested discarded check
+
+      scope
     end
   end
 end

data/pg_engine/app/controllers/pg_engine/base_controller.rb

@@ -3,6 +3,10 @@
 module PgEngine
   # rubocop:disable Rails/ApplicationController
   class BaseController < ActionController::Base
+    before_action do
+      Current.controller = self
+    end
+
     # rubocop:enable Rails/ApplicationController
     include Pundit::Authorization
     include PrintHelper
@@ -10,6 +14,7 @@ module PgEngine
     include FlashHelper
     include RouteHelper
     include PgAssociable::Helpers
+    include FrameHelper
 
     class Redirect < PgEngine::Error
       attr_accessor :url

data/pg_engine/app/controllers/public/mensaje_contactos_controller.rb

@@ -6,7 +6,7 @@ module Public
   class MensajeContactosController < PublicController
     include PgEngine::Resource
 
-    before_action { @clase_modelo = MensajeContacto }
+    self.clase_modelo = MensajeContacto
 
     before_action(only: :index) { authorize MensajeContacto }
 

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

@@ -42,10 +42,14 @@ 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)
+    def destroy_link(confirm_text: '¿Confirmás que querés borrar el registro?', klass: 'btn-light', redirect_to: nil)
       return unless Pundit.policy!(Current.user, object).destroy?
 
       helpers.content_tag :span, rel: :tooltip, title: 'Eliminar' do
@@ -61,7 +65,10 @@ module PgEngine
       return unless Pundit.policy!(Current.user, object).edit?
 
       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,
+                        class: "btn btn-sm #{klass}",
+                        'data-turbo-frame': 'modal_content',
+                        'data-turbo-stream': true do
           helpers.content_tag(:span, nil, class: clase_icono('pencil')) + text
         end
       end
@@ -71,7 +78,10 @@ module PgEngine
       return unless Pundit.policy!(Current.user, object).show?
 
       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,
+                        class: "btn btn-sm #{klass}",
+                        'data-turbo-frame': 'modal_content',
+                        'data-turbo-stream': true do
           helpers.content_tag(:span, nil, class: clase_icono('eye-fill')) + text
         end
       end
@@ -88,12 +98,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?
 
       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,
+                        class: "btn btn-sm #{klass}",
+                        'data-turbo-frame': 'modal_content',
+                        'data-turbo-stream': true) 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,15 +117,29 @@ module PgEngine
     end
 
     def new_object_url
-      "#{helpers.url_for(target_index)}/new"
+      helpers.url_for(target_new)
     end
 
     def object_url
       helpers.url_for(target_object)
     end
 
+    def nested_record
+      # TODO: esto es raro
+      return if !Current.controller.respond_to?(:nested_record) ||
+                Current.controller.nested_record.nil? ||
+                Current.controller.nested_record.instance_of?(object.class)
+
+      Current.controller.nested_record
+    end
+
     def target_object
-      pg_namespace.present? ? [pg_namespace, object] : object
+      [pg_namespace, nested_record, object].compact
+    end
+
+    def target_new
+      mod_name_sing = object.class.model_name.singular.to_sym
+      [:new, pg_namespace, nested_record, mod_name_sing]
     end
 
     def target_index
@@ -123,7 +149,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}"