pg_rails 7.0.8.pre.alpha.76 → 7.0.8.pre.alpha.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e72fb52c1042404baaf142d2b8a3e83eb75cd8034e4ba58ca7c862054cfe8d8
-  data.tar.gz: 7f2cf6cd1ae8089fdeba57501d7d990fe9c59fc7a713b21068a16772a0506c17
+  metadata.gz: 871482c5c249da4284c330d128e8f9d3bb456ba55b2b434fd5ae7f7620402643
+  data.tar.gz: e12f78759a856ebd5f020f44e744e5d894fa5e5cba3e6fcc97751d3df6eecdaf
 SHA512:
-  metadata.gz: 28be79030af6d2cf172da55d757d040b414e166cda53960fd66f982d3dd36f36b829c45e835d798425a50bd38609d3b2c1ca3ab5d0536983ffd3d3b3e38bd2d6
-  data.tar.gz: 6c88a919dafb6e96c03214d0a7d91d6e4293752e0323b6a5fec3e0c1d97750b541e6af8000ce8f21e3057dbfb0159d44fe4d5644076046992144207261aa31f6
+  metadata.gz: 2259c319165804262def78cfb9ea6fb60eb9d3ac813b85f2787c9388aa0127dd905019c964b4fece97ca8a193ac514205b1768f51eac850a78c40c8ce7719503
+  data.tar.gz: 216652a6d27af8b4f17fffa6799215dd07d2d960483e40141f0d12db189558f1234c77138ed8e3939e9c99112c7b52832d0634bb47e9c73a494097d6d516a227

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

@@ -10,6 +10,7 @@ export default class extends Controller {
   elemId = null
   input = null
   originalPlaceholder = null
+  savedInputState = null
 
   connect () {
     // ID único para identificar el campo y el modal
@@ -69,8 +70,15 @@ export default class extends Controller {
 
     this.input.addEventListener('blur', () => {
       this.input.placeholder = this.originalPlaceholder
+      if (!this.element.classList.contains('filled')) {
+        this.savedInputState = this.input.value
+        this.input.value = null
+      }
     })
     this.input.onfocus = () => {
+      if (this.savedInputState && !this.input.value) {
+        this.input.value = this.savedInputState
+      }
       this.input.select()
       if (this.input.value.length === 0) {
         this.escribiAlgo()
@@ -98,7 +106,6 @@ export default class extends Controller {
       }
     }
     this.input.onkeydown = (e) => {
-      console.log(e.keyCode)
       if (e.keyCode === 13) { // Enter
         e.preventDefault()
         return false
@@ -164,6 +171,18 @@ export default class extends Controller {
     )
   }
 
+  mostrarError () {
+    // 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')) {
@@ -211,15 +230,15 @@ export default class extends Controller {
 
   buscando () {
     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>
     )
   }
 
   selectItem (e) {
     if (e.target.dataset.object) {
-      this.completarCampo(JSON.parse(e.target.dataset.object))
+      this.completarCampo(e.target)
     } else {
       this.completarCampo(null)
     }
@@ -238,16 +257,19 @@ 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(() => {
+      this.buscando()
+    }, 200)
+    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>
     )
@@ -258,10 +280,14 @@ export default class extends Controller {
     form.remove()
   }
 
-  completarCampo (object) {
+  completarCampo (target) {
     const textField = this.element.querySelector('input[type=text]')
     const hiddenField = this.element.querySelector('input[type=hidden]')
-    if (object) {
+
+    if (target && target.dataset.fieldName) { hiddenField.name = target.dataset.fieldName }
+
+    if (target) {
+      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,11 +1,13 @@
-/ # locals: (collection:, query:)
+/ # locals: (collection:, query:, field_name: nil, timeout_id: nil)
 .resultados.inline tabindex="-1"
+  - if timeout_id.present?
+    div data-controller="clear-timeout" data-timeout-id="#{timeout_id}"
   ul.list-group.list-group-flush
     - if collection.any?
       - collection.each do |object|
         = link_to object.to_s, 'javascript:void(0)',
                   class: 'list-group-item',
                   data: { action: 'asociable#selectItem',
-                          id: object.id, object: object.decorate.to_json }
+                          id: object.id, object: object.decorate.to_json, field_name: }
     - else
-      li.px-3.py-1 No hay resultados para "#{query}"
+      li.px-3.py-1 style="font-size: 0.85em" No hay resultados para "#{query}"

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

@@ -53,10 +53,10 @@ module PgEngine
       end
     end
 
-    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: 'Editar' do
+      helpers.content_tag :span, rel: :tooltip, title: 'Modificar' do
         helpers.link_to edit_object_url, data: { turbo_frame: :main },
                                          class: "btn btn-sm #{klass}" do
           helpers.content_tag(:span, nil, class: clase_icono('pencil')) + text

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

@@ -5,6 +5,10 @@ require 'rainbow'
 # TODO: poder pasar blocks
 
 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) # 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

@@ -10,6 +10,14 @@ export default class extends Controller {
         }
       })
     })
+    this.element.querySelectorAll('.btn-check').forEach((slct) => {
+      slct.addEventListener('change', (e) => {
+        const invalid = e.target.closest('.is-invalid')
+        if (invalid) {
+          invalid.classList.remove('is-invalid')
+        }
+      })
+    })
     const errorTitle = this.element.querySelector('.error-title')
     if (errorTitle) {
       const invalidField = document.querySelector('.is-invalid')
@@ -17,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.76'
+  VERSION = '7.0.8-alpha.78'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.76
+  version: 7.0.8.pre.alpha.78
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-19 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