pg_rails 7.6.16 → 7.6.18

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

data/pg_engine/app/models/account.rb

@@ -34,6 +34,8 @@ class Account < ApplicationRecord
 
   validates :plan, :nombre, presence: true
 
+  has_many :audits, dependent: :nullify, class_name: 'Audited::Audit'
+
   ransacker :search do |parent|
     parent.table[:nombre]
   end

data/pg_engine/app/models/concerns/pg_engine/naming.rb

@@ -0,0 +1,55 @@
+module PgEngine
+  module Naming
+    deprecate :gender, deprecator: PgEngine.deprecator
+    def gender
+      self.class.model_name.human.downcase.ends_with?('a') ? 'f' : 'm'
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      # 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, :inline_editable_fields
+
+      def gender
+        model_name.human.downcase.ends_with?('a') ? 'f' : 'm'
+      end
+
+      def inline_editable?(attribute)
+        inline_editable_fields.present? && inline_editable_fields.include?(attribute.to_sym)
+      end
+
+      def ransackable_associations(_auth_object = nil)
+        authorizable_ransackable_associations
+      end
+
+      def ransackable_attributes(_auth_object = nil)
+        authorizable_ransackable_attributes
+      end
+
+      def nombre_plural
+        model_name.human(count: 2)
+      end
+
+      def nombre_singular
+        model_name.human(count: 1)
+      end
+
+      def human_attribute_name(attribute, options = {})
+        # Remove suffixes
+        if attribute.to_s.ends_with?('_text')
+          # Si es un enumerized
+          super(attribute[0..-6], options)
+        elsif attribute.to_s.ends_with?('_f')
+          # Si es un decorated method
+          super(attribute[0..-3], options)
+        else
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -7,62 +7,18 @@ module PgEngine
     extend Enumerize
     include PrintHelper
     include PostgresHelper
+    include Naming
 
     self.abstract_class = true
 
     before_create :setear_creado_y_actualizado_por
     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, :inline_editable_fields
-
-      def inline_editable?(attribute)
-        inline_editable_fields.present? && inline_editable_fields.include?(attribute.to_sym)
-      end
-    end
-
+    scope :unkept, -> { discarded }
     # ransacker :search do |parent|
     #   parent.table[:nombre]
     # end
 
-    def self.ransackable_associations(_auth_object = nil)
-      authorizable_ransackable_associations
-    end
-
-    def self.ransackable_attributes(_auth_object = nil)
-      authorizable_ransackable_attributes
-    end
-
-    def gender
-      self.class.model_name.human.downcase.ends_with?('a') ? 'f' : 'm'
-    end
-
-    def self.nombre_plural
-      model_name.human(count: 2)
-    end
-
-    def self.nombre_singular
-      model_name.human(count: 1)
-    end
-
-    def self.human_attribute_name(attribute, options = {})
-      if attribute.to_s.ends_with?('_text')
-        # Si es un enumerized
-        super(attribute[0..-6], options)
-      elsif attribute.to_s.ends_with?('_f')
-        # Si es un decorated method
-        super(attribute[0..-3], options)
-      else
-        super
-      end
-    end
-
-    def actions_component
-      ActionsComponent.new(self)
-    end
-
     # Para el dom_id (index.html)
     def to_key
       if respond_to? :hashid

data/pg_engine/app/models/user.rb

@@ -36,7 +36,7 @@ class User < ApplicationRecord
   audited
   include Discard::Model
 
-  has_many :user_accounts
+  has_many :user_accounts, dependent: :destroy
 
   # Hace falta?
   has_many :accounts, through: :user_accounts

data/pg_engine/app/notifiers/simple_user_notifier.rb

@@ -46,4 +46,8 @@ class SimpleUserNotifier < ApplicationNotifier
   def self.policy_class
     ApplicationPolicy
   end
+
+  def self.decorator_class
+    PgEngine::BaseRecordDecorator
+  end
 end

data/pg_engine/app/policies/account_policy.rb

@@ -13,17 +13,17 @@ class AccountPolicy < ApplicationPolicy
     # end
   end
 
-  # def puede_editar?
-  #   acceso_total? && !record.readonly?
-  # end
+  def puede_editar?
+    user.developer?
+  end
 
-  # def puede_crear?
-  #   acceso_total? || user.asesor?
-  # end
+  def puede_crear?
+    user.developer?
+  end
 
-  # def puede_borrar?
-  #   acceso_total? && !record.readonly?
-  # end
+  def puede_borrar?
+    user.developer?
+  end
 
   # def acceso_total?
   #   user.developer?

data/pg_engine/app/policies/pg_engine/base_policy.rb

@@ -13,6 +13,10 @@ module PgEngine
       base_access_to_collection?
     end
 
+    def archived?
+      base_access_to_collection?
+    end
+
     def show?
       base_access_to_record?
     end
@@ -30,7 +34,7 @@ module PgEngine
     end
 
     def update?
-      puede_editar? && !objeto_borrado?
+      puede_editar? && !record_discarded?
     end
 
     def edit?
@@ -38,7 +42,15 @@ module PgEngine
     end
 
     def destroy?
-      puede_borrar? && !objeto_borrado?
+      puede_borrar?
+    end
+
+    def archive?
+      puede_borrar? && !record_discarded?
+    end
+
+    def restore?
+      puede_borrar? && record.respond_to?(:discarded?) && record.discarded?
     end
 
     def scope
@@ -92,7 +104,7 @@ module PgEngine
       user&.developer?
     end
 
-    def objeto_borrado?
+    def record_discarded?
       if record.respond_to?(:kept?)
         !record.kept?
       else

data/pg_engine/app/views/admin/accounts/show.html.slim

@@ -1,10 +1,3 @@
-- content_for :title do
-  = @account.to_s
-- content_for :actions do
-  = @account.destroy_link_redirect
-  .ms-1
-  = @account.edit_link
-
 table.table.table-borderless.table-sm.w-auto.mb-0.m-3
   - atributos_para_mostrar.each do |att|
     tr

data/pg_engine/app/views/admin/email_logs/show.html.slim

@@ -1,10 +1,3 @@
-- content_for :title do
-  = @email_log.to_s
-- content_for :actions do
-  = @email_log.destroy_link_redirect
-  .ms-1
-  = @email_log.edit_link
-
 table.table.table-borderless.table-sm.w-auto.mb-0.m-3
   - atributos_para_mostrar.each do |att|
     tr

data/pg_engine/app/views/admin/emails/show.html.slim

@@ -1,10 +1,3 @@
-- content_for :title do
-  = @email.to_s
-- content_for :actions do
-  = @email.destroy_link_redirect
-  .ms-1
-  = @email.edit_link
-
 table.table.table-borderless.table-sm.w-auto.mb-0
   - atributos_para_mostrar.each do |att|
     tr

data/pg_engine/app/views/admin/simple_user_notifiers/_form.html.slim

@@ -1,4 +1,4 @@
-= pg_form_for @simple_user_notifier do |f|
+= pg_form_for @simple_user_notifier.decorate do |f|
   - if params[:plain_text]
     = link_to 'Change to rich text', url_for
     = f.input :message, as: :text

data/pg_engine/app/views/admin/simple_user_notifiers/show.html.slim

@@ -1,8 +1,3 @@
-- content_for :actions do
-  = @simple_user_notifier.destroy_link_redirect
-  .ms-1
-  = @simple_user_notifier.edit_link
-
 table.table.table-borderless.table-sm.w-auto.mb-0.m-3
   - atributos_para_mostrar.each do |att|
     tr

data/pg_engine/app/views/admin/user_accounts/show.html.slim

@@ -1,10 +1,3 @@
-- content_for :title do
-  = @user_account.to_s
-- content_for :actions do
-  = @user_account.destroy_link_redirect
-  .ms-1
-  = @user_account.edit_link
-
 table.table.table-borderless.table-sm.w-auto.mb-0.m-3
   - atributos_para_mostrar.each do |att|
     tr

data/pg_engine/app/views/admin/users/show.html.slim

@@ -1,10 +1,6 @@
 - content_for :title do
   = @user.to_s
-- content_for :actions do
-  = @user.destroy_link_redirect
-  .ms-1
-  = @user.edit_link
-  .ms-1
+- content_for :extra_actions do
   = link_to login_as_path(id: @user.id), class: 'btn btn-light btn-sm' do
     span.bi.bi-arrow-right
     |  Login as

data/pg_engine/app/views/pg_engine/base/index.html.slim

@@ -6,10 +6,31 @@
                          data: { controller: :tooltip, 'bs-title': 'Actualizar' } do
     i.bi.bi-arrow-clockwise
   .ms-1
-  - if @filtros.present?
-    = render SearchBarTogglerComponent.new
+  - if action_name == 'index' && (nested_record.blank? || nested_record.kept?)
+    = @clase_modelo.new.decorate.new_link
     .ms-1
-  = @clase_modelo.new.decorate.new_link
+  .dropdown data-controller="tooltip" data-bs-title="Más opciones"
+    button.btn.btn-outline-secondary.btn-sm.xdropdown-toggle[
+      type="button" data-bs-toggle="dropdown" aria-expanded="false"]
+      i.bi.bi-list
+    ul.dropdown-menu
+      - unless action_name == 'archived'
+        li = link_to [:archived, pg_namespace, nested_record, @clase_modelo].compact,
+                     class: 'icon-link dropdown-item' do
+          i.bi.bi-archive-fill.lh-1
+          = t('pg_engine.base.index.see_archived', model: clase_modelo)
+      - if @filtros.present?
+        li = render SearchBarTogglerComponent.new
+      - unless @export_link == false
+        li = @clase_modelo.new.decorate.export_link(request.url, text: 'Exportar en excel')
+
+- if action_name == 'archived'
+  .text-center.p-3.text-warning-emphasis.border-bottom
+    div
+      i.bi.bi-archive-fill
+    div
+      => t('pg_engine.base.index.youre_in_archived_index', model: clase_modelo)
+    = link_to t('.back_to_index'), @index_url
 
 - if @filtros.present?
   = render SearchBarComponent.new(@q, @filtros)
@@ -21,24 +42,27 @@
         caption.ps-3 = page_entries_info @collection
         thead.table-light
           tr
+            th
             - atributos_para_listar.each do |att|
               th.text-nowrap style="font-size: 0.8em" = encabezado att, ordenable: true
-            th.text-end
-              - unless @export_link == false
-                .actions-wrapper
-                  = @clase_modelo.new.decorate.export_link(request.url)
+            - if action_name == 'archived'
+              th.text-nowrap style="font-size: 0.8em" = encabezado :discarded_at, ordenable: true
         tbody
           - @collection.each do |object|
             - object = object.decorate
             tr id="#{dom_id(object)}"
-              - atributos_para_listar.each do |att, _sort_field|
-                = column_for object, att
-              td.text-nowrap.text-end.ps-5
+              td.text-nowrap.xtext-end.xps-5
                 .actions-wrapper
                   = object.extra_actions(size: :sm) if object.respond_to? :extra_actions
-                  = object.show_link
+                  = object.show_link(text: '')
                   = object.edit_link(text: '', klass: 'btn-light')
+                  = object.archive_link
+                  = object.restore_link
                   = object.destroy_link
+              - atributos_para_listar.each do |att, _sort_field|
+                = column_for object, att
+              - if action_name == 'archived'
+                = column_for object, :discarded_at
 
     .d-flex.justify-content-center
       = paginate(@collection)
@@ -50,12 +74,13 @@
             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"
+    / - i18n_key = "#{controller_key}.#{action_name}.index.empty_but_filtered"
+    - i18n_key = :".#{action_name}.empty_but_filtered"
     p.m-3
-      = t(i18n_key, default: :'.empty_but_filtered', model: @clase_modelo.nombre_plural.downcase)
+      = t(i18n_key, default: :".#{action_name}.empty_but_filtered", model: @clase_modelo)
       | :
       span.ms-2
       = 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)
+    p.m-3 = t(i18n_key, default: :".#{action_name}.empty", model: @clase_modelo)

data/pg_engine/config/locales/es.rb

@@ -0,0 +1,42 @@
+module PgEngine
+  module I18nRules
+    def self.rule(text)
+      lambda do |key, options|
+        male = options[:model].gender == 'm'
+        model_plural = options[:model].nombre_plural
+        model_singular = options[:model].nombre_singular
+        text.gsub(/^%{plural_model}/, model_plural)
+            .gsub(/^%{singular_model}/, model_singular)
+            .gsub('%{plural_model}', model_plural.downcase)
+            .gsub('%{singular_model}', model_singular.downcase)
+            .gsub(/%{genderize\((?<female>(?:(?!%{).)+),(?<male>(?:(?!%{).)+)\)}/, male ? '\k<male>' : '\k<female>' )
+      end
+    end
+  end
+end
+
+{
+  :es => {
+    pg_engine: {
+      resource_destroyed: PgEngine::I18nRules.rule("Se eliminó %{genderize(la,el)} %{singular_model}"),
+      resource_not_destroyed: PgEngine::I18nRules.rule("Hubo un error al intentar eliminar %{genderize(la,el)} %{singular_model}"),
+      resource_not_updated: PgEngine::I18nRules.rule("Hubo un error al intentar actualizar %{genderize(la,el)} %{singular_model}"),
+      resource_not_destroyed_because_associated: PgEngine::I18nRules.rule("No se pudo eliminar %{genderize(la,el)} %{singular_model} porque está asociado a otros elementos"),
+      base: {
+        index: {
+          archived: {
+            empty_but_filtered: PgEngine::I18nRules.rule("No hay %{genderize(ninguna,ningún)} %{singular_model} %{genderize(archivada,archivado)} para los filtros aplicados"),
+            empty: PgEngine::I18nRules.rule("No hay %{genderize(ninguna,ningún)} %{singular_model} %{genderize(archivada,archivado)}"),
+          },
+          index: {
+            empty_but_filtered: PgEngine::I18nRules.rule("No hay %{genderize(ninguna,ningún)} %{singular_model} para los filtros aplicados"),
+            empty: PgEngine::I18nRules.rule("No hay %{genderize(ninguna,ningún)} %{singular_model} que mostrar"),
+          },
+          youre_in_archived_index: PgEngine::I18nRules.rule("Estás viendo el listado de %{plural_model} %{genderize(archivadas,archivados)}"),
+          see_archived: PgEngine::I18nRules.rule("%{plural_model} %{genderize(archivadas,archivados)}"),
+          back_to_index: 'Volver al listado principal'
+        }
+      }
+    }
+  }
+}

data/pg_engine/config/locales/es.yml

@@ -11,11 +11,6 @@ es:
       gt: 'desde'
       lteq: 'hasta'
       gteq: 'desde'
-  pg_engine:
-    base:
-      index:
-        empty: 'No hay %{model} que mostrar'
-        empty_but_filtered: 'No hay %{model} para los filtros aplicados'
   gender:
     reset_password_token: m
     confirmation_token: m
@@ -27,7 +22,7 @@ es:
     external_id: ID externo
     created_at: Fecha de creación
     updated_at: Fecha de actualización
-    discarded_at: Fecha de borrado
+    discarded_at: Fecha de archivado
     confirmed_at: Fecha de confirmación
     actualizado_por: Actualizado por
     creado_por: Creado por

data/pg_engine/lib/pg_engine/engine.rb

@@ -27,6 +27,10 @@ module PgEngine
           ActsAsTenant.without_tenant(&)
         end
       end
+      Noticed::ApplicationRecord.class_eval do
+        extend Enumerize
+        include PgEngine::Naming
+      end
     end
 
     initializer 'pg_engine.set_exceptions_app' do

data/pg_engine/lib/pg_engine/route_helpers.rb

@@ -2,7 +2,12 @@ module PgEngine
   module RouteHelpers
     def pg_resource(key, options = {})
       resources(key, options) do
+        member do
+          post :archive
+          post :restore
+        end
         collection do
+          get :archived
           get :abrir_modal
           post :buscar
         end

data/pg_engine/spec/controllers/admin/accounts_controller_spec.rb

@@ -185,28 +185,23 @@ RSpec.describe Admin::AccountsController do
   describe 'DELETE #destroy' do
     subject do
       request.headers['Accept'] = 'text/vnd.turbo-stream.html,text/html'
-      delete :destroy, params: { id: account.to_param, redirect_to: redirect_url }
+      delete :destroy, params: { id: account.to_param, land_on: }
     end
 
     let!(:account) { create :account }
-    let(:redirect_url) { nil }
+    let(:land_on) { nil }
 
     it 'destroys the requested account' do
       expect { subject }.to change(Account.kept, :count).by(-1)
     end
 
-    it 'setea el discarded_at' do
-      subject
-      expect(account.reload.discarded_at).to be_present
-    end
-
     it 'envía el pg-event' do
       subject
       expect(response.body).to include('<pg-event data-event-name="pg:record-destroyed"')
     end
 
-    context 'si hay redirect_to' do
-      let(:redirect_url) { admin_accounts_url }
+    context 'si hay land_on' do
+      let(:land_on) { :index }
 
       it 'redirects to the accounts list' do
         subject

data/pg_engine/spec/controllers/admin/email_logs_controller_spec.rb

@@ -154,11 +154,11 @@ RSpec.describe Admin::EmailLogsController do
   describe 'DELETE #destroy' do
     subject do
       request.headers['Accept'] = 'text/vnd.turbo-stream.html,text/html'
-      delete :destroy, params: { id: email_log.to_param, redirect_to: redirect_url }
+      delete :destroy, params: { id: email_log.to_param, land_on: }
     end
 
     let!(:email_log) { create :email_log }
-    let(:redirect_url) { nil }
+    let(:land_on) { nil }
 
     it 'destroys the requested email_log' do
       expect { subject }.to change(EmailLog, :count).by(-1)
@@ -169,8 +169,8 @@ RSpec.describe Admin::EmailLogsController do
       expect(response.body).to include('<pg-event data-event-name="pg:record-destroyed"')
     end
 
-    context 'si hay redirect_to' do
-      let(:redirect_url) { admin_email_logs_url }
+    context 'si hay land_on' do
+      let(:land_on) { :index }
 
       it 'redirects to the email_logs list' do
         subject

data/pg_engine/spec/controllers/admin/emails_controller_spec.rb

@@ -143,11 +143,11 @@ RSpec.describe Admin::EmailsController do
   describe 'DELETE #destroy' do
     subject do
       request.headers['Accept'] = 'text/vnd.turbo-stream.html,text/html'
-      delete :destroy, params: { id: email.to_param, redirect_to: redirect_url }
+      delete :destroy, params: { id: email.to_param, land_on: }
     end
 
     let!(:email) { create :email }
-    let(:redirect_url) { nil }
+    let(:land_on) { nil }
 
     it 'destroys the requested email' do
       expect { subject }.to change(Email, :count).by(-1)
@@ -158,8 +158,8 @@ RSpec.describe Admin::EmailsController do
       expect(response.body).to include('<pg-event data-event-name="pg:record-destroyed"')
     end
 
-    context 'si hay redirect_to' do
-      let(:redirect_url) { admin_emails_url }
+    context 'si hay land_on' do
+      let(:land_on) { :index }
 
       it 'redirects to the emails list' do
         subject

data/pg_engine/spec/controllers/admin/user_accounts_controller_spec.rb

@@ -174,11 +174,11 @@ RSpec.describe Admin::UserAccountsController do
   describe 'DELETE #destroy' do
     subject do
       request.headers['Accept'] = 'text/vnd.turbo-stream.html,text/html'
-      delete :destroy, params: { id: user_account.to_param, redirect_to: redirect_url }
+      delete :destroy, params: { id: user_account.to_param, land_on: }
     end
 
     let!(:user_account) { create :user_account }
-    let(:redirect_url) { nil }
+    let(:land_on) { nil }
 
     it 'destroys the requested user_account' do
       expect { subject }.to change(UserAccount, :count).by(-1)
@@ -189,8 +189,8 @@ RSpec.describe Admin::UserAccountsController do
       expect(response.body).to include('<pg-event data-event-name="pg:record-destroyed"')
     end
 
-    context 'si hay redirect_to' do
-      let(:redirect_url) { admin_user_accounts_url }
+    context 'si hay land_on' do
+      let(:land_on) { :index }
 
       it 'redirects to the user_accounts list' do
         subject

data/pg_engine/spec/controllers/admin/users_controller_spec.rb

@@ -169,28 +169,23 @@ RSpec.describe Admin::UsersController do
   describe 'DELETE #destroy' do
     subject do
       request.headers['Accept'] = 'text/vnd.turbo-stream.html,text/html'
-      delete :destroy, params: { id: user.to_param, redirect_to: redirect_url }
+      delete :destroy, params: { id: user.to_param, land_on: }
     end
 
     let!(:user) { create :user }
-    let(:redirect_url) { nil }
+    let(:land_on) { nil }
 
     it 'destroys the requested user' do
       expect { subject }.to change(User.kept, :count).by(-1)
     end
 
-    it 'setea el discarded_at' do
-      subject
-      expect(user.reload.discarded_at).to be_present
-    end
-
     it 'envía el pg-event' do
       subject
       expect(response.body).to include('<pg-event data-event-name="pg:record-destroyed"')
     end
 
-    context 'si hay redirect_to' do
-      let(:redirect_url) { admin_users_url }
+    context 'si hay land_on' do
+      let(:land_on) { :index }
 
       it 'redirects to the users list' do
         subject