pg_rails 7.0.8.pre.alpha.26 → 7.0.8.pre.alpha.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67cb2b4ac12dba97e33e5d859a101b7d38502c9be7366122c52e3c67102e26f5
-  data.tar.gz: 18426e296a8ac94c30540ac0ce01e6152e0b0cd4aa7ca0750d4f671d24bc3aa6
+  metadata.gz: 985cc55b4ff43af3479e08cd3d7ae868a065d42cc6f6aae0493609bda38d9fda
+  data.tar.gz: 335191165185260bc86fcc0adfec689470dd3abe5a88ad153187977f4b16b5de
 SHA512:
-  metadata.gz: 202ce67c321c3614f84ebae1be41329300ea76be4629381288e11658e58d374d7afcb990f9742dc30071f229dd47d04f610902228238af3f97da31dc62cd77a0
-  data.tar.gz: 8c97bc615beb0888ecc9f98636bba1ea7a181aa6c5723c80d29e4b8a40a4a6219cd2c0ef652be3e4c7548c0685e8daeb8f453425f6829410181b69b5debd2062
+  metadata.gz: 9ff8d46bc53fa905b023a2cce88a24555129e7ee4cc146c0c58038c2a35046744be61750e8ef2d73b5d606f3dbb7396cecbbf218ba947bd327991073ae01c788
+  data.tar.gz: 032aa328bfc8a622cadb3f5cd2c914cf9a870c35c2d2aabf8c1d8fcb8f501b0d0561e123d63364c897856392507bb001d155a0e7a00b0cd7916fb6b49f3fc64a

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

@@ -21,6 +21,7 @@ module PgEngine
       @collection = filtros_y_policy atributos_para_buscar
       @collection = sort_collection(@collection)
       @records_filtered = policy_scope(clase_modelo).any? if @collection.empty?
+      # FIXME: si hay pero en páginas anteriores, mostrar texto correspondiente
       pg_respond_index
     end
 

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

@@ -54,6 +54,10 @@ module PgEngine
                                'opened'
                              end
       @navbar = Navbar.new(current_user)
+
+      if Rollbar.configuration.enabled && Rails.application.credentials.rollbar.present?
+        @rollbar_token = Rails.application.credentials.rollbar.access_token_client
+      end
     end
 
     def mobile_device?

data/pg_engine/app/lib/pg_engine/error_helper.rb

@@ -2,6 +2,8 @@ module PgEngine
   module ErrorHelper
     extend ActiveSupport::Concern
 
+    # pg_engine/config/initializers/simple_form_monkey_patch.rb
+
     def merge_association_errors(object, details, assoc_key)
       details = details.except(assoc_key)
       assoc_items = object.send(assoc_key).map(&:errors).map(&:details)

data/pg_engine/app/lib/pg_form_builder.rb

@@ -26,11 +26,30 @@ class PgFormBuilder < SimpleForm::FormBuilder
   end
 
   def mensajes_de_error
+    title = error_notification(message: mensaje, class: 'text-danger mb-2 error-title') if mensaje
+
     base_errors = object.errors[:base]
     base_message = (base_errors.map(&:to_s).join('<br>') if base_errors.present?)
-    title = error_notification(message: mensaje, class: 'text-danger mb-2') if mensaje
     base_tag = error_notification(message: base_message, class: 'alert alert-danger') if base_message
-    (title || '') + (base_tag || '')
+
+    all_errors_tag = build_all_errors_tag unless base_tag
+
+    "#{title}#{base_tag}#{all_errors_tag}"
+  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
+    pg_warn "Not base errors en pg_form: #{object.errors.details}. Record: #{object.inspect}", :debug
+
+    # rubocop:disable Rails/OutputSafety
+    "<span class='not_base_errors' data-errors='#{object.errors.details.to_json}'></span>".html_safe
+    # rubocop:enable Rails/OutputSafety
   end
 
   def mensaje

data/pg_engine/spec/lib/pg_engine/error_helper_spec.rb

@@ -29,7 +29,7 @@ describe PgEngine::ErrorHelper do
 
     context 'cuando solo tiene otros errores' do
       before do
-        categoria.validate_aux = true
+        categoria.validate_base = true
       end
 
       it do
@@ -39,7 +39,7 @@ describe PgEngine::ErrorHelper do
 
     context 'cuando tiene multiples errores' do
       before do
-        categoria.validate_aux = true
+        categoria.validate_base = true
         categoria.nombre = nil
       end
 

data/pg_engine/spec/lib/pg_form_builder_spec.rb

@@ -2,11 +2,43 @@ require 'rails_helper'
 
 describe PgFormBuilder do
   let(:categoria) { create :categoria_de_cosa }
-  let(:template) { double }
+  let(:template) do
+    klass = Class.new
+    klass.include ActionView::Helpers::TagHelper
+    klass.new
+  end
+
   let(:instancia) { described_class.new('bla', categoria, template, {}) }
 
   before { create_list :cosa, 2, categoria_de_cosa: categoria }
 
+  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
+        categoria.validate
+      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
+      before do
+        categoria.validate_base = true
+        categoria.validate
+      end
+
+      it { expect(subject).to include 'Por favor, revisá los siguientes errores' }
+      it { expect(subject).not_to include 'not_base_errors' }
+    end
+  end
+
   describe '#mensaje' do
     subject { instancia.mensaje }
 

data/pg_layout/app/javascript/application.js

@@ -1,3 +1,5 @@
+import Rollbar from 'rollbar'
+
 import './config'
 import './channels'
 import './controllers'
@@ -5,6 +7,32 @@ import './controllers'
 // Bootstrap's toasts
 import * as bootstrap from 'bootstrap'
 
+let rollbarToken = document.head.querySelector('meta[name=rollbar-token]')
+rollbarToken = rollbarToken && rollbarToken.content
+if (rollbarToken) {
+  let rollbarEnv = document.head.querySelector('meta[name=rollbar-env]')
+  rollbarEnv = rollbarEnv && rollbarEnv.content
+  rollbarEnv = rollbarEnv || 'unknown'
+
+  window.Rollbar = Rollbar
+
+  Rollbar.init()
+
+  Rollbar.global({
+    itemsPerMinute: 2,
+    maxItems: 5
+  })
+  Rollbar.configure({
+    accessToken: rollbarToken,
+    captureUncaught: true,
+    captureUnhandledRejections: true,
+    reportLevel: 'warning',
+    payload: {
+      environment: rollbarEnv
+    }
+  })
+}
+
 document.addEventListener('turbo:load', bindToasts)
 document.addEventListener('turbo:render', bindToasts)
 

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

@@ -1,4 +1,5 @@
 import { Controller } from '@hotwired/stimulus'
+import Rollbar from 'rollbar'
 
 export default class extends Controller {
   connect () {
@@ -9,5 +10,16 @@ export default class extends Controller {
         }
       })
     })
+    const notBaseErrors = this.element.querySelector('.not_base_errors')
+
+    if (notBaseErrors) {
+      const invalidFields = document.querySelector('.form-control.is-invalid,.form-select.is-invalid')
+      if (!invalidFields) {
+        console.error(notBaseErrors.dataset.errors)
+        Rollbar.error(notBaseErrors.dataset.errors)
+        const errorTitle = this.element.querySelector('.error-title')
+        errorTitle.innerText = 'Lo lamentamos mucho pero ocurrió algo inesperado'
+      }
+    }
   }
 }

data/pg_layout/app/lib/navbar.rb

@@ -30,6 +30,9 @@ class Navbar
         path: eval(item['path']),
         show: item['policy'] ? eval(item['policy']) : true
       }
+    rescue StandardError
+      # FIXME: testear
+      pg_err item
     end
     # rubocop:enable Security/Eval
   end

data/pg_layout/app/views/layouts/pg_layout/base.html.slim

@@ -16,7 +16,9 @@ html
 
     = stylesheet_link_tag 'application', 'data-turbo-track': 'reload'
     = javascript_include_tag 'application', 'data-turbo-track': 'reload', type: 'module'
-    = render partial: 'pg_layout/rollbar'
+    - if @rollbar_token.present?
+      meta name="rollbar-token" content="#{@rollbar_token}"
+      meta name="rollbar-env" content="#{Rails.env}"
   body
     div class="#{ @sidebar == false ? '' : 'with-sidebar' }"
       - unless @sidebar == false

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

@@ -54,16 +54,16 @@
               </a>
             </li>
           <% end %>
-
-        <% else %>
-          <li class="nav-item">
-            <%= link_to t("devise.sign_up"), new_user_registration_path, class: 'btn btn-success' %>
-          </li>
+        <% end %>
+      </ul>
+      <% unless user_signed_in? %>
+        <%= link_to t("devise.sign_up"), new_user_registration_path, class: 'btn btn-success' %>
+        <ul class="navbar-nav mb-2 mb-lg-0">
           <li class="nav-item">
             <%= link_to t("devise.sign_in"), new_user_session_path, class: 'nav-link' %>
           </li>
-        <% end %>
-      </ul>
+        </ul>
+      <% end %>
       <% @navbar.extensiones.each do |extension| %>
         <%= extension %>
       <% end %>

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.26
+  version: 7.0.8.pre.alpha.27
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -200,7 +200,6 @@ files:
 - pg_layout/app/views/pg_layout/_flash.html.slim
 - pg_layout/app/views/pg_layout/_flash_alert.html.slim
 - pg_layout/app/views/pg_layout/_navbar.html.erb
-- pg_layout/app/views/pg_layout/_rollbar.html.erb
 - pg_layout/app/views/pg_layout/_sidebar.html.erb
 - pg_layout/lib/pg_layout.rb
 - pg_layout/lib/pg_layout/engine.rb

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

@@ -1,28 +0,0 @@
-<% if Rollbar.configuration.enabled && Rails.application.credentials.rollbar.present? %>
-<script>
-var _rollbarConfig = {
-    accessToken: '<%= Rails.application.credentials.rollbar.access_token_client %>',
-    captureUncaught: true,
-    captureUnhandledRejections: true,
-    payload: {
-        environment: <%= Rails.env %>,
-        //trace_id: 'abc',
-        client: {
-            javascript: {
-                code_version: '1.0.0',
-                //source_map_enabled: true,
-                //guess_uncaught_frames: true
-            }
-        },
-        //server: {
-            //root: 'http://localhost:8000/demo/',
-            //host: 'host-1',
-            //branch: 'HEAD',
-        //},
-    }
-};
-// Rollbar Snippet
-!function(r){var e={};function o(n){if(e[n])return e[n].exports;var t=e[n]={i:n,l:!1,exports:{}};return r[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.m=r,o.c=e,o.d=function(r,e,n){o.o(r,e)||Object.defineProperty(r,e,{enumerable:!0,get:n})},o.r=function(r){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(r,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(r,"__esModule",{value:!0})},o.t=function(r,e){if(1&e&&(r=o(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var n=Object.create(null);if(o.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var t in r)o.d(n,t,function(e){return r[e]}.bind(null,t));return n},o.n=function(r){var e=r&&r.__esModule?function(){return r.default}:function(){return r};return o.d(e,"a",e),e},o.o=function(r,e){return Object.prototype.hasOwnProperty.call(r,e)},o.p="",o(o.s=0)}([function(r,e,o){"use strict";var n=o(1),t=o(5);_rollbarConfig=_rollbarConfig||{},_rollbarConfig.rollbarJsUrl=_rollbarConfig.rollbarJsUrl||"https://cdn.rollbar.com/rollbarjs/refs/tags/v2.26.3/rollbar.min.js",_rollbarConfig.async=void 0===_rollbarConfig.async||_rollbarConfig.async;var a=n.setupShim(window,_rollbarConfig),l=t(_rollbarConfig);window.rollbar=n.Rollbar,a.loadFull(window,document,!_rollbarConfig.async,_rollbarConfig,l)},function(r,e,o){"use strict";var n=o(2),t=o(3);function a(r){return function(){try{return r.apply(this,arguments)}catch(r){try{console.error("[Rollbar]: Internal error",r)}catch(r){}}}}var l=0;function i(r,e){this.options=r,this._rollbarOldOnError=null;var o=l++;this.shimId=function(){return o},"undefined"!=typeof window&&window._rollbarShims&&(window._rollbarShims[o]={handler:e,messages:[]})}var s=o(4),d=function(r,e){return new i(r,e)},c=function(r){return new s(d,r)};function u(r){return a((function(){var e=this,o=Array.prototype.slice.call(arguments,0),n={shim:e,method:r,args:o,ts:new Date};window._rollbarShims[this.shimId()].messages.push(n)}))}i.prototype.loadFull=function(r,e,o,n,t){var l=!1,i=e.createElement("script"),s=e.getElementsByTagName("script")[0],d=s.parentNode;i.crossOrigin="",i.src=n.rollbarJsUrl,o||(i.async=!0),i.onload=i.onreadystatechange=a((function(){if(!(l||this.readyState&&"loaded"!==this.readyState&&"complete"!==this.readyState)){i.onload=i.onreadystatechange=null;try{d.removeChild(i)}catch(r){}l=!0,function(){var e;if(void 0===r._rollbarDidLoad){e=new Error("rollbar.js did not load");for(var o,n,a,l,i=0;o=r._rollbarShims[i++];)for(o=o.messages||[];n=o.shift();)for(a=n.args||[],i=0;i<a.length;++i)if("function"==typeof(l=a[i])){l(e);break}}"function"==typeof t&&t(e)}()}})),d.insertBefore(i,s)},i.prototype.wrap=function(r,e,o){try{var n;if(n="function"==typeof e?e:function(){return e||{}},"function"!=typeof r)return r;if(r._isWrap)return r;if(!r._rollbar_wrapped&&(r._rollbar_wrapped=function(){o&&"function"==typeof o&&o.apply(this,arguments);try{return r.apply(this,arguments)}catch(o){var e=o;throw e&&("string"==typeof e&&(e=new String(e)),e._rollbarContext=n()||{},e._rollbarContext._wrappedSource=r.toString(),window._rollbarWrappedError=e),e}},r._rollbar_wrapped._isWrap=!0,r.hasOwnProperty))for(var t in r)r.hasOwnProperty(t)&&(r._rollbar_wrapped[t]=r[t]);return r._rollbar_wrapped}catch(e){return r}};for(var p="log,debug,info,warn,warning,error,critical,global,configure,handleUncaughtException,handleAnonymousErrors,handleUnhandledRejection,captureEvent,captureDomContentLoaded,captureLoad".split(","),f=0;f<p.length;++f)i.prototype[p[f]]=u(p[f]);r.exports={setupShim:function(r,e){if(r){var o=e.globalAlias||"Rollbar";if("object"==typeof r[o])return r[o];r._rollbarShims={},r._rollbarWrappedError=null;var l=new c(e);return a((function(){e.captureUncaught&&(l._rollbarOldOnError=r.onerror,n.captureUncaughtExceptions(r,l,!0),e.wrapGlobalEventHandlers&&t(r,l,!0)),e.captureUnhandledRejections&&n.captureUnhandledRejections(r,l,!0);var a=e.autoInstrument;return!1!==e.enabled&&(void 0===a||!0===a||function(r){return!("object"!=typeof r||void 0!==r.page&&!r.page)}(a))&&r.addEventListener&&(r.addEventListener("load",l.captureLoad.bind(l)),r.addEventListener("DOMContentLoaded",l.captureDomContentLoaded.bind(l))),r[o]=l,l}))()}},Rollbar:c}},function(r,e,o){"use strict";function n(r,e,o,n){r._rollbarWrappedError&&(n[4]||(n[4]=r._rollbarWrappedError),n[5]||(n[5]=r._rollbarWrappedError._rollbarContext),r._rollbarWrappedError=null);var t=e.handleUncaughtException.apply(e,n);o&&o.apply(r,n),"anonymous"===t&&(e.anonymousErrorsPending+=1)}r.exports={captureUncaughtExceptions:function(r,e,o){if(r){var t;if("function"==typeof e._rollbarOldOnError)t=e._rollbarOldOnError;else if(r.onerror){for(t=r.onerror;t._rollbarOldOnError;)t=t._rollbarOldOnError;e._rollbarOldOnError=t}e.handleAnonymousErrors();var a=function(){var o=Array.prototype.slice.call(arguments,0);n(r,e,t,o)};o&&(a._rollbarOldOnError=t),r.onerror=a}},captureUnhandledRejections:function(r,e,o){if(r){"function"==typeof r._rollbarURH&&r._rollbarURH.belongsToShim&&r.removeEventListener("unhandledrejection",r._rollbarURH);var n=function(r){var o,n,t;try{o=r.reason}catch(r){o=void 0}try{n=r.promise}catch(r){n="[unhandledrejection] error getting `promise` from event"}try{t=r.detail,!o&&t&&(o=t.reason,n=t.promise)}catch(r){}o||(o="[unhandledrejection] error getting `reason` from event"),e&&e.handleUnhandledRejection&&e.handleUnhandledRejection(o,n)};n.belongsToShim=o,r._rollbarURH=n,r.addEventListener("unhandledrejection",n)}}}},function(r,e,o){"use strict";function n(r,e,o){if(e.hasOwnProperty&&e.hasOwnProperty("addEventListener")){for(var n=e.addEventListener;n._rollbarOldAdd&&n.belongsToShim;)n=n._rollbarOldAdd;var t=function(e,o,t){n.call(this,e,r.wrap(o),t)};t._rollbarOldAdd=n,t.belongsToShim=o,e.addEventListener=t;for(var a=e.removeEventListener;a._rollbarOldRemove&&a.belongsToShim;)a=a._rollbarOldRemove;var l=function(r,e,o){a.call(this,r,e&&e._rollbar_wrapped||e,o)};l._rollbarOldRemove=a,l.belongsToShim=o,e.removeEventListener=l}}r.exports=function(r,e,o){if(r){var t,a,l="EventTarget,Window,Node,ApplicationCache,AudioTrackList,ChannelMergerNode,CryptoOperation,EventSource,FileReader,HTMLUnknownElement,IDBDatabase,IDBRequest,IDBTransaction,KeyOperation,MediaController,MessagePort,ModalWindow,Notification,SVGElementInstance,Screen,TextTrack,TextTrackCue,TextTrackList,WebSocket,WebSocketWorker,Worker,XMLHttpRequest,XMLHttpRequestEventTarget,XMLHttpRequestUpload".split(",");for(t=0;t<l.length;++t)r[a=l[t]]&&r[a].prototype&&n(e,r[a].prototype,o)}}},function(r,e,o){"use strict";function n(r,e){this.impl=r(e,this),this.options=e,function(r){for(var e=function(r){return function(){var e=Array.prototype.slice.call(arguments,0);if(this.impl[r])return this.impl[r].apply(this.impl,e)}},o="log,debug,info,warn,warning,error,critical,global,configure,handleUncaughtException,handleAnonymousErrors,handleUnhandledRejection,_createItem,wrap,loadFull,shimId,captureEvent,captureDomContentLoaded,captureLoad".split(","),n=0;n<o.length;n++)r[o[n]]=e(o[n])}(n.prototype)}n.prototype._swapAndProcessMessages=function(r,e){var o,n,t;for(this.impl=r(this.options);o=e.shift();)n=o.method,t=o.args,this[n]&&"function"==typeof this[n]&&("captureDomContentLoaded"===n||"captureLoad"===n?this[n].apply(this,[t[0],o.ts]):this[n].apply(this,t));return this},r.exports=n},function(r,e,o){"use strict";r.exports=function(r){return function(e){if(!e&&!window._rollbarInitialized){for(var o,n,t=(r=r||{}).globalAlias||"Rollbar",a=window.rollbar,l=function(r){return new a(r)},i=0;o=window._rollbarShims[i++];)n||(n=o.handler),o.handler._swapAndProcessMessages(l,o.messages);window[t]=n,window._rollbarInitialized=!0}}}}]);
-// End Rollbar Snippet
-</script>
-<% end %>