pg_rails 7.1.12 → 7.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfa6040427b2819258e1afc08b32b84c8e91c834752369678619c6d4fa8db024
-  data.tar.gz: '07198f45eabdf38b2e0d6990b82298eda1da31391973aa8190a223cbb4995e23'
+  metadata.gz: a86bbc28d3c58f60700af25390dc43d051e14c2c9b493005554ddd3407380351
+  data.tar.gz: 061c9da5f9ddf70bf5b878f5a7ecc21d4916bcd6bba702d652213a80e8f085f2
 SHA512:
-  metadata.gz: 80054255f87043cae6ca876997a4acbb0bfc5eeb0418991826c3fab5862389543f5916870b61063a6a0d88327c97a96c58ed454075559691f79f81fb4fbd3cd6
-  data.tar.gz: 78068cb66d350fed57c7fc3369caee7295070b0fe66c6e691792ad5ae3b5cbfbb1c36ab19316f11610e8e9f88a06a3e4d12427df339064f1250a398ad4368fe1
+  metadata.gz: 9da11c05db885cdf43976ff3114e4c1971a1dc27909d529b4447bcd31bf750957b84701663ae1003c7e6d993493922270a61f4512e13d67eef83f92f73ddead3
+  data.tar.gz: 4e66d31c2819f903c9a8dc30654e3b4522662c310fe931f98f49d3bd9ee1815017515f28dede35bc018433a531fe25ed70081333a89cdf26795852ca6c602653

data/pg_associable/app/javascript/modal_controller.js

@@ -12,10 +12,6 @@ export default class extends Controller {
     if (this.element.dataset.removeOnHide) {
       this.element.addEventListener('hidden.bs.modal', (e) => {
         this.element.remove()
-        // FIXME: handlear mejor
-        window.Stimulus.controllers.map((c) => { return c.calendar })
-          .filter((e) => { return e })
-          .forEach((c) => { c.refetchEvents() })
       })
     }
     this.modalPuntero.show()
@@ -36,6 +32,7 @@ export default class extends Controller {
 
   disconnect (e) {
     this.modalPuntero.hide()
+    this.element.dispatchEvent(new Event('hidden.bs.modal'))
     this.modalPuntero.dispose()
   }
 }

data/pg_engine/app/components/search_bar_component.html.slim

@@ -3,11 +3,12 @@
     .d-flex.align-items-center.px-3.py-2
       .px-2.d-none.d-sm-inline-block
         span.bi.bi-funnel-fill
-      = helpers.search_form_for @q, url: url_for do |f|
+      = helpers.search_form_for @q, url: url_for, html: { 'data-turbo-action': :advance } do |f|
         .row.g-1
           .col
             .row.g-1
               = @builder.filtros_html(form: f)
+              = @extra_fields
           .col-auto.gap-1.d-flex.align-items-start
             = helpers.button_tag class: 'btn btn-sm btn-primary col-auto' do
               span.bi.bi-search

data/pg_engine/app/components/search_bar_component.rb

@@ -7,4 +7,8 @@ class SearchBarComponent < ViewComponent::Base
 
     super
   end
+
+  def extra_fields(&)
+    @extra_fields = capture(&)
+  end
 end

data/pg_engine/app/controllers/admin/emails_controller.rb

@@ -22,7 +22,8 @@ module Admin
     def create
       saved = false
       ActiveRecord::Base.transaction do
-        # FIXME: acá la transaction jode porque el ActiveJob no puede deserializar el Email
+        # TODO: acá la transaction jode porque el ActiveJob no puede deserializar el Email
+        # Con rails 7.2 esto se debería arreglar
         if (saved = @email.save)
           PgEngine::AdminMailer.with(email_object: @email).admin_mail.deliver_later
         end

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

@@ -162,9 +162,14 @@ module PgEngine
     def pg_respond_show(object = nil)
       object ||= instancia_modelo
       if params[:modal].present?
-        render turbo_stream: turbo_stream.append_all(
-          'body', partial: 'pg_layout/modal_show', locals: { object: }
-        )
+        respond_to do |format|
+          format.html
+          format.turbo_stream do
+            render turbo_stream: turbo_stream.append_all(
+              'body', partial: 'pg_layout/modal_show', locals: { object: }
+            )
+          end
+        end
       else
         respond_to do |format|
           format.json { render json: object }

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

@@ -61,8 +61,7 @@ module PgEngine
       return unless Pundit.policy!(Current.user, object).edit?
 
       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.link_to edit_object_url, class: "btn btn-sm #{klass}" do
           helpers.content_tag(:span, nil, class: clase_icono('pencil')) + text
         end
       end
@@ -72,8 +71,7 @@ module PgEngine
       return unless Pundit.policy!(Current.user, object).show?
 
       helpers.content_tag :span, rel: :tooltip, title: 'Ver' do
-        helpers.link_to object_url, data: { turbo_frame: :main },
-                                    class: "btn btn-sm #{klass}" do
+        helpers.link_to object_url, class: "btn btn-sm #{klass}" do
           helpers.content_tag(:span, nil, class: clase_icono('eye-fill')) + text
         end
       end

data/pg_engine/spec/components/previews/alert_component_preview/tooltips.html.slim

@@ -1 +1 @@
-span#tooltip data-bs-toggle="tooltip" data-bs-title="El tooltip" las cosas
+span#tooltip data-controller="tooltip" data-bs-title="El tooltip" las cosas

data/pg_layout/app/assets/stylesheets/sidebar.scss

@@ -4,6 +4,7 @@ html, body {
 
 /* Style & Colors */
 $text-color: $gray-300;
+// TODO: set text-color-dark, y tiene que ir en overrides, no acá
 $text-hover-color: $gray-100;
 $chevron-color: 200,200,200,.5;
 

data/pg_layout/app/javascript/config/tooltips.js

@@ -1,13 +1,13 @@
 import * as bootstrap from 'bootstrap'
 
-document.addEventListener('turbo:load', bindTooltips)
-document.addEventListener('turbo:render', bindTooltips)
-
-function bindTooltips () {
-  const tooltipsQuery = '[data-bs-toggle="tooltip"]'
+const tooltipsQuery = '[data-controller="tooltip"]'
 
+document.addEventListener('show.bs.tooltip', (ev) => {
   const toastElList = document.querySelectorAll(tooltipsQuery)
-  Array.from(toastElList).map(tooltipEl => {
-    return new bootstrap.Tooltip(tooltipEl)
+  Array.from(toastElList).forEach(tooltipEl => {
+    const tooltip = bootstrap.Tooltip.getInstance(tooltipEl)
+    if (tooltip) {
+      tooltip.hide()
+    }
   })
-}
+})

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

@@ -10,6 +10,7 @@ import FiltrosController from './filtros_controller'
 import NotificationsController from './notifications_controller'
 import SelectizeController from './selectize_controller'
 import ThemeController from './theme_controller'
+import TooltipController from './tooltip_controller'
 
 application.register('navbar', NavbarController)
 application.register('nested', NestedController)
@@ -21,5 +22,6 @@ application.register('filtros', FiltrosController)
 application.register('notifications', NotificationsController)
 application.register('selectize', SelectizeController)
 application.register('theme', ThemeController)
+application.register('tooltip', TooltipController)
 
 // TODO: testear con capybara todo lo que se pueda

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

@@ -0,0 +1,14 @@
+import { Controller } from '@hotwired/stimulus'
+import * as bootstrap from 'bootstrap'
+
+export default class extends Controller {
+  tooltip = null
+
+  connect () {
+    this.tooltip = new bootstrap.Tooltip(this.element)
+  }
+
+  disconnect () {
+    this.tooltip.dispose()
+  }
+}

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

@@ -7,7 +7,7 @@
           | Ir al #{object.class.nombre_singular.downcase}
         a.btn-close[type="button" data-bs-dismiss="modal" aria-label="Close"]
       .modal-body
-        = turbo_frame_tag :modal_generic, target: :_top do
+        = turbo_frame_tag :modal_generic do
           .float-end
             = object.edit_link
             = object.destroy_link

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.1.12'
+  VERSION = '7.1.14'
 end

data/pg_rails/scss/pg_rails.scss

@@ -21,6 +21,10 @@ $info:         #87accc;
 $warning-text-emphasis:  $orange;
 $danger-text-emphasis:   #910303;
 
+$tooltip-opacity: 1;
+$tooltip-bg:                     var(--bs-primary) !default;
+$tooltip-color:                        var(--bs-light) !default;
+
 $font-size-base: 0.9rem;
 $enable-validation-icons:       false;
 $focus-ring-width:              .05rem;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.1.12
+  version: 7.1.14
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-08 00:00:00.000000000 Z
+date: 2024-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -839,6 +839,7 @@ files:
 - pg_layout/app/javascript/controllers/selectize_controller.js
 - pg_layout/app/javascript/controllers/switcher_controller.js
 - pg_layout/app/javascript/controllers/theme_controller.js
+- pg_layout/app/javascript/controllers/tooltip_controller.js
 - pg_layout/app/javascript/utils/cookies.js
 - pg_layout/app/javascript/utils/utils.ts
 - pg_layout/app/lib/navbar.rb