pg_rails 7.0.8.pre.alpha.75 → 7.0.8.pre.alpha.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46472fd017bf8657e28b3d968159b206c7c2ab8118a4744b5ae887e38c6c0d57
-  data.tar.gz: f0ecdadba8aaac1a640c74bc17ce6a182a0b0e4af138e5275d01c35a082b4bf7
+  metadata.gz: 356134a06d178d1da89941fd57ac424f400adea0d39bfe6a09a635f896380ea2
+  data.tar.gz: b144d8ab6758ccf469d242a3f14b5ac5b98ee892343053fb49f98ddd2555f87a
 SHA512:
-  metadata.gz: 7cc3574cfed47ad618319c9320836ea0a7941c9951226f82cacf20dd885a7d8ba425361fefb53cbd64fb52a7b1af62d681a60da0ba3a8de2bc120977383ca489
-  data.tar.gz: 16b08e59ac08a38348d08f88f591d32f2349d5f3baa188235bb57d57352213b3a224364be53a03da371971df4e1ba0f4f91e5b0fc5a9fd9b8deca7c8b5d2a25d
+  metadata.gz: 29d1bb1ec81bd9e6a3d11c84ba76a5cdcf03b1f95d4ecee39057bcc358721fa5ae252b511c09bcb7e1cfd6ed7e270ac20efb264eba325a42ce326c6d022234bc
+  data.tar.gz: 455515106f9dc06e3e1da329b0a7c23eda3da54602b922136b9c54cdd868d629b592098fcce9970c7e11e99aad5b8fdf61a580bdc7a40f332836ebad45bc66dc

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,16 @@ 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.savedInputState = 
       this.input.select()
       if (this.input.value.length === 0) {
         this.escribiAlgo()
@@ -98,7 +107,6 @@ export default class extends Controller {
       }
     }
     this.input.onkeydown = (e) => {
-      console.log(e.keyCode)
       if (e.keyCode === 13) { // Enter
         e.preventDefault()
         return false
@@ -210,6 +218,7 @@ 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>
@@ -219,7 +228,7 @@ export default class extends Controller {
 
   selectItem (e) {
     if (e.target.dataset.object) {
-      this.completarCampo(JSON.parse(e.target.dataset.object))
+      this.completarCampo(e.target)
     } else {
       this.completarCampo(null)
     }
@@ -258,10 +267,15 @@ 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) {
+      let 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,4 +1,4 @@
-/ # locals: (collection:, query:)
+/ # locals: (collection:, query:, field_name: nil)
 .resultados.inline tabindex="-1"
   ul.list-group.list-group-flush
     - if collection.any?
@@ -6,6 +6,6 @@
         = 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,11 @@ module PgEngine
       end
     end
 
+    # FIXME: default: text: ' Modificar', klass: 'btn-warning')
     def edit_link(text: '', klass: 'btn-light')
       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/app/lib/pg_engine/devise_failure_app.rb

@@ -21,7 +21,6 @@ module PgEngine
     def render_unconfirmed
       self.content_type = 'text/vnd.turbo-stream.html'
       self.status = 200
-      # TODO: poner data-turbo-temporary?
       self.response_body = <<~HTML
         <turbo-stream action="update" target="flash">
           <template>

data/pg_engine/app/lib/pg_form_builder.rb

@@ -27,7 +27,7 @@ class PgFormBuilder < SimpleForm::FormBuilder
   end
 
   def mensajes_de_error
-    # TODO: poner data-turbo-temporary?
+    # TODO: quitar en before-cache?
     title = error_notification(message: mensaje, class: 'text-danger mb-2 error-title') if mensaje
 
     base_errors = object.errors[:base]

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

@@ -5,6 +5,8 @@ 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)
   pg_log(:error, *args)
 end
 

data/pg_layout/app/javascript/application.js

@@ -37,6 +37,9 @@ document.addEventListener('turbo:load', bindAndObserveToasts)
 document.addEventListener('turbo:render', bindAndObserveToasts)
 
 document.addEventListener('turbo:before-cache', () => {
+  document.querySelectorAll('#flash .alert').forEach((el) => {
+    el.remove()
+  })
   document.querySelectorAll('.offcanvas-backdrop').forEach((el) => {
     el.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) => {
+        let 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')

data/pg_layout/app/lib/navbar.rb

@@ -38,9 +38,9 @@ class Navbar
         path: eval(item['path']),
         show: item['policy'] ? eval(item['policy']) : true
       }
-    rescue StandardError
+    rescue StandardError => e
       # TODO!: testear
-      pg_err item
+      pg_err e, item
       return []
     end
     # rubocop:enable Security/Eval

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

@@ -1,6 +1,6 @@
 <%# locals: (error_msg: nil) %>
 
-<div class="d-flex justify-content-around mt-2" data-turbo-temporary="true">
+<div class="d-flex justify-content-around mt-2">
   <div class="alert alert-danger d-flex align-items-center">
     <div>
       <span class="bi bi-emoji-dizzy fs-1 me-3"></span>

data/pg_layout/app/views/pg_layout/_flash_inner.html.slim

@@ -5,7 +5,7 @@
     mt-2 d-flex align-items-center
     alert-#{flash_type_to_class(flash_type)}
     #{'position-absolute pg-toast' if toast}"
-  data-turbo-temporary="true" data-bs-autohide="true"
+  data-bs-autohide="true"
   aria-live="assertive" aria-atomic="true" role="alert"
 ]
   - case flash_type

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.75
+  version: 7.0.8.pre.alpha.77
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-19 00:00:00.000000000 Z
+date: 2024-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails