pg_rails 7.6.17 → 7.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a05ebc7aa2578ab2c32a72e68dc56b958aa0787216c6703764af4d906eba4aff
-  data.tar.gz: 43e3d8a43d5d4b6b490de9aec4f1b122051905c81c40f699868e2015b2db314f
+  metadata.gz: e3c2a1c474c0e93c88c3403a1c029908571afa71299d67bb61333f1dc41df4d6
+  data.tar.gz: 5bc01cc28aac8510bdac8d9e2b8b50f68c60d047d70dc0e47c693211dc4462a7
 SHA512:
-  metadata.gz: 2c9d7e326b078d50d6b5e7b8ac04f8aecfbe6217d6eb5d6984139cf1a9a9ab4f8f06e423e2b2babbfbd51266100bdd6191960a79d4b7a9a2c351f8647d3493a4
-  data.tar.gz: dea6b0686fe63c661a129b17a880d4158fec6fcc0430e96aaaace4444fddffd84818dabd164dee2523906824babded554cb0a10c49ed419da73b8d2c4a44baff
+  metadata.gz: af345cd05556af2813a3c492f4d8d76565f87eb34f7607a197ce9509ac35f4fbaea46029a9053f0768add6185d9940246360cf6c74705c0d88938c28e9b0fcce
+  data.tar.gz: f357484dbc3a12c00332574f8b7389020193a0a456b2ec0b1af8b1cd340c3a0c2855eea40ba8df125720283ddea2f741db8a45c0b8c3588348b5481342b8c6a9

data/pg_associable/app/javascript/modal_controller.js

@@ -1,5 +1,6 @@
 import { Controller } from '@hotwired/stimulus'
 import * as bootstrap from 'bootstrap'
+import { Rollbar } from 'rollbar'
 
 export default class extends Controller {
   static outlets = ['asociable']
@@ -41,7 +42,13 @@ export default class extends Controller {
         this.reloadTop()
         ev.stopPropagation()
       } else {
-        this.back(ev)
+        if (ev.data.dataset.reload) {
+          this.reload()
+          this.reloadTop()
+          ev.stopPropagation()
+        } else {
+          this.back(ev)
+        }
       }
     })
 
@@ -73,6 +80,15 @@ export default class extends Controller {
     }
   }
 
+  reload () {
+    const frame = this.element.querySelector('turbo-frame')
+    if (frame.attributes.src) {
+      frame.reload()
+    } else {
+      Rollbar.error('Modal without frame')
+    }
+  }
+
   reloadTop () {
     // FIXME: rename to main?
     const topFrame = document.querySelector('#top')

data/pg_engine/app/assets/stylesheets/pg_rails_b5.scss

@@ -71,11 +71,18 @@ input[type=datetime-local], input[type=datetime] {
 .listado {
   td, th {
     padding: 0.25rem 1rem;
+
+    &:has(.actions-wrapper) {
+      width: 0.1%;
+      border-right: 1px solid #c1c1c1;
+      padding: 0 1rem;
+      vertical-align: middle;
+    }
   }
 }
 .listado .actions-wrapper {
   display: flex;
-  justify-content: flex-end;
+  // justify-content: flex-end;
   gap: 4px;
 
   .btn-sm {

data/pg_engine/app/components/inline_edit/inline_show_component.html.slim

@@ -1,4 +1,5 @@
-- if @model.class.inline_editable?(@unsuffixed_attribute) && helpers.policy(@model).edit?
+- if Current.namespace == :users && \
+     @model.class.inline_editable?(@unsuffixed_attribute) && helpers.policy(@model).edit?
   = helpers.turbo_frame_tag(@frame_id, class: 'inline-edit')
     - if @record_updated
       pg-event[data-event-name="pg:record-updated" data-inline="true" data-turbo-temporary=""

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

@@ -1,8 +1,10 @@
 - if helpers.show_filters?
   = link_to url_for(ocultar_filtros: 1, cancel_filter: 'true'),
-            class: 'btn btn-sm btn-outline-primary col-auto' do
+            class: 'dropdown-item icon-link' do
+    i.bi.bi-funnel-fill.lh-1
     | Ocultar filtros
 - else
   = link_to url_for(mostrar_filtros: 1),
-            class: 'btn btn-sm btn-outline-primary col-auto' do
-    | Filtrar
+            class: 'dropdown-item icon-link' do
+    i.bi.bi-funnel-fill.lh-1
+    | Mostrar filtros

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

@@ -8,10 +8,6 @@ module Admin
 
     self.clase_modelo = Account
 
-    before_action(only: :index) { authorize Account }
-
-    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
-
     private
 
     def atributos_permitidos

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

@@ -8,10 +8,6 @@ module Admin
 
     self.clase_modelo = EmailLog
 
-    before_action(only: :index) { authorize EmailLog }
-
-    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
-
     before_action do
       @actions = [
         ["Mailgun sync: #{ENV.fetch('MAILGUN_DOMAIN', nil)}", mailgun_sync_admin_email_logs_path, {

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

@@ -8,10 +8,6 @@ module Admin
 
     self.clase_modelo = Email
 
-    before_action(only: :index) { authorize Email }
-
-    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
-
     after_action only: :create do
       if @saved
         PgEngine::AdminMailer.with(email_object: @email).admin_mail.deliver_later

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

@@ -4,8 +4,6 @@ module Admin
 
     self.clase_modelo = SimpleUserNotifier
 
-    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
-
     def column_options_for(object, attribute)
       case attribute
       when :message

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

@@ -10,10 +10,6 @@ module Admin
     self.nested_class = Account
     self.nested_key = :account_id
 
-    before_action(only: :index) { authorize UserAccount }
-
-    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
-
     private
 
     def atributos_permitidos

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

@@ -8,14 +8,10 @@ module Admin
 
     self.clase_modelo = User
 
-    before_action(only: :index) { authorize User }
-
     before_action only: %i[update] do
       params[:user].delete(:password) if params[:user][:password].blank?
     end
 
-    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
-
     def create
       @user.skip_confirmation!
       @user.orphan = true

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

@@ -10,6 +10,9 @@ module PgEngine
         # TODO: separar los endpoints de la lógica de filtros para evitar esta variable
         # en Agenda
         attr_accessor :skip_default_breadcrumb
+
+        # Skip set_instancia_modelo && authorize
+        attr_accessor :skip_default_hooks
       end
       clazz.delegate :nested_key, :nested_class, :clase_modelo, to: clazz
 
@@ -22,6 +25,7 @@ module PgEngine
       clazz.helper_method :show_filters?
       clazz.helper_method :available_page_sizes
       clazz.helper_method :column_options_for
+      clazz.helper_method :instancia_modelo
 
       clazz.before_action do
         # TODO: quitar esto, que se use el attr_accessor
@@ -29,6 +33,14 @@ module PgEngine
         @clase_modelo = clase_modelo
       end
 
+      clazz.before_action(only: %i[index archived], unless: -> { clazz.skip_default_hooks }) do
+        authorize clase_modelo
+      end
+
+      clazz.before_action :set_instancia_modelo,
+                          only: %i[new create show edit update destroy archive restore],
+                          unless: -> { clazz.skip_default_hooks }
+
       clazz.before_action unless: -> { clazz.skip_default_breadcrumb } do
         if nested_record.present?
           # Link al nested, siempre que sea no sea un embedded frame
@@ -40,20 +52,28 @@ module PgEngine
               add_breadcrumb nested_record.decorate.to_s_short
             else
               add_breadcrumb nested_record.decorate.to_s_short,
-                             nested_record.decorate.target_object
+                             path_for(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
+          if action_name == 'archived'
+            # En el listado de archivados tiene que haber un link al listado
+            # principal
+            add_breadcrumb clase_modelo.nombre_plural,
+                           path_for([pg_namespace, nested_record, clase_modelo])
+          else
+            # Texto de index pero sin link, porque se supone que es un
+            # embedded index o es un show dentro de un embedded y por ende
+            # el paso atrás no tiene que ser el listado sino el show del parent
+            add_breadcrumb clase_modelo.nombre_plural
+          end
 
         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])
+                           path_for([pg_namespace, nested_record, clase_modelo])
           else
             # :nocov:
             pg_warn 'clase_modelo is nil'
@@ -113,8 +133,10 @@ module PgEngine
     end
 
     def set_layout
-      if action_name == 'index'
+      if action_name.in? %w[index archived]
         'pg_layout/base'
+      elsif action_name == 'show'
+        'pg_layout/show'
       else
         'pg_layout/containerized'
       end
@@ -129,10 +151,20 @@ module PgEngine
       pg_respond_buscar
     end
 
+    def archived
+      add_breadcrumb 'Archivados'
+
+      @index_url = index_url
+
+      @collection = filtros_y_policy(atributos_para_buscar, 'discarded_at desc', archived: true)
+
+      pg_respond_index(archived: true)
+    end
+
     def index
       @collection = filtros_y_policy(atributos_para_buscar, default_sort)
 
-      pg_respond_index
+      pg_respond_index(archived: false)
     end
 
     def show
@@ -186,12 +218,48 @@ module PgEngine
     end
 
     def destroy
-      pg_respond_destroy(instancia_modelo, params[:redirect_to])
+      pg_respond_destroy(instancia_modelo, params[:land_on])
+    end
+
+    def archive
+      discard_undiscard(:discard)
+    end
+
+    def restore
+      discard_undiscard(:undiscard)
     end
     # End public endpoints
 
     protected
 
+    def discard_undiscard(method)
+      if instancia_modelo.send(method)
+        if accepts_turbo_stream?
+          body = <<~HTML.html_safe
+            <pg-event data-event-name="pg:record-updated" data-reload="true" data-turbo-temporary>
+            </pg-event>
+          HTML
+          render turbo_stream: turbo_stream.append(current_turbo_frame, body)
+        else
+          redirect_to instancia_modelo.decorate.target_object
+        end
+
+      else
+        message = I18n.t('pg_engine.resource_not_updated', model: instancia_modelo.class)
+        if accepts_turbo_stream?
+          flash.now[:alert] = message
+          render turbo_stream: render_turbo_stream_flash_messages, status: :unprocessable_entity
+        else
+          flash[:alert] = message
+          redirect_to instancia_modelo.decorate.target_object
+        end
+      end
+    end
+
+    def index_url
+      path_for([pg_namespace, nested_record, clase_modelo])
+    end
+
     def default_sort
       'id desc'
     end
@@ -309,10 +377,10 @@ module PgEngine
       end
     end
 
-    def pg_respond_index
+    def pg_respond_index(archived:)
       respond_to do |format|
         format.json { render json: @collection }
-        format.html { render_listing }
+        format.html { render_listing(archived:) }
         format.xlsx do
           render xlsx: 'download',
                  filename: "#{clase_modelo.nombre_plural.gsub(' ', '-').downcase}" \
@@ -331,12 +399,20 @@ module PgEngine
       end
     end
 
-    def destroyed_message(model)
-      "#{model.model_name.human} #{model.gender == 'f' ? 'borrada' : 'borrado'}"
+    def land_on_url(land_on)
+      case land_on
+      when 'index'
+        index_url
+      else
+        # :nocov:
+        pg_warn "Unrecognized land_on: #{land_on}"
+        instancia_modelo.decorate.target_object
+        # :nocov:
+      end
     end
 
     # rubocop:disable Metrics/PerceivedComplexity
-    def pg_respond_destroy(model, redirect_url = nil)
+    def pg_respond_destroy(model, land_on = nil)
       if destroy_model(model)
         # FIXME: rename to main
         if turbo_frame? && current_turbo_frame != 'top'
@@ -345,8 +421,10 @@ module PgEngine
             </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 land_on.present?
+          redirect_to land_on_url(land_on),
+                      notice: I18n.t('pg_engine.resource_destroyed', model: model.class),
+                      status: :see_other
         elsif accepts_turbo_stream?
           body = <<~HTML.html_safe
             <pg-event data-event-name="pg:record-destroyed" data-turbo-temporary>
@@ -355,7 +433,8 @@ module PgEngine
           render turbo_stream: turbo_stream.append_all('body', body)
         else
           redirect_back(fallback_location: root_path,
-                        notice: destroyed_message(model), status: 303)
+                        notice: I18n.t('pg_engine.resource_destroyed', model: model.class),
+                        status: 303)
         end
       elsif in_modal?
 
@@ -372,32 +451,31 @@ module PgEngine
     # rubocop:enable Metrics/PerceivedComplexity
 
     def destroy_model(model)
-      @error_message = 'No se pudo eliminar el registro'
+      @error_message = I18n.t('pg_engine.resource_not_destroyed', model: model.class)
 
       begin
-        destroy_method = model.respond_to?(:discard) ? :discard : :destroy
-        return true if model.send(destroy_method)
+        return true if model.destroy
 
         @error_message = model.errors.full_messages.join(', ').presence || @error_message
 
         false
       rescue ActiveRecord::InvalidForeignKey => e
-        model_name = t("activerecord.models.#{model.class.name.underscore}")
-        @error_message = "#{model_name} no se pudo borrar porque tiene elementos asociados."
         pg_warn(e)
+        @error_message = I18n.t('pg_engine.resource_not_destroyed_because_associated', model: model.class)
       end
 
       false
     end
 
-    def render_listing
+    def render_listing(archived:)
       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?
+      @records_filtered = default_scope_for_current_model(archived:).any? if @filtros.present? && @collection.empty?
+      render :index
     end
 
     def buscar_instancia
@@ -450,19 +528,11 @@ module PgEngine
       clase_modelo.name.underscore
     end
 
-    def filtros_y_policy(campos, dflt_sort = nil)
+    def filtros_y_policy(campos, dflt_sort = nil, archived: false)
       @filtros = PgEngine::FiltrosBuilder.new(
         self, clase_modelo, campos
       )
-      scope = policy_scope(clase_modelo)
-
-      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
+      scope = default_scope_for_current_model(archived:)
 
       shared_context = Ransack::Adapters::ActiveRecord::Context.new(scope)
       @q = clase_modelo.ransack(params[:q], context: shared_context)
@@ -471,20 +541,30 @@ module PgEngine
       shared_context.evaluate(@q)
     end
 
-    def default_scope_for_current_model
+    def soft_delete_filter(scope, archived:)
+      return scope unless scope.respond_to?(:discarded)
+
+      if nested_id.present?
+        if archived
+          scope.discarded
+        else
+          scope.undiscarded
+        end
+      elsif archived
+        scope.unkept
+      else
+        scope.kept
+      end
+    end
+
+    def default_scope_for_current_model(archived: false)
       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
+      soft_delete_filter(scope, archived:)
     end
   end
 end

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

@@ -18,10 +18,6 @@ module Public
 
     self.clase_modelo = MensajeContacto
 
-    before_action(only: :index) { authorize MensajeContacto }
-
-    before_action :set_instancia_modelo, only: %i[new create]
-
     layout 'pg_layout/container_logo'
 
     def new; end

data/pg_engine/app/controllers/users/accounts_controller.rb

@@ -10,10 +10,6 @@ module Users
     add_breadcrumb 'Cuentas'
     self.skip_default_breadcrumb = true
 
-    before_action(only: :index) { authorize Account }
-
-    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
-
     # private
 
     # def atributos_permitidos

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/ClassLength
 module PgEngine
   class BaseRecordDecorator < Draper::Decorator
     include ActionView::Helpers
@@ -28,8 +29,7 @@ module PgEngine
 
     def text_for_new
       klass = object.class
-      # TODO: no está bueno tener que hacer el new, gender debería estar en la clase
-      verb = klass.new.gender == 'f' ? 'Nueva' : 'Nuevo'
+      verb = klass.gender == 'f' ? 'Nueva' : 'Nuevo'
       "#{verb} #{klass.model_name.human.downcase}"
     end
 
@@ -57,22 +57,50 @@ module PgEngine
       if helpers.using_modal?
         destroy_link
       else
-        destroy_link(redirect_to: helpers.url_for(target_index))
+        destroy_link(land_on: :index)
       end
     end
 
-    def destroy_link(confirm_text: '¿Confirmás que querés borrar el registro?', klass: 'btn-light', redirect_to: nil)
+    def destroy_link(confirm_text: '¿Confirmás que querés borrar el registro?', klass: 'btn-light', land_on: nil)
       return unless Pundit.policy!(Current.user, object).destroy?
 
-      helpers.content_tag :span, rel: :tooltip, title: 'Eliminar' do
-        helpers.link_to object_url + (redirect_to.present? ? "?redirect_to=#{redirect_to}" : ''),
+      helpers.content_tag :span, rel: :tooltip, title: 'Eliminar definitivamente' do
+        helpers.link_to object_url + (land_on.present? ? "?land_on=#{land_on}" : ''),
                         data: { 'turbo-confirm': confirm_text, 'turbo-method': :delete },
-                        class: "btn btn-sm #{klass}" do
+                        class: "btn btn-sm #{klass} text-danger" do
           helpers.content_tag :span, nil, class: clase_icono('trash-fill')
         end
       end
     end
 
+    def archive_link(klass: 'btn-light')
+      return unless Pundit.policy!(Current.user, object).archive?
+
+      target_archive = [:archive, pg_namespace, nested_record, object]
+
+      helpers.content_tag :span, rel: :tooltip, title: 'Archivar' do
+        helpers.link_to helpers.url_for(target_archive),
+                        data: { 'turbo-method': :post, 'turbo-stream': true },
+                        class: "btn btn-sm #{klass}" do
+          helpers.content_tag :span, nil, class: clase_icono('archive-fill')
+        end
+      end
+    end
+
+    def restore_link(klass: 'btn-light')
+      return unless Pundit.policy!(Current.user, object).restore?
+
+      target_archive = [:restore, pg_namespace, nested_record, object]
+
+      helpers.content_tag :span, rel: :tooltip, title: 'Desarchivar' do
+        helpers.link_to helpers.url_for(target_archive),
+                        data: { 'turbo-method': :post, 'turbo-stream': true },
+                        class: "btn btn-sm #{klass}" do
+          helpers.content_tag(:span, nil, class: clase_icono('arrow-counterclockwise')) + ' Desarchivar'
+        end
+      end
+    end
+
     def edit_link(text: ' Modificar', klass: 'btn-warning')
       return unless Pundit.policy!(Current.user, object).edit?
 
@@ -103,14 +131,11 @@ module PgEngine
       end
     end
 
-    def export_link(url, text: '', klass: 'btn-info')
+    def export_link(url, text: '')
       return unless Pundit.policy!(Current.user, object).export?
 
-      helpers.content_tag :span, rel: :tooltip, title: 'Exportar en excel' do
-        helpers.content_tag :a, target: '_blank',
-                                class: "btn btn-sm #{klass}", href: url_change_format(url, 'xlsx') do
-          "#{helpers.content_tag(:span, nil, class: clase_icono('file-earmark-excel-fill'))} #{text}".html_safe
-        end
+      helpers.content_tag :a, target: '_blank', class: 'icon-link dropdown-item lh-1', href: url_change_format(url, 'xlsx') do
+        "#{helpers.content_tag(:span, nil, class: clase_icono('file-earmark-excel-fill'))} #{text}".html_safe
       end
     end
 
@@ -182,3 +207,4 @@ module PgEngine
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

data/pg_engine/app/helpers/pg_engine/index_helper.rb

@@ -18,13 +18,13 @@ module PgEngine
         sort_field = sort_field.to_s.sub(/_text\z/, '')
       end
 
+      # Unsuffixed
       campo = campo.to_s.sub(/_f\z/, '')
       campo = campo.to_s.sub(/_text\z/, '')
 
       clase = options[:clase] || @clase_modelo
-      key = [controller_name, action_name, 'listado_header', campo].join('.')
-      dflt = :"activerecord.attributes.#{clase.model_name.i18n_key}.#{campo}"
-      human_name = clase.human_attribute_name(key, default: dflt)
+
+      human_name = scoped_human_attr_name(clase, campo, 'listado_header')
 
       if options[:ordenable]
         if sort_field.is_a? Array
@@ -37,6 +37,20 @@ module PgEngine
       end
     end
 
+    def scoped_human_attr_name(clase, campo, scope)
+      action_key = build_scoped_key(clase, campo, scope, action_name)
+      scope_key = build_scoped_key(clase, campo, scope)
+
+      I18n.t(action_key, default: [scope_key, clase.human_attribute_name(campo)])
+    end
+
+    def build_scoped_key(clase, campo, scope = nil, subscope = nil)
+      campo = "#{campo}/scoped" if scope.present?
+      scope = "#{subscope}/#{scope}" if subscope.present?
+
+      ['activerecord.attributes', clase.model_name.i18n_key, campo, scope].compact.join('.').to_sym
+    end
+
     def default_order(campo)
       columna = @clase_modelo.columns.find { _1.name == campo.to_s }
       if columna && columna.type.to_s.include?('date')

data/pg_engine/app/helpers/pg_engine/route_helper.rb

@@ -63,5 +63,9 @@ module PgEngine
 
       polymorphic_url(target.flatten.compact, options.merge(only_path: true))
     end
+
+    def path_for(array)
+      url_for(array.push({ only_path: true }))
+    end
   end
 end

data/pg_engine/app/lib/pg_engine/filtros_builder.rb

@@ -5,6 +5,7 @@ module PgEngine
     include ActionView::Helpers
     include ActionView::Context
     include PostgresHelper
+    include IndexHelper
     attr_accessor :controller
 
     # El orden de los sufijos es importante
@@ -140,16 +141,13 @@ module PgEngine
 
     def placeholder_campo(campo)
       suf = extraer_sufijo(campo)
-      key = [controller_name, action_name, 'filter', sin_sufijo(campo)].join('.')
-      dflt = :"activerecord.attributes.#{@clase_modelo.model_name.i18n_key}.#{sin_sufijo(campo)}"
-      human_name = @clase_modelo.human_attribute_name(key, default: dflt)
+      human_name = scoped_human_attr_name(@clase_modelo, sin_sufijo(campo), 'filter')
 
-      ret =
-        if suf.present?
-          "#{human_name} #{I18n.t(suf, scope: 'ransack.predicates')}"
-        else
-          human_name
-        end
+      ret = if suf.present?
+              "#{human_name} #{I18n.t(suf, scope: 'ransack.predicates')}"
+            else
+              human_name
+            end
 
       ret.strip.downcase.tap { _1[0] = _1[0].capitalize }
     end