pg_rails 7.0.8.pre.alpha.37 → 7.0.8.pre.alpha.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc5297175e67ac85e03b8fbf4781139dc77a9d491c5c5ab15b0cf6d3d2c6dd48
-  data.tar.gz: fa9e5a41db685275a80b90b737a9ff9772798d8c96c7cc4ab3c9b9d16a550716
+  metadata.gz: 683d6ba7d56764dfcf541c11cc57cd17a4e7a07db3cc5381d0b265151370e151
+  data.tar.gz: 6cab86107a332dcf819966a6458b18028dbb2b5e13fc875117f9685217c77c27
 SHA512:
-  metadata.gz: ed39f31e8b7cebaf0d0c3055db4df0f044867d3df6d749720fe4093c400fbab88bbbdf3ef8869d43198f78345cf07b6854ef14339b1c579e3d1602f0526b7794
-  data.tar.gz: 8752b125d74aa41ee9b9db26cca6a4fa94e17c58337c5eb95751d451ddbbaa175d9bf9f31d2cd0b33f4dcb0987c3837f38978efed0057895c8121285d65703ca
+  metadata.gz: d29164b89d0b98c7e884b32be394f8a13244e5c6f4429fa4c0432ca86f548213a267393c8b1ffae197947130cc668ade1cd2e4b2848e9d09b4842f5422c8684c
+  data.tar.gz: 01a039fa9de8f00165a9f6a883c08383cffcb4b478598a38da0661944e2eadce7a342724c9a40e4e1c7c60d5bc7e8258c5ab01c9788b97a6fef61fd61567a94e

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
 

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/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_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.38'
 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.38
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-18 00:00:00.000000000 Z
+date: 2024-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails