pg_rails 7.0.8.pre.alpha.37 → 7.0.8.pre.alpha.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc5297175e67ac85e03b8fbf4781139dc77a9d491c5c5ab15b0cf6d3d2c6dd48
-  data.tar.gz: fa9e5a41db685275a80b90b737a9ff9772798d8c96c7cc4ab3c9b9d16a550716
+  metadata.gz: 3ea9466d068f06c41fe15e315f2d238ed0479645dfb54a3281e508761bb56891
+  data.tar.gz: 2fc50e466c3e8022c04a239faad5ce80dda256e5ee41b83d8c010a6e722416a3
 SHA512:
-  metadata.gz: ed39f31e8b7cebaf0d0c3055db4df0f044867d3df6d749720fe4093c400fbab88bbbdf3ef8869d43198f78345cf07b6854ef14339b1c579e3d1602f0526b7794
-  data.tar.gz: 8752b125d74aa41ee9b9db26cca6a4fa94e17c58337c5eb95751d451ddbbaa175d9bf9f31d2cd0b33f4dcb0987c3837f38978efed0057895c8121285d65703ca
+  metadata.gz: 0af2dd365f7a39c4d2bbba1847419a900f5484e7fde5189babaf3f4ab50b59843c88270a8a9890ae3f03617e1ac46fd1a0de80cd1a0391088edd54f597c07f13
+  data.tar.gz: 184710630962af26ee129440ba5c47814fdc5728f287be8c20e5da322fabafd91c4fb2a359bded287445b7dddebba854466a40dcca387a326635348a9167c7cb

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

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

data/pg_associable/spec/pg_associable/helpers_spec.rb

@@ -2,16 +2,14 @@ require 'rails_helper'
 
 describe PgAssociable::Helpers do
   describe '#pg_respond_buscar' do
-    let(:user) { create :user, :developer }
     let(:ctrl) do
-      # clazz = Class.new(Admin::CosasController)
-      # clazz.new
       Admin::CosasController.new
     end
     let!(:cosa) { create :cosa }
 
     before do
-      allow(ctrl).to receive_messages(current_user: user, params: { id: 123, query: cosa.id })
+      Current.user = create :user, :developer
+      allow(ctrl).to receive_messages(params: { id: 123, query: cosa.id })
       allow(ctrl).to receive(:render)
       ctrl.instance_variable_set(:@clase_modelo, Cosa)
     end

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

@@ -230,8 +230,6 @@ module PgEngine
         instancia_modelo.assign_attributes(modelo_params) if action_name.in? %w[update]
       end
 
-      instancia_modelo.current_user = send(PgEngine.configuracion.current_user_method)
-
       authorize instancia_modelo
 
       # TODO: problema en create y update cuando falla la validacion

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

@@ -20,6 +20,10 @@ module PgEngine
       end
     end
 
+    before_action do
+      Current.user = current_user
+    end
+
     protect_from_forgery with: :exception
 
     rescue_from PrintHelper::FechaInvalidaError, with: :fecha_invalida
@@ -35,7 +39,7 @@ module PgEngine
 
     helper_method :dev_user?
     def dev_user?
-      current_user&.developer?
+      Current.user&.developer?
     end
 
     helper_method :mobile_device?
@@ -47,7 +51,7 @@ module PgEngine
     add_flash_types :warning, :success
 
     before_action do
-      console if params[:show_web_console]
+      console if dev_user_or_env? && (params[:show_web_console] || params[:wc])
     end
 
     before_action do
@@ -57,7 +61,7 @@ module PgEngine
                              else
                                'opened'
                              end
-      @navbar = Navbar.new(current_user)
+      @navbar = Navbar.new(Current.user)
 
       if Rollbar.configuration.enabled && Rails.application.credentials.rollbar.present?
         @rollbar_token = Rails.application.credentials.rollbar.access_token_client
@@ -68,6 +72,10 @@ module PgEngine
       request.user_agent =~ /Mobile|webOS/
     end
 
+    def pundit_user
+      Current.user
+    end
+
     protected
 
     # TODO: ver qué pasa en producción
@@ -99,7 +107,7 @@ module PgEngine
         format.html do
           if request.path == root_path
             # TODO!: renderear un 500.html y pg_err
-            sign_out(current_user) if current_user.present?
+            sign_out(Current.user) if Current.user.present?
             render plain: 'Not authorized'
           else
             go_back('Not authorized')

data/pg_engine/app/decorators/pg_engine/base_decorator.rb

@@ -32,7 +32,7 @@ module PgEngine
     # rubocop:enable Style/MissingRespondToMissing
 
     def destroy_link(confirm_text: '¿Estás seguro?', klass: 'btn-light')
-      return unless Pundit.policy!(helpers.send(PgEngine.configuracion.current_user_method), object).destroy?
+      return unless Pundit.policy!(Current.user, object).destroy?
 
       helpers.content_tag :span, rel: :tooltip, title: 'Eliminar' do
         helpers.link_to object_url, data: { 'turbo-confirm': confirm_text, 'turbo-method': :delete },
@@ -43,7 +43,7 @@ module PgEngine
     end
 
     def edit_link(text: '', klass: 'btn-light')
-      return unless Pundit.policy!(helpers.send(PgEngine.configuracion.current_user_method), object).edit?
+      return unless Pundit.policy!(Current.user, object).edit?
 
       helpers.content_tag :span, rel: :tooltip, title: 'Editar' do
         helpers.link_to edit_object_url, data: { turbo_frame: :main },
@@ -54,7 +54,7 @@ module PgEngine
     end
 
     def show_link(text: '', klass: 'btn-light')
-      return unless Pundit.policy!(helpers.send(PgEngine.configuracion.current_user_method), object).show?
+      return unless Pundit.policy!(Current.user, object).show?
 
       helpers.content_tag :span, rel: :tooltip, title: 'Ver' do
         helpers.link_to object_url, data: { turbo_frame: :main },
@@ -65,7 +65,7 @@ module PgEngine
     end
 
     def export_link(url, text: '', klass: 'btn-info')
-      return unless Pundit.policy!(helpers.current_user, object).export?
+      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',
@@ -76,7 +76,7 @@ module PgEngine
     end
 
     def new_link(remote: nil, klass: 'btn-warning')
-      return unless Pundit.policy!(helpers.send(PgEngine.configuracion.current_user_method), object).new?
+      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}",

data/pg_engine/app/helpers/pg_engine/form_helper.rb

@@ -3,6 +3,7 @@
 module PgEngine
   module FormHelper
     def pg_form_for(object, *args, &)
+      resource = object
       if object.is_a? PgEngine::BaseDecorator
         object = object.target_object
       elsif object.is_a?(PgEngine::BaseRecord) &&
@@ -21,6 +22,11 @@ module PgEngine
                                  'pg-form'
                                end
 
+      if resource.errors.any?
+        options[:html][:data] ||= {}
+        options[:html][:data][:errors] = resource.errors.details.to_json
+      end
+
       simple_form_for(object, *(args << options), &)
     end
 
@@ -32,7 +38,9 @@ module PgEngine
 
     # This method creates a link with `data-id` `data-fields` attributes.
     # These attributes are used to create new instances of the nested fields through Javascript.
-    def link_to_add_fields(name, form, association, required: false)
+    def link_to_add_fields(name, form, association, required: false, view_path: nil)
+      # view_path is required when rendering outside a controller flow
+
       # Takes an object (@person) and creates a new instance of its associated model (:addresses)
       # To better understand, run the following in your terminal:
       # rails c --sandbox
@@ -59,7 +67,7 @@ module PgEngine
           # The render function will then look for `views/people/_address_fields.html.erb`
           # The render function also needs to be passed the value of 'builder', because
           # `views/people/_address_fields.html.erb` needs this to render the form tags.
-          render("#{association.to_s.singularize}_fields", f: builder)
+          render(view_path || "#{association.to_s.singularize}_fields", f: builder)
         end
 
       # This renders a simple link, but passes information into `data` attributes.

data/pg_engine/app/helpers/pg_engine/pg_rails_helper.rb

@@ -1,9 +1,5 @@
 module PgEngine
   module PgRailsHelper
-    def current_account
-      current_user&.current_account
-    end
-
     def img_placeholder(src: nil, width: '100%', height: '100%', fade_in: false, **img_opts)
       if fade_in || src.nil?
         img_opts = img_opts.merge(style: [img_opts[:style], 'display:none'].compact.join(';'))

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

@@ -17,6 +17,8 @@ module PgEngine
       end
 
       def self.namespace(context)
+        return Current.namespace if Current.namespace.present?
+
         req = request(context)
         route = Rails.application.routes.recognize_path(req.path, method: req.env['REQUEST_METHOD'])
         parts = route[:controller].split('/')

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

@@ -233,7 +233,7 @@ module PgEngine
       nombre_clase = asociacion.options[:class_name]
       nombre_clase = asociacion.name.to_s.camelize if nombre_clase.nil?
       clase_asociacion = Object.const_get(nombre_clase)
-      scope = Pundit.policy_scope!(controller.send(PgEngine.configuracion.current_user_method), clase_asociacion)
+      scope = Pundit.policy_scope!(Current.user, clase_asociacion)
 
       # Filtro soft deleted, y sea con paranoia o con discard
       scope = scope.without_deleted if scope.respond_to?(:without_deleted)

data/pg_engine/app/lib/pg_form_builder.rb

@@ -32,23 +32,7 @@ class PgFormBuilder < SimpleForm::FormBuilder
     base_message = (base_errors.map(&:to_s).join('<br>') if base_errors.present?)
     base_tag = error_notification(message: base_message, class: 'alert alert-danger') if base_message
 
-    all_errors_tag = build_all_errors_tag unless base_tag
-
-    "#{title}#{base_tag}#{all_errors_tag}".html_safe # rubocop:disable Rails/OutputSafety
-  end
-
-  def build_all_errors_tag
-    details = object.errors.details.dup
-    details.delete(:base)
-    not_base_errors = details.any?
-
-    return unless not_base_errors
-
-    # TODO!: poder pasar un block para que no se ejecute si no se va a loguear por el log level
-    # TODO: quizá esta warning loguearla pero no mandarla a rollbar por si son demasiadas
-    pg_warn "Not base errors en pg_form: #{object.errors.details}. Record: #{object.inspect}", :warn
-
-    "<span class='not_base_errors' data-errors='#{object.errors.details.to_json}'></span>"
+    "#{title}#{base_tag}".html_safe # rubocop:disable Rails/OutputSafety
   end
 
   def mensaje

data/pg_engine/app/models/current.rb

@@ -0,0 +1,12 @@
+class Current < ActiveSupport::CurrentAttributes
+  attribute :account, :user, :namespace
+  # attribute :request_id, :user_agent, :ip_address
+
+  # resets { Time.zone = nil }
+
+  def user=(user)
+    super
+    self.account = user&.current_account
+    # Time.zone    = user.time_zone
+  end
+end

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

@@ -10,8 +10,6 @@ module PgEngine
 
     self.abstract_class = true
 
-    attr_accessor :current_user
-
     before_create :setear_creado_y_actualizado_por
     before_update :setear_actualizado_por
 
@@ -59,12 +57,12 @@ module PgEngine
     private
 
     def setear_creado_y_actualizado_por
-      setear_si_existe :creado_por, current_user
-      setear_si_existe :actualizado_por, current_user
+      setear_si_existe :creado_por, Current.user
+      setear_si_existe :actualizado_por, Current.user
     end
 
     def setear_actualizado_por
-      setear_si_existe :actualizado_por, current_user
+      setear_si_existe :actualizado_por, Current.user
     end
 
     def setear_si_existe(campo, valor)

data/pg_engine/lib/pg_engine/configuracion.rb

@@ -5,8 +5,7 @@
 module PgEngine
   class Configuracion
     attr_accessor :sistema_iconos, :clase_botones_chicos, :boton_destroy, :boton_edit,
-                  :boton_show, :boton_light, :icono_destroy, :icono_edit, :icono_show, :boton_export, :bootstrap_version,
-                  :current_user_method
+                  :boton_show, :boton_light, :icono_destroy, :icono_edit, :icono_show, :boton_export, :bootstrap_version
 
     def initialize
       @sistema_iconos = 'bi'
@@ -20,7 +19,6 @@ module PgEngine
       @icono_edit = 'pencil'
       @icono_show = 'eye-fill'
       @bootstrap_version = 5
-      @current_user_method = :current_user
     end
   end
 end

data/pg_engine/lib/pg_engine/utils/pg_logger.rb

@@ -18,9 +18,9 @@ end
 
 module PgEngine
   class PgLogger
-    # Generalmente en local queremos que se lancen los errores, salvo
+    # Generalmente en test queremos que se lancen los errores, salvo
     # cuando estamos testeando casos de error puntuales.
-    @raise_errors = Rails.env.local?
+    @raise_errors = Rails.env.test?
 
     class << self
       attr_accessor :raise_errors

data/pg_engine/spec/controllers/pg_engine/base_controller_spec.rb

@@ -5,6 +5,10 @@ class DummyBaseController < PgEngine::BaseController
     raise PgEngine::BaseController::Redirect, '/some_path'
   end
 
+  def test_not_authorized
+    raise Pundit::NotAuthorizedError
+  end
+
   def check_dev_user
     @dev_user_or_env = dev_user_or_env?
     @dev_user = dev_user?
@@ -24,6 +28,38 @@ describe DummyBaseController do
     end
   end
 
+  describe 'not_authorized' do
+    subject do
+      get :test_not_authorized
+    end
+
+    let(:user) { create :user }
+
+    before do
+      sign_in user
+    end
+
+    it do
+      subject
+      expect(response).to redirect_to root_path
+      expect(flash[:alert]).to eq 'Not authorized'
+      expect(controller).to be_user_signed_in
+    end
+
+    context 'cuando ocurre en el root_path' do
+      before do
+        allow_any_instance_of(ActionController::TestRequest).to receive(:path).and_return(root_path)
+      end
+
+      it do
+        subject
+        expect(response).to have_http_status(:ok)
+        expect(response.body).to eq 'Not authorized'
+        expect(controller).not_to be_user_signed_in
+      end
+    end
+  end
+
   describe '#dev_user_or_env?' do
     let(:user) { create :user, :developer }
 

data/pg_engine/spec/lib/pg_form_builder_spec.rb

@@ -15,9 +15,6 @@ describe PgFormBuilder do
   describe '#mensajes_de_error' do
     subject { instancia.mensajes_de_error }
 
-    # expect(subject)
-    # it { expect(subject).to eq 'Por favor, revisá los campos obligatorios:' }
-
     context 'cuando solo tiene errores de presencia' do
       before do
         categoria.nombre = nil
@@ -25,7 +22,6 @@ describe PgFormBuilder do
       end
 
       it { expect(subject).to include 'Por favor, revisá los campos obligatorios:' }
-      it { expect(subject).to include 'not_base_errors' }
     end
 
     context 'cuando solo tiene errores de :base' do
@@ -35,7 +31,6 @@ describe PgFormBuilder do
       end
 
       it { expect(subject).to include 'Por favor, revisá los siguientes errores' }
-      it { expect(subject).not_to include 'not_base_errors' }
     end
   end
 

data/pg_layout/app/javascript/controllers/pg_form_controller.js

@@ -10,16 +10,19 @@ export default class extends Controller {
         }
       })
     })
-    const notBaseErrors = this.element.querySelector('.not_base_errors')
-
-    if (notBaseErrors) {
-      const invalidFeedback = document.querySelector('.invalid-feedback')
-      if (!invalidFeedback) {
-        console.error(notBaseErrors.dataset.errors)
-        Rollbar.error(notBaseErrors.dataset.errors)
+    const errorTitle = this.element.querySelector('.error-title')
+    if (errorTitle) {
+      const invalidField = document.querySelector('.is-invalid')
+      const baseAlert = document.querySelector('.alert-danger')
+      if (!invalidField && !baseAlert) {
         const errorTitle = this.element.querySelector('.error-title')
+        // FIXME: testear con capybara
         errorTitle.innerText = 'Lo lamentamos mucho pero ocurrió algo inesperado. Por favor, intentá nuevamente o ponete en contacto con nosotros.'
         // FIXME: link a contacto
+        const form = this.element.querySelector('form')
+        const errorMsg = `${form.id} - ${form.action} - ${form.dataset.errors}`
+        console.error(errorMsg)
+        Rollbar.error(errorMsg)
       }
     }
   }

data/pg_layout/app/views/pg_layout/_navbar.html.erb

@@ -27,10 +27,10 @@
         <% if user_signed_in? %>
           <li class="nav-item dropdown">
             <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-              <%= current_user %>
+              <%= Current.user %>
             </a>
             <ul class="dropdown-menu">
-              <% if policy(current_user).edit? %>
+              <% if policy(Current.user).edit? %>
                 <li>
                   <%= link_to "Mi perfil", edit_user_registration_path, class: 'dropdown-item' %>
                 </li>

data/pg_layout/app/views/pg_layout/_sidebar_mobile.html.erb

@@ -15,10 +15,10 @@
       <% if user_signed_in? %>
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-            <%= current_user %>
+            <%= Current.user %>
           </a>
           <ul class="dropdown-menu">
-            <% if policy(current_user).edit? %>
+            <% if policy(Current.user).edit? %>
               <li>
                 <%= link_to "Mi perfil", edit_user_registration_path, class: 'dropdown-item' %>
               </li>

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.0.8-alpha.37'
+  VERSION = '7.0.8-alpha.39'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.37
+  version: 7.0.8.pre.alpha.39
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-18 00:00:00.000000000 Z
+date: 2024-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -877,6 +877,7 @@ files:
 - pg_engine/app/lib/pg_engine/filtros_builder.rb
 - pg_engine/app/lib/pg_form_builder.rb
 - pg_engine/app/models/account.rb
+- pg_engine/app/models/current.rb
 - pg_engine/app/models/pg_engine/base_record.rb
 - pg_engine/app/models/user.rb
 - pg_engine/app/models/user_account.rb