pg_rails 7.0.8.pre.alpha.77 → 7.0.8.pre.alpha.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 356134a06d178d1da89941fd57ac424f400adea0d39bfe6a09a635f896380ea2
-  data.tar.gz: b144d8ab6758ccf469d242a3f14b5ac5b98ee892343053fb49f98ddd2555f87a
+  metadata.gz: d09fbc215c11289297d4f68d0c757492382490591e45e555ad6bd9347dd5a48f
+  data.tar.gz: 31677fedfd7ff1eb0d02fdaf038f1b97995b979d96ba066ba4bad6f2c87a60ab
 SHA512:
-  metadata.gz: 29d1bb1ec81bd9e6a3d11c84ba76a5cdcf03b1f95d4ecee39057bcc358721fa5ae252b511c09bcb7e1cfd6ed7e270ac20efb264eba325a42ce326c6d022234bc
-  data.tar.gz: 455515106f9dc06e3e1da329b0a7c23eda3da54602b922136b9c54cdd868d629b592098fcce9970c7e11e99aad5b8fdf61a580bdc7a40f332836ebad45bc66dc
+  metadata.gz: 52cc06a4a2e3843abc3fbe5344bc913276556c8bbc9f0945f10843c188ad92e92e02955738715a18e4f09526e4759d0db716fef414941a086eda36347279e312
+  data.tar.gz: 712ff73b644360b0f05f133d172af8cb3a827116439ea10352b56272313b4e06a39092f322e666569609c7b0ab173e3f1ab1f2ddb3ae6e37e1e5964baa8c660d

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

@@ -14,10 +14,11 @@ module PgAssociable
       partial = 'pg_associable/resultados_inline'
       resultados_prefix = 'resultados-inline'
       query = params[:query]
+      timeout_id = params[:timeout_id]
       @collection = policy_scope(@clase_modelo).kept.query(query).limit(MAX_RESULTS)
       render turbo_stream:
         turbo_stream.update("#{resultados_prefix}-#{params[:id]}",
-                            partial:, locals: { collection: @collection, query: })
+                            partial:, locals: { collection: @collection, query:, timeout_id: })
     end
   end
 end

data/pg_associable/app/javascript/asociable_controller.tsx

@@ -79,7 +79,6 @@ export default class extends Controller {
       if (this.savedInputState && !this.input.value) {
         this.input.value = this.savedInputState
       }
-      this.savedInputState = 
       this.input.select()
       if (this.input.value.length === 0) {
         this.escribiAlgo()
@@ -172,6 +171,21 @@ export default class extends Controller {
     )
   }
 
+  mostrarError () {
+    if (this.element.querySelector('.resultados .spinner-border')) {
+      Rollbar.error('Time out de asociable.js')
+      // TODO: link a contacto
+      this.subWrapper.innerHTML = renderToStaticMarkup(
+        <div className="resultados" tabIndex={-1}>
+          <div className="text-center p-2 text-danger d-flex align-items-center">
+            <i className="bi-exclamation-circle me-2"></i>
+            Ocurrió algo inesperado. Por favor, intentá nuevamente o ponete en contacto con nosotros.
+          </div>
+        </div>
+      )
+    }
+  }
+
   setMaxHeight () {
     let maxHeight
     if (!this.element.closest('.modal')) {
@@ -218,10 +232,9 @@ export default class extends Controller {
   }
 
   buscando () {
-    // FIXME: spinner
     this.subWrapper.innerHTML = renderToStaticMarkup(
-      <div className="resultados" tabIndex={-1}>
-        <div className="fst-italic text-secondary px-3">Buscando...</div>
+      <div className="resultados text-center p-2" tabIndex={-1}>
+        <span className="spinner-border" role="status"></span>
       </div>
     )
   }
@@ -247,16 +260,25 @@ export default class extends Controller {
     }
     this.lastValue = this.input.value
 
-    this.buscando()
-    // TODO: hacer bien el clearTimeout con la respuesta del server, ya sea por turbo stream o por cable ready
-    // IMPORTANTE: además, un timeout por si nunca llega la respuesta
-    // const timerId = setTimeout(() => {
-    //   this.buscando()
-    // }, 200)
+    const timerBuscandoId = setTimeout(() => {
+      // console.log(`timed out ${timerBuscandoId}`)
+      this.buscando()
+    }, 200)
+    // console.log(`setTimeOut ${timerBuscandoId}`)
+    document.addEventListener('turbo:before-stream-render', (i) => {
+      // console.log(`clear before stream render ${timerBuscandoId}`)
+      clearTimeout(timerBuscandoId)
+    }, { once: true })
+    const timerErrorId = setTimeout(() => {
+      this.mostrarError()
+    }, 15000)
+    const timeouts = `${timerBuscandoId},${timerErrorId}`
+
     const elem = (
       <form method="post" action={this.input.dataset.urlSearch} data-turbo-stream="true">
         <input type="hidden" name="id" value={this.elemId} />
         <input type="hidden" name="query" value={this.input.value} />
+        <input type="hidden" name="timeout_id" value={timeouts} />
         <input type="hidden" name="puede_crear" value={this.element.dataset.puedeCrear} />
       </form>
     )
@@ -271,11 +293,10 @@ export default class extends Controller {
     const textField = this.element.querySelector('input[type=text]')
     const hiddenField = this.element.querySelector('input[type=hidden]')
 
-    if (target && target.dataset.fieldName)
-      hiddenField.name = target.dataset.fieldName
+    if (target && target.dataset.fieldName) { hiddenField.name = target.dataset.fieldName }
 
     if (target) {
-      let object = JSON.parse(target.dataset.object)
+      const object = JSON.parse(target.dataset.object)
       hiddenField.value = object.id
       textField.value = object.to_s
       textField.setAttribute('readonly', 'true')

data/pg_associable/app/views/pg_associable/_resultados_inline.html.slim

@@ -1,5 +1,6 @@
-/ # locals: (collection:, query:, field_name: nil)
+/ # locals: (collection:, query:, timeout_id:, field_name: nil)
 .resultados.inline tabindex="-1"
+  div data-controller="clear-timeout" data-timeout-id="#{timeout_id}"
   ul.list-group.list-group-flush
     - if collection.any?
       - collection.each do |object|

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

@@ -53,8 +53,7 @@ module PgEngine
       end
     end
 
-    # FIXME: default: text: ' Modificar', klass: 'btn-warning')
-    def edit_link(text: '', klass: 'btn-light')
+    def edit_link(text: ' Modificar', klass: 'btn-warning')
       return unless Pundit.policy!(Current.user, object).edit?
 
       helpers.content_tag :span, rel: :tooltip, title: 'Modificar' do

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

@@ -6,7 +6,9 @@ require 'rainbow'
 
 def pg_err(*args)
   raise args.first if ENV.fetch('RAISE_ERRORS', false) && args.first.is_a?(Exception)
-  byebug if ENV.fetch('BYEBUG_ERRORS', false)
+
+  byebug if ENV.fetch('BYEBUG_ERRORS', false) # rubocop:disable Lint/Debugger
+
   pg_log(:error, *args)
 end
 

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

@@ -3,9 +3,11 @@ import { Controller } from '@hotwired/stimulus'
 // Connects to data-controller="clear-timeout"
 export default class extends Controller {
   connect () {
-    const timeoutId = parseInt(this.element.dataset.timeoutId)
-    clearTimeout(timeoutId)
-    console.log(`clearedTimeout: ${timeoutId}`)
+    this.element.dataset.timeoutId.split(',').forEach((el) => {
+      const timeoutId = parseInt(el)
+      clearTimeout(timeoutId)
+      console.log(`clearedTimeout: ${timeoutId}`)
+    })
     this.element.remove()
   }
 }

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

@@ -12,7 +12,7 @@ export default class extends Controller {
     })
     this.element.querySelectorAll('.btn-check').forEach((slct) => {
       slct.addEventListener('change', (e) => {
-        let invalid = e.target.closest('.is-invalid')
+        const invalid = e.target.closest('.is-invalid')
         if (invalid) {
           invalid.classList.remove('is-invalid')
         }
@@ -25,7 +25,7 @@ export default class extends Controller {
       if (!invalidField && !baseAlert) {
         const errorTitle = this.element.querySelector('.error-title')
         // TODO!: testear con capybara
-        errorTitle.innerText = 'Lo lamentamos mucho pero ocurrió algo inesperado. Por favor, intentá nuevamente o ponete en contacto con nosotros.'
+        errorTitle.innerText = 'Ocurrió algo inesperado. Por favor, intentá nuevamente o ponete en contacto con nosotros.'
         // TODO!: link a contacto
         const form = this.element.querySelector('form')
         const errorMsg = `${form.id} - ${form.action} - ${form.dataset.errors}`

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.77
+  version: 7.0.8.pre.alpha.79
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-21 00:00:00.000000000 Z
+date: 2024-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -808,6 +808,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.22.0
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: undercover
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: spring
   requirement: !ruby/object:Gem::Requirement